Просмотр исходного кода

Revert 19018 : Update compilers to MPI compilers when MPI Master/slave is activated

Corentin Salingue лет назад: 8
Родитель
Сommit
3bddd16f9b
4 измененных файлов с 0 добавлено и 35 удалено
  1. 0 7
      examples/Makefile.am
  2. 0 20
      src/Makefile.am
  3. 0 5
      tests/Makefile.am
  4. 0 3
      tools/Makefile.am

+ 0 - 7
examples/Makefile.am

@@ -17,13 +17,6 @@
 #
 # 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

+ 0 - 20
src/Makefile.am

@@ -16,9 +16,6 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
-CC=$(MPISLAVECC)
-CCLD=$(MPISLAVECC)
-
 SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
@@ -138,9 +135,6 @@ 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					\
@@ -372,20 +366,6 @@ 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

+ 0 - 5
tests/Makefile.am

@@ -15,11 +15,6 @@
 #
 # 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

+ 0 - 3
tools/Makefile.am

@@ -15,9 +15,6 @@
 #
 # 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