Browse Source

Fix make check in simgrid mode

Samuel Thibault 9 years ago
parent
commit
6549f3a00e

+ 1 - 1
doc/doxygen/chapters/01building.doxy

@@ -126,7 +126,7 @@ $ make
 Once everything is built, you may want to test the result. An
 Once everything is built, you may want to test the result. An
 extensive set of regression tests is provided with StarPU. Running the
 extensive set of regression tests is provided with StarPU. Running the
 tests is done by calling <c>make check</c>. These tests are run every night
 tests is done by calling <c>make check</c>. These tests are run every night
-and the result from the main profile is publicly available (http://starpu.gforge.inria.fr/testing/).
+and the result from the main profile is publicly available (http://starpu.gforge.inria.fr/testing/). Note: for the simgrid version, <c>STARPU_HOSTNAME=mirage make check</c> should be used instead.
 
 
 \verbatim
 \verbatim
 $ make check
 $ make check

+ 18 - 5
examples/Makefile.am

@@ -176,7 +176,13 @@ endif
 # Applications which should only be compiled are added directly in examplebin_PROGRAMS
 # Applications which should only be compiled are added directly in examplebin_PROGRAMS
 # see for instance mandelbrot/mandelbrot
 # see for instance mandelbrot/mandelbrot
 
 
-STARPU_EXAMPLES =				\
+STARPU_EXAMPLES =
+if STARPU_SIMGRID
+STARPU_EXAMPLES +=				\
+	sched_ctx/prio				\
+	worker_collections/worker_list_example
+else
+STARPU_EXAMPLES +=				\
 	basic_examples/hello_world		\
 	basic_examples/hello_world		\
 	basic_examples/vector_scal		\
 	basic_examples/vector_scal		\
 	basic_examples/mult			\
 	basic_examples/mult			\
@@ -208,12 +214,11 @@ STARPU_EXAMPLES =				\
 	scheduler/dummy_sched			\
 	scheduler/dummy_sched			\
 	scheduler/heteroprio_test		\
 	scheduler/heteroprio_test		\
 	sched_ctx/sched_ctx			\
 	sched_ctx/sched_ctx			\
-	sched_ctx/prio				\
 	sched_ctx/dummy_sched_with_ctx		\
 	sched_ctx/dummy_sched_with_ctx		\
 	worker_collections/worker_tree_example  \
 	worker_collections/worker_tree_example  \
-	worker_collections/worker_list_example  \
 	reductions/dot_product			\
 	reductions/dot_product			\
 	reductions/minmax_reduction
 	reductions/minmax_reduction
+endif
 
 
 if !STARPU_SIMGRID
 if !STARPU_SIMGRID
 STARPU_EXAMPLES +=				\
 STARPU_EXAMPLES +=				\
@@ -237,14 +242,17 @@ endif
 endif
 endif
 
 
 if !NO_BLAS_LIB
 if !NO_BLAS_LIB
+if STARPU_SIMGRID
 STARPU_EXAMPLES +=				\
 STARPU_EXAMPLES +=				\
-	axpy/axpy				\
 	mult/sgemm 				\
 	mult/sgemm 				\
 	mult/dgemm				\
 	mult/dgemm				\
 	cholesky/cholesky_tag			\
 	cholesky/cholesky_tag			\
 	cholesky/cholesky_tile_tag		\
 	cholesky/cholesky_tile_tag		\
+	cholesky/cholesky_implicit
+else
+STARPU_EXAMPLES +=				\
+	axpy/axpy				\
 	cholesky/cholesky_grain_tag		\
 	cholesky/cholesky_grain_tag		\
-	cholesky/cholesky_implicit		\
 	lu/lu_example_float			\
 	lu/lu_example_float			\
 	lu/lu_example_double			\
 	lu/lu_example_double			\
 	lu/lu_implicit_example_float		\
 	lu/lu_implicit_example_float		\
@@ -253,6 +261,9 @@ STARPU_EXAMPLES +=				\
 	cg/cg					\
 	cg/cg					\
 	pipeline/pipeline
 	pipeline/pipeline
 endif
 endif
+endif
+
+if !STARPU_SIMGRID
 
 
 if MKL_BLAS_LIB
 if MKL_BLAS_LIB
 STARPU_EXAMPLES +=				\
 STARPU_EXAMPLES +=				\
@@ -295,6 +306,8 @@ endif
 endif
 endif
 endif
 endif
 
 
+endif !STARPU_SIMGRID
+
 ##################
 ##################
 # Basic examples #
 # Basic examples #
 ##################
 ##################

+ 2 - 0
examples/stencil/Makefile.am

@@ -56,7 +56,9 @@ else
 check_PROGRAMS	=	$(LOADER) $(STARPU_EXAMPLES)
 check_PROGRAMS	=	$(LOADER) $(STARPU_EXAMPLES)
 endif
 endif
 
 
+if !STARPU_SIMGRID
 TESTS		=	$(STARPU_EXAMPLES)
 TESTS		=	$(STARPU_EXAMPLES)
+endif
 
 
 if !STARPU_HAVE_WINDOWS
 if !STARPU_HAVE_WINDOWS
 ## test loader program
 ## test loader program

+ 2 - 0
mpi/examples/Makefile.am

@@ -41,9 +41,11 @@ else
 TESTS_ENVIRONMENT 	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 TESTS_ENVIRONMENT 	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 endif
 
 
+if !STARPU_SIMGRID
 if STARPU_MPI_CHECK
 if STARPU_MPI_CHECK
 TESTS			=	$(starpu_mpi_EXAMPLES)
 TESTS			=	$(starpu_mpi_EXAMPLES)
 endif
 endif
+endif
 
 
 check_PROGRAMS = $(LOADER) $(starpu_mpi_EXAMPLES)
 check_PROGRAMS = $(LOADER) $(starpu_mpi_EXAMPLES)
 starpu_mpi_EXAMPLES =
 starpu_mpi_EXAMPLES =

+ 2 - 0
mpi/tests/Makefile.am

@@ -41,9 +41,11 @@ else
 TESTS_ENVIRONMENT 	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 TESTS_ENVIRONMENT 	=	top_builddir="$(abs_top_builddir)" top_srcdir="$(abs_top_srcdir)" $(MPI) $(LOADER_BIN)
 endif
 endif
 
 
+if !STARPU_SIMGRID
 if STARPU_MPI_CHECK
 if STARPU_MPI_CHECK
 TESTS			=	$(starpu_mpi_TESTS)
 TESTS			=	$(starpu_mpi_TESTS)
 endif
 endif
+endif
 
 
 check_PROGRAMS = $(LOADER) $(starpu_mpi_TESTS)
 check_PROGRAMS = $(LOADER) $(starpu_mpi_TESTS)
 
 

+ 2 - 0
socl/examples/Makefile.am

@@ -22,7 +22,9 @@ AM_LDFLAGS = $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS)
 
 
 
 
 SOCL_EXAMPLES	=
 SOCL_EXAMPLES	=
+if !STARPU_SIMGRID
 TESTS		=	$(SOCL_EXAMPLES)
 TESTS		=	$(SOCL_EXAMPLES)
+endif
 
 
 if STARPU_HAVE_WINDOWS
 if STARPU_HAVE_WINDOWS
 check_PROGRAMS	=	$(SOCL_EXAMPLES)
 check_PROGRAMS	=	$(SOCL_EXAMPLES)

+ 30 - 28
tests/Makefile.am

@@ -114,23 +114,47 @@ endif
 XFAIL_TESTS	=				\
 XFAIL_TESTS	=				\
 	errorcheck/invalid_blocking_calls
 	errorcheck/invalid_blocking_calls
 
 
-noinst_PROGRAMS =				\
+noinst_PROGRAMS =
+
+if STARPU_SIMGRID
+noinst_PROGRAMS +=				\
+	main/restart				\
+	main/execute_schedule			\
+	main/insert_task_pack			\
+	main/insert_task_nullcodelet		\
+	main/multithreaded_init			\
+	main/empty_task				\
+	main/empty_task_chain			\
+	main/starpu_worker_exists		\
+	main/codelet_null_callback		\
+	datawizard/allocate			\
+	datawizard/acquire_cb			\
+	datawizard/user_interaction_implicit	\
+	datawizard/interfaces/copy_interfaces	\
+	datawizard/locality			\
+	datawizard/simgrid-locality		\
+	errorcheck/starpu_init_noworker		\
+	errorcheck/invalid_tasks		\
+	helper/cublas_init			\
+	helper/pinned_memory			\
+	helper/execute_on_all			\
+	microbenchs/display_structures_size	\
+	microbenchs/local_pingpong		\
+	sched_ctx/sched_ctx_list		\
+	perfmodels/value_nan
+else
+noinst_PROGRAMS +=				\
 	main/deprecated_func			\
 	main/deprecated_func			\
 	main/driver_api/init_run_deinit         \
 	main/driver_api/init_run_deinit         \
 	main/driver_api/run_driver              \
 	main/driver_api/run_driver              \
 	main/deploop                            \
 	main/deploop                            \
-	main/restart				\
 	main/execute_on_a_specific_worker	\
 	main/execute_on_a_specific_worker	\
-	main/execute_schedule			\
 	main/insert_task			\
 	main/insert_task			\
-	main/insert_task_pack			\
 	main/insert_task_value			\
 	main/insert_task_value			\
 	main/insert_task_dyn_handles		\
 	main/insert_task_dyn_handles		\
-	main/insert_task_nullcodelet		\
 	main/insert_task_array			\
 	main/insert_task_array			\
 	main/insert_task_many			\
 	main/insert_task_many			\
 	main/multithreaded			\
 	main/multithreaded			\
-	main/multithreaded_init			\
 	main/starpu_task_bundle			\
 	main/starpu_task_bundle			\
 	main/starpu_task_wait_for_all		\
 	main/starpu_task_wait_for_all		\
 	main/starpu_task_wait			\
 	main/starpu_task_wait			\
@@ -144,10 +168,8 @@ noinst_PROGRAMS =				\
 	main/subgraph_repeat_tag		\
 	main/subgraph_repeat_tag		\
 	main/subgraph_repeat_regenerate		\
 	main/subgraph_repeat_regenerate		\
 	main/subgraph_repeat_regenerate_tag	\
 	main/subgraph_repeat_regenerate_tag	\
-	main/empty_task				\
 	main/empty_task_sync_point		\
 	main/empty_task_sync_point		\
 	main/empty_task_sync_point_tasks	\
 	main/empty_task_sync_point_tasks	\
-	main/empty_task_chain			\
 	main/tag_wait_api			\
 	main/tag_wait_api			\
 	main/tag_get_task			\
 	main/tag_get_task			\
 	main/task_wait_api			\
 	main/task_wait_api			\
@@ -156,14 +178,10 @@ noinst_PROGRAMS =				\
 	main/declare_deps_after_submission_synchronous	\
 	main/declare_deps_after_submission_synchronous	\
 	main/get_current_task			\
 	main/get_current_task			\
 	main/starpu_init			\
 	main/starpu_init			\
-	main/starpu_worker_exists		\
 	main/submit				\
 	main/submit				\
 	main/pause_resume			\
 	main/pause_resume			\
-	main/codelet_null_callback		\
 	main/pack				\
 	main/pack				\
 	main/get_children_tasks			\
 	main/get_children_tasks			\
-	datawizard/allocate			\
-	datawizard/acquire_cb			\
 	datawizard/acquire_cb_insert		\
 	datawizard/acquire_cb_insert		\
 	datawizard/acquire_release		\
 	datawizard/acquire_release		\
 	datawizard/acquire_release2		\
 	datawizard/acquire_release2		\
@@ -184,7 +202,6 @@ noinst_PROGRAMS =				\
 	datawizard/manual_reduction		\
 	datawizard/manual_reduction		\
 	datawizard/readers_and_writers		\
 	datawizard/readers_and_writers		\
 	datawizard/unpartition			\
 	datawizard/unpartition			\
-	datawizard/user_interaction_implicit	\
 	datawizard/sync_with_data_with_mem	\
 	datawizard/sync_with_data_with_mem	\
 	datawizard/sync_with_data_with_mem_non_blocking\
 	datawizard/sync_with_data_with_mem_non_blocking\
 	datawizard/sync_with_data_with_mem_non_blocking_implicit\
 	datawizard/sync_with_data_with_mem_non_blocking_implicit\
@@ -201,7 +218,6 @@ noinst_PROGRAMS =				\
 	datawizard/no_unregister		\
 	datawizard/no_unregister		\
 	datawizard/noreclaim			\
 	datawizard/noreclaim			\
 	datawizard/nowhere			\
 	datawizard/nowhere			\
-	datawizard/interfaces/copy_interfaces	\
 	datawizard/interfaces/block/block_interface \
 	datawizard/interfaces/block/block_interface \
 	datawizard/interfaces/bcsr/bcsr_interface \
 	datawizard/interfaces/bcsr/bcsr_interface \
 	datawizard/interfaces/coo/coo_interface \
 	datawizard/interfaces/coo/coo_interface \
@@ -228,30 +244,21 @@ noinst_PROGRAMS =				\
 	datawizard/specific_node		\
 	datawizard/specific_node		\
 	datawizard/task_with_multiple_time_the_same_handle	\
 	datawizard/task_with_multiple_time_the_same_handle	\
 	datawizard/test_arbiter			\
 	datawizard/test_arbiter			\
-	datawizard/locality			\
 	disk/disk_copy				\
 	disk/disk_copy				\
 	disk/disk_compute			\
 	disk/disk_compute			\
 	disk/disk_pack				\
 	disk/disk_pack				\
 	disk/mem_reclaim			\
 	disk/mem_reclaim			\
-	errorcheck/starpu_init_noworker		\
 	errorcheck/invalid_blocking_calls	\
 	errorcheck/invalid_blocking_calls	\
-	errorcheck/invalid_tasks		\
 	errorcheck/workers_cpuid		\
 	errorcheck/workers_cpuid		\
-	helper/cublas_init			\
 	helper/starpu_data_cpy			\
 	helper/starpu_data_cpy			\
-	helper/pinned_memory			\
-	helper/execute_on_all			\
 	helper/starpu_create_sync_task		\
 	helper/starpu_create_sync_task		\
 	microbenchs/async_tasks_overhead	\
 	microbenchs/async_tasks_overhead	\
-	microbenchs/display_structures_size	\
 	microbenchs/sync_tasks_overhead		\
 	microbenchs/sync_tasks_overhead		\
 	microbenchs/tasks_overhead		\
 	microbenchs/tasks_overhead		\
 	microbenchs/tasks_size_overhead		\
 	microbenchs/tasks_size_overhead		\
 	microbenchs/prefetch_data_on_node 	\
 	microbenchs/prefetch_data_on_node 	\
 	microbenchs/redundant_buffer		\
 	microbenchs/redundant_buffer		\
-	microbenchs/local_pingpong		\
 	microbenchs/matrix_as_vector		\
 	microbenchs/matrix_as_vector		\
-	sched_ctx/sched_ctx_list		\
 	openmp/init_exit_01			\
 	openmp/init_exit_01			\
 	openmp/init_exit_02			\
 	openmp/init_exit_02			\
 	openmp/environment			\
 	openmp/environment			\
@@ -297,17 +304,12 @@ noinst_PROGRAMS =				\
 	perfmodels/feed				\
 	perfmodels/feed				\
 	perfmodels/user_base			\
 	perfmodels/user_base			\
 	perfmodels/valid_model			\
 	perfmodels/valid_model			\
-	perfmodels/value_nan			\
 	perfmodels/memory			\
 	perfmodels/memory			\
 	sched_policies/data_locality            \
 	sched_policies/data_locality            \
 	sched_policies/execute_all_tasks        \
 	sched_policies/execute_all_tasks        \
 	sched_policies/prio        		\
 	sched_policies/prio        		\
 	sched_policies/simple_deps              \
 	sched_policies/simple_deps              \
 	sched_policies/simple_cpu_gpu_sched
 	sched_policies/simple_cpu_gpu_sched
-
-if STARPU_SIMGRID
-noinst_PROGRAMS +=				\
-	datawizard/simgrid-locality
 endif
 endif
 
 
 if STARPU_HAVE_FC
 if STARPU_HAVE_FC