From 482c376770156147b76ebfbac9ce5f7802ab3403 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 13 Oct 2020 16:38:35 +0200 Subject: [PATCH 1/1] Revert "move fort_args test to a "fort args" folder, with a space" This reverts commit 3561c727ad711b8b1406e9f5a6f8d6390577f1e1. --- teshsuite/smpi/CMakeLists.txt | 10 +++++----- teshsuite/smpi/fort args/fort_args.tesh | 5 ----- teshsuite/smpi/{fort args => fort_args}/fort_args.f90 | 0 teshsuite/smpi/fort_args/fort_args.tesh | 5 +++++ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 teshsuite/smpi/fort args/fort_args.tesh rename teshsuite/smpi/{fort args => fort_args}/fort_args.f90 (100%) create mode 100644 teshsuite/smpi/fort_args/fort_args.tesh diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt index bb1cf8bcc1..411911d0c5 100644 --- a/teshsuite/smpi/CMakeLists.txt +++ b/teshsuite/smpi/CMakeLists.txt @@ -27,10 +27,10 @@ if(enable_smpi) if(enable_smpi AND SMPI_FORTRAN) set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") - add_executable (fort_args EXCLUDE_FROM_ALL fort\ args/fort_args.f90) + add_executable (fort_args EXCLUDE_FROM_ALL fort_args/fort_args.f90) target_link_libraries(fort_args simgrid) target_link_libraries(fort_args mpi) - set_target_properties(fort_args PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fort\ args) + set_target_properties(fort_args PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fort_args) add_dependencies(tests fort_args) endif() endif() @@ -44,13 +44,13 @@ foreach(x coll-allgather coll-allgatherv coll-allreduce coll-alltoall coll-allto set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c) endforeach() -set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/fort\ args/fort_args.f90 PARENT_SCOPE) +set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/fort_args/fort_args.f90 PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/coll-allreduce/coll-allreduce-large.tesh ${CMAKE_CURRENT_SOURCE_DIR}/coll-allreduce/coll-allreduce-automatic.tesh ${CMAKE_CURRENT_SOURCE_DIR}/coll-alltoall/clusters.tesh ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt-pingpong/broken_hostfiles.tesh ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt-pingpong/TI_output.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/fort\ args/fort_args.tesh PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/fort_args/fort_args.tesh PARENT_SCOPE) set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/hostfile ${CMAKE_CURRENT_SOURCE_DIR}/hostfile_cluster ${CMAKE_CURRENT_SOURCE_DIR}/hostfile_coll @@ -74,7 +74,7 @@ if(enable_smpi) endforeach() if(SMPI_FORTRAN) - ADD_TESH_FACTORIES(tesh-smpi-fort_args "thread;ucontext;raw;boost" --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/fort\ args --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/fort\ args fort_args.tesh) + ADD_TESH_FACTORIES(tesh-smpi-fort_args "thread;ucontext;raw;boost" --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/fort_args --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/fort_args fort_args.tesh) endif() foreach (ALLGATHER 2dmesh 3dmesh bruck GB loosely_lr NTSLR NTSLR_NB pair rdb rhv ring SMP_NTS smp_simple spreading_simple diff --git a/teshsuite/smpi/fort args/fort_args.tesh b/teshsuite/smpi/fort args/fort_args.tesh deleted file mode 100644 index f010d0293b..0000000000 --- a/teshsuite/smpi/fort args/fort_args.tesh +++ /dev/null @@ -1,5 +0,0 @@ -p Test fortran params -! output sort -$ "${bindir:=.}/../../../smpi_script/bin/smpirun" -map -hostfile ../hostfile -platform ${platfdir}/small_platform.xml -np 2 "${bindir:=.}/fort_args" 'a' 3 -q --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning -> [rank 0] -> Tremblay -> [rank 1] -> Jupiter diff --git a/teshsuite/smpi/fort args/fort_args.f90 b/teshsuite/smpi/fort_args/fort_args.f90 similarity index 100% rename from teshsuite/smpi/fort args/fort_args.f90 rename to teshsuite/smpi/fort_args/fort_args.f90 diff --git a/teshsuite/smpi/fort_args/fort_args.tesh b/teshsuite/smpi/fort_args/fort_args.tesh new file mode 100644 index 0000000000..6979fbfceb --- /dev/null +++ b/teshsuite/smpi/fort_args/fort_args.tesh @@ -0,0 +1,5 @@ +p Test fortran params +! output sort +$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ${platfdir}/small_platform.xml -np 2 ${bindir:=.}/fort_args 'a' 3 -q --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning +> [rank 0] -> Tremblay +> [rank 1] -> Jupiter -- 2.20.1