- merge trunk

ChangeLog

@@ -340,6 +340,9 @@ Small changes:
   * Use C99 variadic macro support, not GNU.
   * Fix performance regression: dmda queues were inadvertently made
     LIFOs in r9611.
+  * By default, StarPU FFT examples are not compiled and checked, the
+    configure option --enable-starpufft-examples needs to be specified
+    to change this behaviour.
 
 StarPU 1.0.3 (svn revision 7379)
 ==============================================

configure.ac

@@ -54,8 +54,8 @@ AC_CANONICAL_SYSTEM
 dnl Automake 1.11 introduced `silent-rules' and `color-tests'.  Use them
 dnl when they're available.
 m4_ifdef([AM_SILENT_RULES],
-  [AM_INIT_AUTOMAKE([1.11 -Wall foreign silent-rules color-tests parallel-tests subdir-objects])],
-  [AM_INIT_AUTOMAKE([1.10 -Wall foreign subdir-objects])])
+  [AM_INIT_AUTOMAKE([1.11 -Wall foreign silent-rules color-tests parallel-tests])],
+  [AM_INIT_AUTOMAKE([1.10 -Wall foreign])])
 
 m4_ifdef([AM_SILENT_RULES],
   [AM_SILENT_RULES(yes)])
@@ -2260,6 +2260,11 @@ if test x$enable_starpufft = xyes -a \( \( x$enable_cpu = xyes -a x$have_fftw =
 fi
 AM_CONDITIONAL(BUILD_STARPUFFT, [test x$fft_support = xyes])
 
+AC_ARG_ENABLE(starpufft-examples, [AS_HELP_STRING([--enable-starpufft-examples],
+			[disable execution of StarPU FFT examples])],
+			enable_starpufft_examples=$enableval, enable_starpufft_examples=no)
+AM_CONDITIONAL(BUILD_STARPUFFT_EXAMPLES, [test x$enable_starpufft_examples = xyes])
+
 ##########################################
 # hwloc                                  #
 ##########################################

doc/doxygen/chapters/41configure_options.doxy

@@ -426,6 +426,14 @@ library has to be 'atlas' or 'goto'.
 Disable the build of libstarpufft, even if <c>fftw</c> or <c>cuFFT</c> is available.
 </dd>
 
+<dt>--enable-starpufft-examples</dt>
+<dd>
+\anchor enable-starpufft-examples
+\addindex __configure__--enable-starpufft-examples
+Enable the compilation and the execution of the libstarpufft examples.
+By default, they are neither compiled nor checked.
+</dd>
+
 <dt>--with-magma=<c>prefix</c></dt>
 <dd>
 \anchor with-magma

doc/doxygen/doxygen-config.cfg.in

@@ -56,7 +56,7 @@ INPUT                  = @top_srcdir@/doc/doxygen/chapters \
 			 @top_srcdir@/include/starpu_util.h \
 			 @top_srcdir@/include/starpu_worker.h \
 			 @top_srcdir@/mpi/include/ \
-			 @top_srcdir@/starpufft/starpufft.h \
+			 @top_srcdir@/starpufft/include/starpufft.h \
 			 @top_srcdir@/sc_hypervisor/include
 
 EXAMPLE_PATH           = @top_srcdir@/doc/doxygen \

sc_hypervisor/examples/Makefile.am

@@ -40,7 +40,7 @@ cholesky_cholesky_implicit_SOURCES =		\
 	cholesky/cholesky_models.c		\
 	cholesky/cholesky_kernels.c		\
 	sched_ctx_utils/sched_ctx_utils.c	\
-	$(top_srcdir)/examples/common/blas.c
+	../../examples/common/blas.c
 
 cholesky_cholesky_implicit_LDADD =		\
 	$(top_builddir)/sc_hypervisor/src/libsc_hypervisor.la \

starpufft/Makefile.am

@@ -15,7 +15,11 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-SUBDIRS=src tests
+SUBDIRS=src
+
+if BUILD_STARPUFFT_EXAMPLES
+SUBDIRS += tests
+endif
 
 versincludedir = $(includedir)/starpu/$(STARPU_EFFECTIVE_VERSION)
 versinclude_HEADERS = 				\

tools/starpu_paje_draw_histogram.R

@@ -102,8 +102,22 @@ if (nrow(df)==0)
   stop("Result is empty!")
 
 # Plotting histograms
-plot <- ggplot(df, aes(x=Duration, fill=..count..)) + geom_histogram(binwidth = diff(range(df$Duration))/30)
+plot <- ggplot(df, aes(x=Duration)) + geom_histogram(aes(y=..count.., fill=..count..),binwidth = diff(range(df$Duration))/30)
 plot <- plot + theme_bw()  + scale_fill_gradient(high = "#132B43", low = "#56B1F7") + ggtitle("Histograms for state distribution") + ylab("Count") + xlab("Time [ms]") + theme(legend.position="none") + facet_grid(Origin~Value,scales = "free_y")
+
+# Adding text for total duration
+ad<-ggplot_build(plot)$data[[1]]
+al<-ggplot_build(plot)$panel$layout
+ad<-merge(ad,al)
+anno1 <- ddply(ad, .(ROW), summarise, x = max(x)*0.7, y = max(y)*0.9)
+anno1<-merge(anno1,al)
+anno2 <- ddply(df, .(Origin,Value), summarise, tot=as.integer(sum(Duration)))
+anno2$PANEL <- row.names(anno2)
+anno2$lab <- sprintf("Total duration: \n%ims",anno2$tot)
+anno <- merge(anno1,anno2)
+plot <- plot + geom_text(data = anno, aes(x=x, y=y, label=lab, colour="red"))
+
+# Printing plot
 plot
 
 # End