Sfoglia il codice sorgente

Update compilers to MPI compilers when MPI Master/slave is activated

Corentin Salingue 8 anni fa
parent
commit
a563414b41
4 ha cambiato i file con 35 aggiunte e 0 eliminazioni
  1. 7 0
      examples/Makefile.am
  2. 20 0
      src/Makefile.am
  3. 5 0
      tests/Makefile.am
  4. 3 0
      tools/Makefile.am

+ 7 - 0
examples/Makefile.am

@@ -17,6 +17,13 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+CC=$(MPISLAVECC)
+CCLD=$(MPISLAVECC)
+CXX=$(MPISLAVECXX)
+CXXLD=$(MPISLAVECXX)
+F77LD=$(MPIFORT)
+FCLD=$(MPIFORT)
+
 include $(top_srcdir)/starpu.mk
 
 if STARPU_SIMGRID

+ 20 - 0
src/Makefile.am

@@ -16,6 +16,9 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+CC=$(MPISLAVECC)
+CCLD=$(MPISLAVECC)
+
 SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
@@ -135,6 +138,9 @@ noinst_HEADERS = 						\
 	drivers/scc/driver_scc_common.h				\
 	drivers/scc/driver_scc_source.h				\
 	drivers/scc/driver_scc_sink.h				\
+	drivers/mpi/driver_mpi_common.h				\
+	drivers/mpi/driver_mpi_source.h				\
+	drivers/mpi/driver_mpi_sink.h				\
 	drivers/disk/driver_disk.h				\
 	debug/traces/starpu_fxt.h				\
 	profiling/bound.h					\
@@ -366,6 +372,20 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += drivers/mic/driver_mic_utils.
 endif
 
 #########################################
+#										#
+#	 MPI Master/Slave compilation		#
+#										#
+#########################################
+
+#libstarpu_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS += $(MPICC_LDFLAGS)
+if STARPU_USE_MPI_MASTER_SLAVE
+libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += drivers/mpi/driver_mpi_common.c
+libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += drivers/mpi/driver_mpi_source.c
+libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES += drivers/mpi/driver_mpi_sink.c
+endif
+
+
+#########################################
 
 showcheck:
 	-cat /dev/null

+ 5 - 0
tests/Makefile.am

@@ -15,6 +15,11 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+CC=$(MPISLAVECC)
+CCLD=$(MPISLAVECC)
+CXX=$(MPISLAVECXX)
+CXXLD=$(MPISLAVECXX)
+
 include $(top_srcdir)/starpu.mk
 
 if STARPU_SIMGRID

+ 3 - 0
tools/Makefile.am

@@ -15,6 +15,9 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+CC=$(MPISLAVECC)
+CCLD=$(MPISLAVECC)
+
 include $(top_srcdir)/starpu.mk
 
 if STARPU_SIMGRID