瀏覽代碼

mpi: move examples/complex/mpi_complex2.c to tests/user_defined_datatype.c

Nathalie Furmento 12 年之前
父節點
當前提交
4f94f38ec5
共有 3 個文件被更改,包括 11 次插入14 次删除
  1. 2 11
      mpi/examples/Makefile.am
  2. 9 3
      mpi/tests/Makefile.am
  3. 0 0
      mpi/tests/user_defined_datatype.c

+ 2 - 11
mpi/examples/Makefile.am

@@ -155,8 +155,7 @@ endif
 ###################
 
 examplebin_PROGRAMS +=			\
-	complex/mpi_complex		\
-	complex/mpi_complex2
+	complex/mpi_complex
 
 complex_mpi_complex_SOURCES =		\
 	complex/mpi_complex.c		\
@@ -165,16 +164,8 @@ complex_mpi_complex_SOURCES =		\
 complex_mpi_complex_LDADD =		\
 	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 
-complex_mpi_complex2_SOURCES =		\
-	complex/mpi_complex2.c		\
-	$(top_srcdir)/examples/interface/complex_interface.c
-
-complex_mpi_complex2_LDADD =		\
-	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
-
 check_PROGRAMS	+=			\
-	complex/mpi_complex		\
-	complex/mpi_complex2
+	complex/mpi_complex
 endif
 
 

+ 9 - 3
mpi/tests/Makefile.am

@@ -49,7 +49,7 @@ endif
 
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS)
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS) $(MAGMA_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_builddir)/include -I$(top_srcdir)/mpi/include -I$(top_srcdir)/src -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_builddir)/include -I$(top_srcdir)/mpi/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/examples/
 AM_LDFLAGS = $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS) $(FXT_LDFLAGS)
 
 ########################
@@ -77,7 +77,8 @@ check_PROGRAMS +=				\
 	insert_task_owner_data			\
 	multiple_send				\
 	mpi_scatter_gather			\
-	mpi_reduction
+	mpi_reduction				\
+	user_defined_datatype
 
 noinst_PROGRAMS =				\
 	pingpong				\
@@ -100,7 +101,8 @@ noinst_PROGRAMS =				\
 	insert_task_owner_data			\
 	multiple_send				\
 	mpi_scatter_gather			\
-	mpi_reduction
+	mpi_reduction				\
+	user_defined_datatype
 
 mpi_isend_LDADD =					\
 	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
@@ -144,6 +146,8 @@ mpi_scatter_gather_LDADD =			\
 	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 mpi_reduction_LDADD =			\
 	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
+user_defined_datatype_LDADD =			\
+	../src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 
 ring_SOURCES = ring.c
 ring_async_SOURCES = ring_async.c
@@ -155,6 +159,8 @@ ring_async_implicit_SOURCES += ring_kernel.cu
 endif
 mpi_reduction_SOURCES = mpi_reduction.c
 mpi_reduction_SOURCES += mpi_reduction_kernels.c
+user_defined_datatype_SOURCES = user_defined_datatype.c
+user_defined_datatype_SOURCES += $(top_srcdir)/examples/interface/complex_interface.c
 
 showcheck:
 	-cat $(TEST_LOGS) /dev/null

mpi/examples/complex/mpi_complex2.c → mpi/tests/user_defined_datatype.c