X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/827f942348ee73ff248814f968fd3773e1c73799..92a8bcd9439a127da04ada7593f00397b0342c94:/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt

diff --git a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
index f8338b7d1c..47301372d5 100644
--- a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
+++ b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
@@ -1,98 +1,61 @@
 if(enable_smpi)
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  # Boost regex dependency
-  find_package(Boost COMPONENTS regex filesystem REQUIRED)
-
   add_executable       (replay_multiple_manual replay_multiple_manual.cpp)
-  target_link_libraries(replay_multiple_manual simgrid ${Boost_LIBRARIES})
+  target_link_libraries(replay_multiple_manual simgrid)
 
   # Define a list of a tesh files
   list(APPEND tesh_filename_list replay_multiple_manual_nojob)
-  list(APPEND tesh_filename_list replay_multiple_manual_nojob_noise)
+  list(APPEND tesh_filename_list replay_multiple_manual_coll1)
+  list(APPEND tesh_filename_list replay_multiple_manual_coll2_st_sr_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_empty1)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty1_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_empty2)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_sr_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed1)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed1_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed2_sr_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st_sr)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_st_sr_noise)
 
-  # One-string version of the files (very ugly. Could be "just ugly" with recent CMake)
-  set(rm_tesh_files_as_string
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_sr.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_sr_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_sr.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_sr_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_noise.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_sr.tesh
-    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_sr_noise.tesh
-  )
-
   IF(NOT HAVE_MC)
     foreach(rm_tesh_file IN LISTS tesh_filename_list)
       string(REPLACE "_" "-" dash_separated ${rm_tesh_file})
       ADD_TESH("smpi-${dash_separated}"
         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy
+        --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
         --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy
         ${CMAKE_CURRENT_SOURCE_DIR}/${rm_tesh_file}.tesh)
     endforeach()
   ENDIF()
 endif()
 
-set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/generate_multiple_deployment.sh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/compute_only.txt
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/compute_only.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/compute_only/actions0.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/compute_only/actions1.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/coll.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/coll/actions0.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/coll/actions1.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/empty.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/empty/actions0.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/empty/actions1.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/mixed.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/mixed/actions0.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/mixed/actions1.txt
-                                   ${rm_tesh_files_as_string}
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive2
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_simple
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty1
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time_and_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed1
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_resources
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time_and_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_nojob PARENT_SCOPE)
-set(tesh_files    ${tesh_files}    ${rm_tesh_files_as_string} PARENT_SCOPE)
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time_and_resources PARENT_SCOPE)
+set(tesh_files  ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_coll1.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_coll2_st_sr_noise.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_noise.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_sr.tesh
+                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_st_sr_noise.tesh PARENT_SCOPE)
 set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual.cpp PARENT_SCOPE)