merge trunk

doc/doxygen/Makefile.am

@@ -235,6 +235,8 @@ $(DOX_TAG): $(dox_inputs)
 	@if test -f html/navtree.js ; then $(SED) -i 's/\[ "Files", "Files.html", null \]/\[ "", "Files.html", null \]/' html/navtree.js ; fi
 	@$(SED) -i 's/.*"Files.html".*//' html/pages.html
 	@if test -f latex/main.tex ; then mv latex/main.tex latex/index.tex ; fi
+	@$(SED) -i '/\\begin{titlepage}/,$$d' $(DOX_LATEX_DIR)/refman.tex
+	@cat $(top_srcdir)/doc/doxygen/refman.tex >> $(DOX_LATEX_DIR)/refman.tex
 
 dist_pdf_DATA = $(DOX_PDF)
 

doc/doxygen/doxygen-config.cfg.in

@@ -65,6 +65,6 @@ EXAMPLE_PATH           = @top_srcdir@/doc/doxygen \
 
 INPUT_FILTER           = @top_builddir@/doc/doxygen/doxygen_filter.sh
 
-LATEX_HEADER           = @top_srcdir@/doc/doxygen/refman.tex
+#LATEX_HEADER           = @top_srcdir@/doc/doxygen/refman.tex
 
 IMAGE_PATH             = @top_srcdir@/doc/doxygen/chapters

doc/doxygen/refman.tex

@@ -1,52 +1,4 @@
-\documentclass{book}
-\usepackage[a4paper,top=2.5cm,bottom=2.5cm,left=2.5cm,right=2.5cm]{geometry}
-\usepackage{makeidx}
-\usepackage{natbib}
-\usepackage{graphicx}
-\usepackage{multicol}
-\usepackage{float}
-\usepackage{listings}
-\usepackage{color}
-\usepackage{ifthen}
-\usepackage[table]{xcolor}
-\usepackage{textcomp}
-\usepackage{alltt}
-\usepackage{ifpdf}
-\usepackage{./version}
-\ifpdf
-\usepackage[pdftex,
-            pagebackref=true,
-            colorlinks=true,
-            linkcolor=blue,
-            unicode
-           ]{hyperref}
-\else
-\usepackage[ps2pdf,
-            pagebackref=true,
-            colorlinks=true,
-            linkcolor=blue,
-            unicode
-           ]{hyperref}
-\usepackage{pspicture}
-\fi
-\usepackage[utf8]{inputenc}
-\usepackage{mathptmx}
-\usepackage[scaled=.90]{helvet}
-\usepackage{courier}
-\usepackage{sectsty}
-\usepackage{amssymb}
-\usepackage[titles]{tocloft}
-\usepackage{doxygen}
-\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=8,numbers=left }
-\makeindex
-\setcounter{tocdepth}{3}
-\renewcommand{\familydefault}{\sfdefault}
-\hfuzz=15pt
-\setlength{\emergencystretch}{15pt}
-\hbadness=750
-\tolerance=750
-\begin{document}
-\hypersetup{pageanchor=false,citecolor=blue}
+\input{./version.sty}
 \begin{titlepage}
 \vspace*{4cm}
 {\Huge \textbf{StarPU Handbook}}\\

examples/Makefile.am

@@ -123,22 +123,22 @@ noinst_HEADERS = 				\
 # What to install and what to check #
 #####################################
 
-STARPU_EXAMPLES	=
-TESTS		=	$(STARPU_EXAMPLES)
-TESTS		+=	scheduler/schedulers.sh
+examplebin_PROGRAMS 	+=	$(STARPU_EXAMPLES)
 
+TESTS			=	$(STARPU_EXAMPLES)
+TESTS			+=	scheduler/schedulers.sh
 
 if STARPU_HAVE_WINDOWS
-check_PROGRAMS	=	$(STARPU_EXAMPLES)
+check_PROGRAMS		=	$(STARPU_EXAMPLES)
 else
-check_PROGRAMS	=	$(LOADER) $(STARPU_EXAMPLES)
+check_PROGRAMS		=	$(LOADER) $(STARPU_EXAMPLES)
 endif
 
 if !STARPU_HAVE_WINDOWS
 ## test loader program
 if !STARPU_CROSS_COMPILING
 LOADER			=	loader
-loader_CPPFLAGS =  $(AM_CFLAGS) $(AM_CPPFLAGS) -I$(top_builddir)/src/
+loader_CPPFLAGS 	=	$(AM_CFLAGS) $(AM_CPPFLAGS) -I$(top_builddir)/src/
 LOADER_BIN		=	$(abs_top_builddir)/examples/$(LOADER)
 loader_SOURCES		=	../tests/loader.c
 else
@@ -155,22 +155,22 @@ endif
 
 endif
 
-examplebin_PROGRAMS +=				\
+# STARPU_EXAMPLES list all applications which have to be compiled and checked
+# Applications which should only be compiled are added directly in examplebin_PROGRAMS
+# see for instance mandelbrot/mandelbrot
+
+STARPU_EXAMPLES =				\
 	basic_examples/hello_world		\
 	basic_examples/vector_scal		\
 	basic_examples/mult			\
 	basic_examples/block			\
 	basic_examples/variable			\
 	basic_examples/multiformat              \
-	basic_examples/dynamic_handles		\
 	cpp/incrementer_cpp			\
-	filters/custom_mf/custom_mf_filter      \
 	filters/fvector				\
 	filters/fblock				\
 	filters/fmatrix				\
-	filters/shadow				\
-	filters/shadow2d			\
-	filters/shadow3d			\
+	filters/custom_mf/custom_mf_filter	\
 	tag_example/tag_example			\
 	tag_example/tag_example2		\
 	tag_example/tag_example3		\
@@ -185,33 +185,30 @@ examplebin_PROGRAMS +=				\
 	interface/complex			\
 	matvecmult/matvecmult			\
 	profiling/profiling			\
+	scheduler/dummy_sched			\
 	sched_ctx/sched_ctx			\
-	sched_ctx/parallel_code			\
-	sched_ctx/dummy_sched_with_ctx		\
 	sched_ctx/prio				\
+	sched_ctx/dummy_sched_with_ctx		\
 	sched_ctx/sched_ctx_without_sched_policy\
 	sched_ctx/nested_sched_ctxs		\
 	worker_collections/worker_tree_example  \
 	worker_collections/worker_list_example  \
 	reductions/dot_product			\
-	reductions/minmax_reduction		\
-	mandelbrot/mandelbrot			\
-	ppm_downscaler/ppm_downscaler		\
-	ppm_downscaler/yuv_downscaler
+	reductions/minmax_reduction
 
 if !STARPU_SIMGRID
-examplebin_PROGRAMS +=				\
+STARPU_EXAMPLES +=				\
 	scheduler/dummy_sched
 
 if STARPU_HAVE_F77_H
-examplebin_PROGRAMS +=				\
+STARPU_EXAMPLES +=				\
 	basic_examples/vector_scal_fortran	\
 	fortran/hello
 endif
 endif
 
 if !NO_BLAS_LIB
-examplebin_PROGRAMS +=				\
+STARPU_EXAMPLES +=				\
 	axpy/axpy				\
 	mult/sgemm 				\
 	mult/dgemm				\
@@ -229,7 +226,7 @@ examplebin_PROGRAMS +=				\
 endif
 
 if MKL_BLAS_LIB
-examplebin_PROGRAMS +=				\
+STARPU_EXAMPLES +=				\
 	lu/lu_example_complex_float		\
 	lu/lu_example_complex_double		\
 	lu/lu_implicit_example_complex_float	\
@@ -237,46 +234,10 @@ examplebin_PROGRAMS +=				\
 endif
 
 if ATLAS_BLAS_LIB
-examplebin_PROGRAMS +=				\
+STARPU_EXAMPLES +=				\
 	spmv/dw_block_spmv
 endif
 
-STARPU_EXAMPLES +=				\
-	basic_examples/hello_world		\
-	basic_examples/vector_scal		\
-	basic_examples/mult			\
-	basic_examples/block			\
-	basic_examples/variable			\
-	basic_examples/multiformat              \
-	cpp/incrementer_cpp			\
-	filters/fvector				\
-	filters/fblock				\
-	filters/fmatrix				\
-	tag_example/tag_example			\
-	tag_example/tag_example2		\
-	tag_example/tag_example3		\
-	tag_example/tag_example4		\
-	tag_example/tag_restartable		\
-	spmd/vector_scal_spmd			\
-	spmv/spmv				\
-	callback/callback			\
-	callback/prologue			\
-	incrementer/incrementer			\
-	binary/binary				\
-	interface/complex			\
-	matvecmult/matvecmult			\
-	profiling/profiling			\
-	scheduler/dummy_sched			\
-	sched_ctx/sched_ctx			\
-	sched_ctx/prio				\
-	sched_ctx/dummy_sched_with_ctx		\
-	sched_ctx/sched_ctx_without_sched_policy\
-	sched_ctx/nested_sched_ctxs		\
-	worker_collections/worker_tree_example  \
-	worker_collections/worker_list_example  \
-	reductions/dot_product			\
-	reductions/minmax_reduction
-
 if STARPU_LONG_CHECK
 STARPU_EXAMPLES +=				\
 	sched_ctx/parallel_code
@@ -288,35 +249,16 @@ STARPU_EXAMPLES +=				\
 	fortran/hello
 endif
 
-if !NO_BLAS_LIB
+if !STARPU_HAVE_WINDOWS
 STARPU_EXAMPLES +=				\
-	axpy/axpy				\
-	mult/sgemm 				\
-	mult/dgemm				\
-	cholesky/cholesky_tag			\
-	cholesky/cholesky_tile_tag		\
-	cholesky/cholesky_grain_tag		\
-	cholesky/cholesky_implicit		\
-	lu/lu_example_float			\
-	lu/lu_example_double			\
-	lu/lu_implicit_example_float		\
-	lu/lu_implicit_example_double		\
-	heat/heat				\
-	cg/cg					\
-	pipeline/pipeline
-endif
+	openmp/vector_scal_omp			\
+	sched_ctx/sched_ctx_without_sched_policy\
+	sched_ctx/nested_sched_ctxs
 
-if MKL_BLAS_LIB
+if STARPU_LONG_CHECK
 STARPU_EXAMPLES +=				\
-	lu/lu_example_complex_float		\
-	lu/lu_example_complex_double		\
-	lu/lu_implicit_example_complex_float	\
-	lu/lu_implicit_example_complex_double
+	sched_ctx/parallel_code
 endif
-
-if ATLAS_BLAS_LIB
-STARPU_EXAMPLES +=				\
-	spmv/dw_block_spmv
 endif
 
 ##################
@@ -428,7 +370,6 @@ nobase_STARPU_OPENCL_DATA_DATA += 		\
 	basic_examples/variable_kernels_opencl_kernel.cl
 endif
 
-
 ###########
 # Filters #
 ###########
@@ -448,7 +389,6 @@ nobase_STARPU_OPENCL_DATA_DATA += \
 	filters/fblock_opencl_kernel.cl
 endif
 
-
 #############################
 # Custom multiformat filter #
 #############################
@@ -826,6 +766,9 @@ endif
 # Mandelbrot Set #
 ##################
 
+examplebin_PROGRAMS +=				\
+	mandelbrot/mandelbrot
+
 mandelbrot_mandelbrot_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
 if HAVE_X11
 mandelbrot_mandelbrot_CPPFLAGS += $(X_CFLAGS)
@@ -846,10 +789,6 @@ top_hello_world_top_SOURCES =			\
 # Pi #
 ######
 
-check_PROGRAMS +=				\
-	pi/pi					\
-	pi/pi_redux
-
 examplebin_PROGRAMS +=				\
 	pi/pi					\
 	pi/pi_redux
@@ -915,9 +854,6 @@ endif
 ##################
 
 if !STARPU_HAVE_WINDOWS
-examplebin_PROGRAMS +=		\
-	openmp/vector_scal_omp
-
 openmp_vector_scal_omp_CFLAGS = \
 	$(AM_CFLAGS) -fopenmp
 
@@ -937,3 +873,4 @@ showcheck:
 	for i in $(SUBDIRS) ; do \
 		make -C $$i showcheck ; \
 	done
+