From c1b59942c96211c00f38b931c1a6a513616f8663 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 28 Mar 2013 21:47:04 +0100 Subject: [PATCH] Don't build smpi in a separate library anymore. --- ChangeLog | 6 +- buildtools/Cmake/DefinePackages.cmake | 13 +- buildtools/Cmake/Distrib.cmake | 11 -- buildtools/Cmake/MakeLib.cmake | 28 +-- buildtools/Cmake/MakeLibWin.cmake | 11 -- buildtools/Cmake/Option.cmake | 4 +- examples/smpi/CMakeLists.txt | 14 +- examples/smpi/MM/CMakeLists.txt | 2 +- src/smpi/smpicc.in | 4 +- src/smpi/smpif90.in | 2 +- teshsuite/smpi/CMakeLists.txt | 38 ++-- teshsuite/smpi/mpich-test/coll/CMakeLists.txt | 66 +++---- .../smpi/mpich-test/context/CMakeLists.txt | 22 +-- teshsuite/smpi/mpich-test/env/CMakeLists.txt | 28 +-- .../smpi/mpich-test/profile/CMakeLists.txt | 4 +- .../smpi/mpich-test/pt2pt/CMakeLists.txt | 180 +++++++++--------- 16 files changed, 204 insertions(+), 229 deletions(-) diff --git a/ChangeLog b/ChangeLog index 517631339e..2f30967188 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,12 +12,14 @@ SimGrid (3.10) NOT RELEASED; urgency=low cached in the Java world SMPI: + * SMPI is not built as a separate library anymore, it's now included in + libsimgrid. * Improvements of the SMPI replay tool: - Most of the collective communications are now rooted in the same process as in the original application. - - Traces now rely on the same MPI datatype as the application (MPI_BYTE was + - Traces now rely on the same MPI datatype as the application (MPI_BYTE was used until now). Multiple datatypes can now be used in a trace. - - The replay tool now supports traces produce either by TAU or a modified + - The replay tool now supports traces produce either by TAU or a modified version of MPE. - Bug Fix: the compute part of the reduce action is now taken into account. diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 5ddc2b72c8..893be50b03 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -607,7 +607,6 @@ set(simgrid_sources ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC} - ${SMPI_SRC} ) if(${HAVE_JEDULE}) @@ -622,6 +621,18 @@ else() ) endif() +if(enable_smpi) + set(simgrid_sources + ${simgrid_sources} + ${SMPI_SRC} + ) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + ${SMPI_SRC} + ) +endif() + if(${HAVE_TRACING}) set(simgrid_sources ${simgrid_sources} diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 4e314ba5cc..b84a0f0169 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -61,18 +61,9 @@ add_custom_target(simgrid_update_xml ALL install(TARGETS simgrid DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -if(enable_smpi) - install(TARGETS smpi - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) -endif() - if(enable_lib_static AND NOT WIN32) install(TARGETS simgrid_static DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - if(enable_smpi) - install(TARGETS smpi_static - DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/) - endif() endif() if(enable_java) @@ -127,7 +118,6 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/doc/simgrid COMMAND ${CMAKE_COMMAND} -E echo "uninstall doc ok" COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsimgrid* - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/libsmpi* COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid* COMMAND ${CMAKE_COMMAND} -E echo "uninstall lib ok" COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpicc @@ -189,7 +179,6 @@ set(source_to_pack ${SIMDAG_SRC} ${SIMGRID_SRC} ${SIMIX_SRC} - ${SMPI_SRC} ${SURF_SRC} ${TRACING_SRC} ${XBT_RL_SRC} diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake index e31007bda8..0c8e76f6d4 100644 --- a/buildtools/Cmake/MakeLib.cmake +++ b/buildtools/Cmake/MakeLib.cmake @@ -15,14 +15,6 @@ if(enable_lib_static) add_library(simgrid_static STATIC ${simgrid_sources}) endif() -if(enable_smpi) - add_library(smpi SHARED ${SMPI_SRC}) - set_target_properties(smpi PROPERTIES VERSION ${libsmpi_version}) - if(enable_lib_static) - add_library(smpi_static STATIC ${SMPI_SRC}) - endif() -endif() - if(enable_java) include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake) endif() @@ -37,9 +29,9 @@ if (enable_supernovae) endif() if(enable_smpi) - add_dependencies(smpi ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) + add_dependencies(simgrid ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) if(enable_lib_static) - add_dependencies(smpi_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) + add_dependencies(simgrid_static ${CMAKE_CURRENT_BINARY_DIR}/src/supernovae_smpi.c) endif() endif() endif() @@ -126,28 +118,20 @@ if(HAVE_POSIX_GETTIME) SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt") endif() -target_link_libraries(simgrid ${SIMGRID_DEP}) - # Compute the dependencies of SMPI ################################## -set(SMPI_DEP "") -if(APPLE) - set(SMPI_DEP "-Wl,-U -Wl,_smpi_simulated_main") -endif() -if(enable_smpi) - target_link_libraries(smpi simgrid ${SMPI_DEP}) +if(enable_smpi AND APPLE) + set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-U -Wl,_smpi_simulated_main") endif() +target_link_libraries(simgrid ${SIMGRID_DEP}) + # Pass dependencies to static libs ################################## if(enable_lib_static) target_link_libraries(simgrid_static ${SIMGRID_DEP}) add_dependencies(simgrid_static maintainer_files) set_target_properties(simgrid_static PROPERTIES OUTPUT_NAME simgrid) - if(enable_smpi) - target_link_libraries(smpi_static simgrid ${SMPI_DEP}) - set_target_properties(smpi_static PROPERTIES OUTPUT_NAME smpi) - endif() endif() # Dependencies from maintainer mode diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 168e85a243..081c6e0530 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -41,14 +41,3 @@ if(PEXPORTS_PATH) add_custom_command(TARGET simgrid POST_BUILD COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsimgrid.dll > ${CMAKE_BINARY_DIR}/lib/libsimgrid.def) endif() - -if(enable_smpi) - set(SMPI_DEP "${LIBRARY_OUTPUT_PATH}/libsimgrid.dll") - add_library(smpi SHARED ${SMPI_SRC}) - set_target_properties(smpi PROPERTIES COMPILE_FLAGS "-D_XBT_DLL_EXPORT -DDLL_EXPORT" LINK_FLAGS "-shared" VERSION ${libsmpi_version} PREFIX "lib" SUFFIX ".dll" IMPORT_PREFIX "lib" IMPORT_SUFFIX ".dll") - target_link_libraries(smpi ${SMPI_DEP}) - if(PEXPORTS_PATH) - add_custom_command(TARGET smpi POST_BUILD - COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/libsmpi.dll > ${CMAKE_BINARY_DIR}/lib/libsmpi.def) - endif() -endif() diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index af31674360..2df5821be0 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -41,9 +41,9 @@ option(enable_supernovae "Whether Supernovae mode (helping compiler optimization option(enable_msg_deprecated "This option enable the use of msg deprecated functions" off) if(WIN32) - option(enable_smpi "Whether the smpi library is compiled." off) + option(enable_smpi "Whether SMPI in included in library." off) else() - option(enable_smpi "Whether the smpi library is compiled." on) + option(enable_smpi "Whether SMPI in included in library." on) endif() mark_as_advanced(HAVE_SSH) diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt index eda1d8214e..58d9040926 100644 --- a/examples/smpi/CMakeLists.txt +++ b/examples/smpi/CMakeLists.txt @@ -20,13 +20,13 @@ if(enable_smpi) add_executable(mc_bugged2 mc_bugged2.c) add_executable(smpi_replay replay/replay.c) - target_link_libraries(bcbench simgrid smpi ) - target_link_libraries(mvmul simgrid smpi ) - target_link_libraries(smpi_traced simgrid smpi ) - target_link_libraries(smpi_traced_simple simgrid smpi ) - target_link_libraries(mc_bugged1 simgrid smpi ) - target_link_libraries(mc_bugged2 simgrid smpi ) - target_link_libraries(smpi_replay simgrid smpi ) + target_link_libraries(bcbench simgrid) + target_link_libraries(mvmul simgrid) + target_link_libraries(smpi_traced simgrid) + target_link_libraries(smpi_traced_simple simgrid) + target_link_libraries(mc_bugged1 simgrid) + target_link_libraries(mc_bugged2 simgrid) + target_link_libraries(smpi_replay simgrid) endif() diff --git a/examples/smpi/MM/CMakeLists.txt b/examples/smpi/MM/CMakeLists.txt index 29650489ea..366f39c754 100644 --- a/examples/smpi/MM/CMakeLists.txt +++ b/examples/smpi/MM/CMakeLists.txt @@ -8,7 +8,7 @@ if(enable_smpi) if(NOT WIN32) add_executable(MM_mpi MM_mpi.c 2.5D_MM.c Summa.c Matrix_init.c) ### Add definitions for compile - target_link_libraries(MM_mpi simgrid pthread smpi) + target_link_libraries(MM_mpi simgrid pthread) endif() endif() diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in index 38240c0f55..03c26b3404 100755 --- a/src/smpi/smpicc.in +++ b/src/smpi/smpicc.in @@ -7,10 +7,10 @@ CMAKE_LINKARGS="-L@libdir@" if [ "@WIN32@" != "1" ]; then CFLAGS="-Dmain=smpi_simulated_main__" - LINKARGS="-lsimgrid -lsmpi" + LINKARGS="-lsimgrid" else CFLAGS="-include @includedir@/smpi/smpi_main.h" - LINKARGS="@libdir@\libsimgrid.dll @libdir@\libsmpi.dll" + LINKARGS="@libdir@\libsimgrid.dll" fi CMDLINE="" diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in index 2d76ad20df..9864551d2d 100644 --- a/src/smpi/smpif90.in +++ b/src/smpi/smpif90.in @@ -6,7 +6,7 @@ INCLUDEARGS="@includeflag@" CMAKE_LINKARGS="-L@libdir@" FFLAGS="-ff2c " -LINKARGS="-lsimgrid -lsmpi -lm -lgfortran" +LINKARGS="-lsimgrid -lm -lgfortran" main_name=main TMPFILE=$(mktemp).f90 CMDLINE="" diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index a6a544bbe0..857c23b317 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -30,30 +30,30 @@ if(enable_smpi) add_executable(indexed_test indexed_test.c) add_executable(struct_test struct_test.c) - target_link_libraries(alltoall2 simgrid smpi ) - target_link_libraries(alltoall_basic simgrid smpi ) - target_link_libraries(alltoallv simgrid smpi ) - target_link_libraries(allreduce simgrid smpi ) - target_link_libraries(bcast simgrid smpi ) - target_link_libraries(compute simgrid smpi ) - target_link_libraries(compute2 simgrid smpi ) - target_link_libraries(compute3 simgrid smpi ) - target_link_libraries(pingpong simgrid smpi ) - target_link_libraries(scatter simgrid smpi ) - target_link_libraries(reduce simgrid smpi ) - target_link_libraries(split simgrid smpi ) - target_link_libraries(smpi_sendrecv simgrid smpi ) - target_link_libraries(ttest01 simgrid smpi ) - target_link_libraries(vector_test simgrid smpi ) - target_link_libraries(hvector_test simgrid smpi ) - target_link_libraries(indexed_test simgrid smpi ) - target_link_libraries(struct_test simgrid smpi ) + target_link_libraries(alltoall2 simgrid) + target_link_libraries(alltoall_basic simgrid) + target_link_libraries(alltoallv simgrid) + target_link_libraries(allreduce simgrid) + target_link_libraries(bcast simgrid) + target_link_libraries(compute simgrid) + target_link_libraries(compute2 simgrid) + target_link_libraries(compute3 simgrid) + target_link_libraries(pingpong simgrid) + target_link_libraries(scatter simgrid) + target_link_libraries(reduce simgrid) + target_link_libraries(split simgrid) + target_link_libraries(smpi_sendrecv simgrid) + target_link_libraries(ttest01 simgrid) + target_link_libraries(vector_test simgrid) + target_link_libraries(hvector_test simgrid) + target_link_libraries(indexed_test simgrid) + target_link_libraries(struct_test simgrid) set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv) if(NOT WIN32) add_executable(dsend dsend.c) - target_link_libraries(dsend m simgrid smpi ) + target_link_libraries(dsend m simgrid) endif() endif() diff --git a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt index 7cb0c9436e..3fa64ff7e3 100644 --- a/teshsuite/smpi/mpich-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/coll/CMakeLists.txt @@ -51,40 +51,40 @@ if(enable_smpi) add_executable(bcastlog bcastlog.f) endif() - target_link_libraries(coll1 simgrid smpi ) - target_link_libraries(coll2 simgrid smpi ) - target_link_libraries(coll3 simgrid smpi ) - target_link_libraries(coll4 simgrid smpi ) - target_link_libraries(coll5 simgrid smpi ) - target_link_libraries(coll6 simgrid smpi ) - target_link_libraries(coll7 simgrid smpi ) - target_link_libraries(coll8 simgrid smpi ) - target_link_libraries(coll9 simgrid smpi ) - target_link_libraries(coll10 simgrid smpi ) - target_link_libraries(coll11 simgrid smpi ) - target_link_libraries(coll12 simgrid smpi ) - target_link_libraries(coll13 simgrid smpi ) - target_link_libraries(allredmany simgrid smpi ) - target_link_libraries(bcastbug simgrid smpi ) - target_link_libraries(bcastbug2 simgrid smpi ) - target_link_libraries(bcastvec simgrid smpi ) - target_link_libraries(grouptest simgrid smpi ) - target_link_libraries(redtst simgrid smpi ) - target_link_libraries(barrier simgrid smpi ) - target_link_libraries(bcast_mpich simgrid smpi ) - target_link_libraries(allred simgrid smpi ) - target_link_libraries(allred2 simgrid smpi ) - target_link_libraries(scatterv simgrid smpi ) - target_link_libraries(scattern simgrid smpi ) - target_link_libraries(redscat simgrid smpi ) - target_link_libraries(longuser simgrid smpi ) - target_link_libraries(alltoallv_mpich simgrid smpi ) - target_link_libraries(scantst simgrid smpi ) + target_link_libraries(coll1 simgrid) + target_link_libraries(coll2 simgrid) + target_link_libraries(coll3 simgrid) + target_link_libraries(coll4 simgrid) + target_link_libraries(coll5 simgrid) + target_link_libraries(coll6 simgrid) + target_link_libraries(coll7 simgrid) + target_link_libraries(coll8 simgrid) + target_link_libraries(coll9 simgrid) + target_link_libraries(coll10 simgrid) + target_link_libraries(coll11 simgrid) + target_link_libraries(coll12 simgrid) + target_link_libraries(coll13 simgrid) + target_link_libraries(allredmany simgrid) + target_link_libraries(bcastbug simgrid) + target_link_libraries(bcastbug2 simgrid) + target_link_libraries(bcastvec simgrid) + target_link_libraries(grouptest simgrid) + target_link_libraries(redtst simgrid) + target_link_libraries(barrier simgrid) + target_link_libraries(bcast_mpich simgrid) + target_link_libraries(allred simgrid) + target_link_libraries(allred2 simgrid) + target_link_libraries(scatterv simgrid) + target_link_libraries(scattern simgrid) + target_link_libraries(redscat simgrid) + target_link_libraries(longuser simgrid) + target_link_libraries(alltoallv_mpich simgrid) + target_link_libraries(scantst simgrid) if(SMPI_F2C) - target_link_libraries(allredf simgrid smpi ) - target_link_libraries(assocf simgrid smpi ) - target_link_libraries(allgatherf simgrid smpi ) - target_link_libraries(bcastlog simgrid smpi ) + target_link_libraries(allredf simgrid) + target_link_libraries(assocf simgrid) + target_link_libraries(allgatherf simgrid) + target_link_libraries(bcastlog simgrid) endif() set_target_properties(coll1 PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/context/CMakeLists.txt b/teshsuite/smpi/mpich-test/context/CMakeLists.txt index 4defd0ff20..fe255e0357 100644 --- a/teshsuite/smpi/mpich-test/context/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/context/CMakeLists.txt @@ -30,19 +30,19 @@ if(enable_smpi) #add_executable(commnames_f commnamesf.f) endif() - target_link_libraries(attrerr simgrid smpi ) - # target_link_libraries(attrt simgrid smpi ) - # target_link_libraries(commnames simgrid smpi ) - target_link_libraries(groupcreate simgrid smpi ) - target_link_libraries(grouptest_mpich simgrid smpi ) - target_link_libraries(icdup simgrid smpi ) - target_link_libraries(ictest simgrid smpi ) - target_link_libraries(ictest2 simgrid smpi ) - target_link_libraries(ictest3 simgrid smpi ) + target_link_libraries(attrerr simgrid) + # target_link_libraries(attrt simgrid) + # target_link_libraries(commnames simgrid) + target_link_libraries(groupcreate simgrid) + target_link_libraries(grouptest_mpich simgrid) + target_link_libraries(icdup simgrid) + target_link_libraries(ictest simgrid) + target_link_libraries(ictest2 simgrid) + target_link_libraries(ictest3 simgrid) if(SMPI_F2C) - #target_link_libraries(attrtest_f simgrid smpi f2c) - #target_link_libraries(commnames_f simgrid smpi f2c) + #target_link_libraries(attrtest_f simgrid f2c) + #target_link_libraries(commnames_f simgrid f2c) endif() set_target_properties(attrerr PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/env/CMakeLists.txt b/teshsuite/smpi/mpich-test/env/CMakeLists.txt index a81ab47b4d..65f9eba709 100644 --- a/teshsuite/smpi/mpich-test/env/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/env/CMakeLists.txt @@ -31,23 +31,23 @@ if(enable_smpi) # add_executable(errstringsf errstringsf.f) add_executable(getprocf getprocf.f) endif() - target_link_libraries(init simgrid smpi ) - target_link_libraries(timers simgrid smpi ) - target_link_libraries(timertest simgrid smpi ) - target_link_libraries(baseattr simgrid smpi ) - target_link_libraries(gtime simgrid smpi ) - target_link_libraries(errhand simgrid smpi ) + target_link_libraries(init simgrid) + target_link_libraries(timers simgrid) + target_link_libraries(timertest simgrid) + target_link_libraries(baseattr simgrid) + target_link_libraries(gtime simgrid) + target_link_libraries(errhand simgrid) if(NOT WIN32) - target_link_libraries(sigchk simgrid smpi ) + target_link_libraries(sigchk simgrid) endif() - target_link_libraries(aborttest simgrid smpi ) - target_link_libraries(testerr simgrid smpi ) - target_link_libraries(getproc simgrid smpi ) + target_link_libraries(aborttest simgrid) + target_link_libraries(testerr simgrid) + target_link_libraries(getproc simgrid) if(SMPI_F2C) -# target_link_libraries(baseattrf simgrid smpi ) -# target_link_libraries(errhandf simgrid smpi ) -# target_link_libraries(errstringsf simgrid smpi ) - target_link_libraries(getprocf simgrid smpi ) +# target_link_libraries(baseattrf simgrid) +# target_link_libraries(errhandf simgrid) +# target_link_libraries(errstringsf simgrid) + target_link_libraries(getprocf simgrid) endif() set_target_properties(timers PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt index 024ee2b27f..7fae884fb8 100644 --- a/teshsuite/smpi/mpich-test/profile/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/profile/CMakeLists.txt @@ -15,8 +15,8 @@ if(enable_smpi) add_executable(ptest ptest.c ) add_executable(colluses colluses.c ) - target_link_libraries(ptest simgrid smpi ) - target_link_libraries(colluses simgrid smpi ) + target_link_libraries(ptest simgrid) + target_link_libraries(colluses simgrid) set_target_properties(ptest PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") set_target_properties(colluses PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt index 5482e0c2b7..0503262809 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt @@ -105,97 +105,97 @@ if(enable_smpi) add_executable(typebasef typebasef.f) endif() - target_link_libraries(overtake simgrid smpi ) - target_link_libraries(bsendtest simgrid smpi ) - target_link_libraries(relrank simgrid smpi ) - target_link_libraries(sendrecv_mpich simgrid smpi ) - target_link_libraries(persistent simgrid smpi ) - target_link_libraries(flood simgrid smpi ) - target_link_libraries(flood2 simgrid smpi ) - target_link_libraries(persist simgrid smpi ) - target_link_libraries(persist2 simgrid smpi ) - target_link_libraries(sendrecv2 simgrid smpi ) - target_link_libraries(sendrecv3 simgrid smpi ) - target_link_libraries(sendrecv4 simgrid smpi ) - target_link_libraries(irsend simgrid smpi ) - target_link_libraries(irsendinit simgrid smpi ) - target_link_libraries(longmsgs simgrid smpi ) - target_link_libraries(testsome simgrid smpi ) - target_link_libraries(testall_mpich simgrid smpi ) - target_link_libraries(sndrcv simgrid smpi ) - target_link_libraries(sndrcvrep simgrid smpi ) - target_link_libraries(sndrcvrpl2 simgrid smpi ) - target_link_libraries(getelm simgrid smpi ) - target_link_libraries(self simgrid smpi ) - target_link_libraries(typelb simgrid smpi ) - target_link_libraries(structlb simgrid smpi ) - target_link_libraries(typeub simgrid smpi ) - target_link_libraries(typeub2 simgrid smpi ) - target_link_libraries(typeub3 simgrid smpi ) - target_link_libraries(typecreate simgrid smpi ) - target_link_libraries(reqcreate simgrid smpi ) - target_link_libraries(reqfree simgrid smpi ) - target_link_libraries(isndrcv simgrid smpi ) - target_link_libraries(nullproc simgrid smpi ) - target_link_libraries(nullproc2 simgrid smpi ) - target_link_libraries(trunc simgrid smpi ) - target_link_libraries(truncmult simgrid smpi ) - target_link_libraries(typetest simgrid smpi ) - target_link_libraries(typebase simgrid smpi ) - target_link_libraries(ssendtest simgrid smpi ) - target_link_libraries(ssendtest2 simgrid smpi ) - target_link_libraries(issendtest simgrid smpi ) - target_link_libraries(issend2 simgrid smpi ) - target_link_libraries(issendinit simgrid smpi ) - target_link_libraries(testtypes simgrid smpi ) - target_link_libraries(dataalign simgrid smpi ) - target_link_libraries(dtyperecv simgrid smpi ) - target_link_libraries(dtypelife simgrid smpi ) - target_link_libraries(htmsg simgrid smpi ) - target_link_libraries(isendtest simgrid smpi ) - target_link_libraries(third simgrid smpi ) - target_link_libraries(fourth simgrid smpi ) - target_link_libraries(fifth simgrid smpi ) - target_link_libraries(sixth simgrid smpi ) - target_link_libraries(probe simgrid smpi ) - target_link_libraries(nblock simgrid smpi ) - target_link_libraries(sendmany simgrid smpi ) - target_link_libraries(order simgrid smpi ) - target_link_libraries(pack simgrid smpi ) - target_link_libraries(probe1 simgrid smpi ) - target_link_libraries(testtest1 simgrid smpi ) - target_link_libraries(hvectest simgrid smpi ) - target_link_libraries(hvectest2 simgrid smpi ) - target_link_libraries(hvec simgrid smpi ) - target_link_libraries(hindexed simgrid smpi ) - target_link_libraries(irecvtest simgrid smpi ) - target_link_libraries(nbtest simgrid smpi ) - target_link_libraries(waitany simgrid smpi ) - target_link_libraries(waitall simgrid smpi ) - target_link_libraries(waitall2 simgrid smpi ) - target_link_libraries(waitall3 simgrid smpi ) - target_link_libraries(waitall4 simgrid smpi ) - target_link_libraries(commit simgrid smpi ) - target_link_libraries(cancel simgrid smpi ) - target_link_libraries(cancel2 simgrid smpi ) - target_link_libraries(cancel3 simgrid smpi ) - target_link_libraries(cancelmessages simgrid smpi ) - target_link_libraries(cancelibm simgrid smpi ) - target_link_libraries(cancelissend simgrid smpi ) - target_link_libraries(sendorder simgrid smpi ) - target_link_libraries(exittest simgrid smpi ) - target_link_libraries(selfvsworld simgrid smpi ) + target_link_libraries(overtake simgrid) + target_link_libraries(bsendtest simgrid) + target_link_libraries(relrank simgrid) + target_link_libraries(sendrecv_mpich simgrid) + target_link_libraries(persistent simgrid) + target_link_libraries(flood simgrid) + target_link_libraries(flood2 simgrid) + target_link_libraries(persist simgrid) + target_link_libraries(persist2 simgrid) + target_link_libraries(sendrecv2 simgrid) + target_link_libraries(sendrecv3 simgrid) + target_link_libraries(sendrecv4 simgrid) + target_link_libraries(irsend simgrid) + target_link_libraries(irsendinit simgrid) + target_link_libraries(longmsgs simgrid) + target_link_libraries(testsome simgrid) + target_link_libraries(testall_mpich simgrid) + target_link_libraries(sndrcv simgrid) + target_link_libraries(sndrcvrep simgrid) + target_link_libraries(sndrcvrpl2 simgrid) + target_link_libraries(getelm simgrid) + target_link_libraries(self simgrid) + target_link_libraries(typelb simgrid) + target_link_libraries(structlb simgrid) + target_link_libraries(typeub simgrid) + target_link_libraries(typeub2 simgrid) + target_link_libraries(typeub3 simgrid) + target_link_libraries(typecreate simgrid) + target_link_libraries(reqcreate simgrid) + target_link_libraries(reqfree simgrid) + target_link_libraries(isndrcv simgrid) + target_link_libraries(nullproc simgrid) + target_link_libraries(nullproc2 simgrid) + target_link_libraries(trunc simgrid) + target_link_libraries(truncmult simgrid) + target_link_libraries(typetest simgrid) + target_link_libraries(typebase simgrid) + target_link_libraries(ssendtest simgrid) + target_link_libraries(ssendtest2 simgrid) + target_link_libraries(issendtest simgrid) + target_link_libraries(issend2 simgrid) + target_link_libraries(issendinit simgrid) + target_link_libraries(testtypes simgrid) + target_link_libraries(dataalign simgrid) + target_link_libraries(dtyperecv simgrid) + target_link_libraries(dtypelife simgrid) + target_link_libraries(htmsg simgrid) + target_link_libraries(isendtest simgrid) + target_link_libraries(third simgrid) + target_link_libraries(fourth simgrid) + target_link_libraries(fifth simgrid) + target_link_libraries(sixth simgrid) + target_link_libraries(probe simgrid) + target_link_libraries(nblock simgrid) + target_link_libraries(sendmany simgrid) + target_link_libraries(order simgrid) + target_link_libraries(pack simgrid) + target_link_libraries(probe1 simgrid) + target_link_libraries(testtest1 simgrid) + target_link_libraries(hvectest simgrid) + target_link_libraries(hvectest2 simgrid) + target_link_libraries(hvec simgrid) + target_link_libraries(hindexed simgrid) + target_link_libraries(irecvtest simgrid) + target_link_libraries(nbtest simgrid) + target_link_libraries(waitany simgrid) + target_link_libraries(waitall simgrid) + target_link_libraries(waitall2 simgrid) + target_link_libraries(waitall3 simgrid) + target_link_libraries(waitall4 simgrid) + target_link_libraries(commit simgrid) + target_link_libraries(cancel simgrid) + target_link_libraries(cancel2 simgrid) + target_link_libraries(cancel3 simgrid) + target_link_libraries(cancelmessages simgrid) + target_link_libraries(cancelibm simgrid) + target_link_libraries(cancelissend simgrid) + target_link_libraries(sendorder simgrid) + target_link_libraries(exittest simgrid) + target_link_libraries(selfvsworld simgrid) if(SMPI_F2C) - target_link_libraries(secondf simgrid smpi f2c) -# target_link_libraries(allpair2 simgrid smpi f2c) -# target_link_libraries(allpair simgrid smpi f2c) - target_link_libraries(isendf simgrid smpi f2c) - target_link_libraries(pingpong_f simgrid smpi f2c) - target_link_libraries(send1 simgrid smpi f2c) - target_link_libraries(sendcplx simgrid smpi f2c) - target_link_libraries(sendfort simgrid smpi f2c) -# target_link_libraries(structf simgrid smpi f2c) - target_link_libraries(typebasef simgrid smpi f2c) + target_link_libraries(secondf simgrid f2c) +# target_link_libraries(allpair2 simgrid f2c) +# target_link_libraries(allpair simgrid f2c) + target_link_libraries(isendf simgrid f2c) + target_link_libraries(pingpong_f simgrid f2c) + target_link_libraries(send1 simgrid f2c) + target_link_libraries(sendcplx simgrid f2c) + target_link_libraries(sendfort simgrid f2c) +# target_link_libraries(structf simgrid f2c) + target_link_libraries(typebasef simgrid f2c) endif() set_target_properties(overtake PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS}") -- 2.20.1