From d6ec8e6f73bc03fd313e790430a7ee1cd88f461e Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Sat, 9 May 2020 09:40:12 -0400 Subject: [PATCH 1/4] testing: Add option to disable MPI MPMD tests --- CMakeLists.txt | 9 +- testing/examples/heatTransfer/CMakeLists.txt | 30 +- testing/utils/iotest/CMakeLists.txt | 316 ++++++++++--------- 3 files changed, 182 insertions(+), 173 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a0d2fc8b..edcd7bbb93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,8 +221,13 @@ else() endif() unset(BUILD_TESTING) option(ADIOS2_BUILD_TESTING "Build the ADIOS2 testing tree" - ${ADIOS2_BUILD_TESTING_DEFAULT}) - + ${ADIOS2_BUILD_TESTING_DEFAULT}) + +cmake_dependent_option(ADIOS2_RUN_MPI_MPMD_TESTS + "Enable the parallel MPMD tests" ON + "ADIOS2_BUILD_TESTING;ADIOS2_HAVE_MPI" OFF) +mark_as_advanced(ADIOS2_RUN_MPMD_TESTS) + include(CTest) set(BUILD_TESTING ${ADIOS2_BUILD_TESTING}) if(BUILD_TESTING) diff --git a/testing/examples/heatTransfer/CMakeLists.txt b/testing/examples/heatTransfer/CMakeLists.txt index 87ffb256df..5e48178299 100644 --- a/testing/examples/heatTransfer/CMakeLists.txt +++ b/testing/examples/heatTransfer/CMakeLists.txt @@ -13,19 +13,21 @@ if(ADIOS2_HAVE_ZFP) include(${CMAKE_CURRENT_SOURCE_DIR}/TestBPFileMx1_zfp.cmake) endif() -if(ADIOS2_HAVE_SST) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake) - if(ADIOS2_SST_HAVE_LIBFABRIC) -# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake) -# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake) +if(ADIOS2_RUN_MPMD_TESTS) + if(ADIOS2_HAVE_SST) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake) + if(ADIOS2_SST_HAVE_LIBFABRIC) + # include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake) + # include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake) + endif() endif() -endif() -include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxM.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxN.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMx1.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxM.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxN.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMx1.cmake) +endif() diff --git a/testing/utils/iotest/CMakeLists.txt b/testing/utils/iotest/CMakeLists.txt index 4ab2395505..ff26486fec 100644 --- a/testing/utils/iotest/CMakeLists.txt +++ b/testing/utils/iotest/CMakeLists.txt @@ -132,84 +132,84 @@ if(ADIOS2_HAVE_HDF5 AND HDF5_IS_PARALLEL) ) endif() -if(MPIEXEC_MAX_NUMPROCS GREATER 1) - #------------------------------------------ - # Pipe2 InsituMPI version - #------------------------------------------ - add_test(NAME Utils.IOTest.Pipe2.InSituMPI - COMMAND ${MPIEXEC_COMMAND} - ${MPIEXEC_NUMPROC_FLAG} 1 $ - -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-InSituMPI.xml -d 1 1 - --strong-scaling - : - ${MPIEXEC_NUMPROC_FLAG} 1 $ - -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-InSituMPI.xml -d 1 1 - --strong-scaling - ) - set_tests_properties(Utils.IOTest.Pipe2.InSituMPI PROPERTIES PROCESSORS 2) - - add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Dump - COMMAND ${CMAKE_COMMAND} - -DARG1=-laD - -DINPUT_FILE=pipe2_read.bp - -DOUTPUT_FILE=IOTest.Pipe2.InSituMPI.bpls.txt - -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" - ) - - add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Validate - COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.InSituMPI.bpls.txt - IOTest.Pipe2.InSituMPI.bpls.txt - ) - - SetupTestPipeline( - Utils.IOTest.Pipe2.InSituMPI - ";Dump;Validate" - TRUE - ) - - #------------------------------------------ - # Pipe2 SST version - #------------------------------------------ - if(ADIOS2_HAVE_SST) - add_test(NAME Utils.IOTest.Pipe2.SST +if(ADIOS2_RUN_MPMD_TESTS) + if(MPIEXEC_MAX_NUMPROCS GREATER 1) + #------------------------------------------ + # Pipe2 InsituMPI version + #------------------------------------------ + add_test(NAME Utils.IOTest.Pipe2.InSituMPI COMMAND ${MPIEXEC_COMMAND} ${MPIEXEC_NUMPROC_FLAG} 1 $ -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-SST.xml -d 1 1 --strong-scaling + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-InSituMPI.xml -d 1 1 + --strong-scaling : ${MPIEXEC_NUMPROC_FLAG} 1 $ -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-SST.xml -d 1 1 --strong-scaling + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-InSituMPI.xml -d 1 1 + --strong-scaling ) - - add_test(NAME Utils.IOTest.Pipe2.SST.Dump + set_tests_properties(Utils.IOTest.Pipe2.InSituMPI PROPERTIES PROCESSORS 2) + + add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Dump COMMAND ${CMAKE_COMMAND} -DARG1=-laD -DINPUT_FILE=pipe2_read.bp - -DOUTPUT_FILE=IOTest.Pipe2.SST.bpls.txt + -DOUTPUT_FILE=IOTest.Pipe2.InSituMPI.bpls.txt -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" ) - - add_test(NAME Utils.IOTest.Pipe2.SST.Validate + + add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Validate COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.SST.bpls.txt - IOTest.Pipe2.SST.bpls.txt + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.InSituMPI.bpls.txt + IOTest.Pipe2.InSituMPI.bpls.txt ) - + SetupTestPipeline( - Utils.IOTest.Pipe2.SST + Utils.IOTest.Pipe2.InSituMPI ";Dump;Validate" TRUE ) - endif() -else() - message(WARNING "Not enough (2) MPI procs for insitu tests with adios_iotest") -endif() - - + + #------------------------------------------ + # Pipe2 SST version + #------------------------------------------ + if(ADIOS2_HAVE_SST) + add_test(NAME Utils.IOTest.Pipe2.SST + COMMAND ${MPIEXEC_COMMAND} + ${MPIEXEC_NUMPROC_FLAG} 1 $ + -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-SST.xml -d 1 1 --strong-scaling + : + ${MPIEXEC_NUMPROC_FLAG} 1 $ + -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-SST.xml -d 1 1 --strong-scaling + ) + + add_test(NAME Utils.IOTest.Pipe2.SST.Dump + COMMAND ${CMAKE_COMMAND} + -DARG1=-laD + -DINPUT_FILE=pipe2_read.bp + -DOUTPUT_FILE=IOTest.Pipe2.SST.bpls.txt + -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" + ) + + add_test(NAME Utils.IOTest.Pipe2.SST.Validate + COMMAND ${DIFF_COMMAND} -u -w + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.SST.bpls.txt + IOTest.Pipe2.SST.bpls.txt + ) + + SetupTestPipeline( + Utils.IOTest.Pipe2.SST + ";Dump;Validate" + TRUE + ) + endif() + else() + message(WARNING "Not enough (2) MPI procs for insitu tests with adios_iotest") + endif() +endif() #------------------------------------------ # BurstBuffer BP4 tests @@ -360,100 +360,102 @@ SetupTestPipeline( #------------------------------------------------- # BurstBuffer BP4 streaming test nproc = 2 #------------------------------------------------- -add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.Run - COMMAND ${MPIEXEC_COMMAND} - ${MPIEXEC_NUMPROC_FLAG} 1 $ - -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer.xml -d 1 1 --strong-scaling - : - ${MPIEXEC_NUMPROC_FLAG} 1 $ - -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer.xml -d 1 1 --strong-scaling - -) -set_tests_properties(Utils.IOTest.BurstBuffer.1to1.BP4.Stream.Run PROPERTIES PROCESSORS 2) - -add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.WriteDump - COMMAND ${CMAKE_COMMAND} - -DARG1=-laD - -DINPUT_FILE=pipe2_write.bp - -DOUTPUT_FILE=IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt - -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" -) - -add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.ReadDump - COMMAND ${CMAKE_COMMAND} - -DARG1=-laD - -DINPUT_FILE=pipe2_read.bp - -DOUTPUT_FILE=IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt - -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" -) - -add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.WriteValidate - COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt - IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt -) - -add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.ReadValidate - COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt - IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt -) - -SetupTestPipeline( - Utils.IOTest.BurstBuffer.1to1.BP4.Stream - "Run;WriteDump;WriteValidate;ReadDump;ReadValidate" - TRUE -) - - -#------------------------------------------------- -# BurstBuffer BP4 streaming test nproc = 4 -#------------------------------------------------- -add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.Run - COMMAND ${MPIEXEC_COMMAND} - ${MPIEXEC_NUMPROC_FLAG} 3 $ - -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer-nsub2.xml -d 3 1 --strong-scaling - : - ${MPIEXEC_NUMPROC_FLAG} 1 $ - -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt - -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer-nsub2.xml -d 1 1 --strong-scaling - -) -set_tests_properties(Utils.IOTest.BurstBuffer.3to1.BP4.Stream.Run PROPERTIES PROCESSORS 4) - -add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.WriteDump - COMMAND ${CMAKE_COMMAND} - -DARG1=-laD - -DINPUT_FILE=pipe2_write.bp - -DOUTPUT_FILE=IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt - -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" -) - -add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.ReadDump - COMMAND ${CMAKE_COMMAND} - -DARG1=-laD - -DINPUT_FILE=pipe2_read.bp - -DOUTPUT_FILE=IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt - -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" -) - -add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.WriteValidate - COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt - IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt -) - -add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.ReadValidate - COMMAND ${DIFF_COMMAND} -u -w - ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt - IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt -) - -SetupTestPipeline( - Utils.IOTest.BurstBuffer.3to1.BP4.Stream - "Run;WriteDump;WriteValidate;ReadDump;ReadValidate" - TRUE -) +if(ADIOS2_RUN_MPMD_TESTS) + add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.Run + COMMAND ${MPIEXEC_COMMAND} + ${MPIEXEC_NUMPROC_FLAG} 1 $ + -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer.xml -d 1 1 --strong-scaling + : + ${MPIEXEC_NUMPROC_FLAG} 1 $ + -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer.xml -d 1 1 --strong-scaling + + ) + set_tests_properties(Utils.IOTest.BurstBuffer.1to1.BP4.Stream.Run PROPERTIES PROCESSORS 2) + + add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.WriteDump + COMMAND ${CMAKE_COMMAND} + -DARG1=-laD + -DINPUT_FILE=pipe2_write.bp + -DOUTPUT_FILE=IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt + -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" + ) + + add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.ReadDump + COMMAND ${CMAKE_COMMAND} + -DARG1=-laD + -DINPUT_FILE=pipe2_read.bp + -DOUTPUT_FILE=IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt + -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" + ) + + add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.WriteValidate + COMMAND ${DIFF_COMMAND} -u -w + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt + IOTest.BurstBuffer.1to1.BP4.Stream.Write.bpls.txt + ) + + add_test(NAME Utils.IOTest.BurstBuffer.1to1.BP4.Stream.ReadValidate + COMMAND ${DIFF_COMMAND} -u -w + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt + IOTest.BurstBuffer.1to1.BP4.Stream.Read.bpls.txt + ) + + SetupTestPipeline( + Utils.IOTest.BurstBuffer.1to1.BP4.Stream + "Run;WriteDump;WriteValidate;ReadDump;ReadValidate" + TRUE + ) + + + #------------------------------------------------- + # BurstBuffer BP4 streaming test nproc = 4 + #------------------------------------------------- + add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.Run + COMMAND ${MPIEXEC_COMMAND} + ${MPIEXEC_NUMPROC_FLAG} 3 $ + -a 1 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer-nsub2.xml -d 3 1 --strong-scaling + : + ${MPIEXEC_NUMPROC_FLAG} 1 $ + -a 2 -c ${CMAKE_CURRENT_SOURCE_DIR}/pipe2.txt + -x ${CMAKE_CURRENT_SOURCE_DIR}/pipe2-BP4-burstbuffer-nsub2.xml -d 1 1 --strong-scaling + + ) + set_tests_properties(Utils.IOTest.BurstBuffer.3to1.BP4.Stream.Run PROPERTIES PROCESSORS 4) + + add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.WriteDump + COMMAND ${CMAKE_COMMAND} + -DARG1=-laD + -DINPUT_FILE=pipe2_write.bp + -DOUTPUT_FILE=IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt + -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" + ) + + add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.ReadDump + COMMAND ${CMAKE_COMMAND} + -DARG1=-laD + -DINPUT_FILE=pipe2_read.bp + -DOUTPUT_FILE=IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt + -P "${PROJECT_BINARY_DIR}/$/bpls.cmake" + ) + + add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.WriteValidate + COMMAND ${DIFF_COMMAND} -u -w + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt + IOTest.BurstBuffer.3to1.BP4.Stream.Write.bpls.txt + ) + + add_test(NAME Utils.IOTest.BurstBuffer.3to1.BP4.Stream.ReadValidate + COMMAND ${DIFF_COMMAND} -u -w + ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt + IOTest.BurstBuffer.3to1.BP4.Stream.Read.bpls.txt + ) + + SetupTestPipeline( + Utils.IOTest.BurstBuffer.3to1.BP4.Stream + "Run;WriteDump;WriteValidate;ReadDump;ReadValidate" + TRUE + ) +endif() From 681422213be335b9cac13e7643603d844a274a2e Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Sun, 10 May 2020 07:49:36 -0400 Subject: [PATCH 2/4] testing: Allow MPMD to be explicitly disabled for common staging tests --- testing/adios2/engine/staging-common/CMakeLists.txt | 4 ++-- testing/adios2/engine/staging-common/TestSupp.cmake | 3 +++ testing/adios2/engine/staging-common/run_test.py.gen.in | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt index 304013f9c0..9f1681c0af 100644 --- a/testing/adios2/engine/staging-common/CMakeLists.txt +++ b/testing/adios2/engine/staging-common/CMakeLists.txt @@ -189,7 +189,7 @@ endforeach() # # Setup tests for InSituMPI engine # -if(ADIOS2_HAVE_MPI) +if(ADIOS2_HAVE_MPI AND ADIOS2_RUN_MPMD_TESTS) set (SIMPLE_IMPI_TESTS "1x1;TimeoutOnOpen;1x1.Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync") set (INSITU_TESTS ${SIMPLE_IMPI_TESTS} ${SIMPLE_FORTRAN_TESTS} ${SIMPLE_MPI_TESTS} ${SIMPLE_ZFP_TESTS}) # Tests that don't work for InSitu @@ -217,7 +217,7 @@ if(ADIOS2_HAVE_MPI) endforeach() endif() -if(ADIOS2_HAVE_SSC) +if(ADIOS2_HAVE_SSC AND ADIOS2_RUN_MPMD_TESTS) set (SSC_BASE_TESTS "1x1;1x1.Attrs;2x1;1x2;2x1ZeroDataVar;2x1ZeroDataR64;3x5;5x3;3x5LockGeometry;TimeoutOnOpen") set (SSC_TESTS ${SIMPLE_FORTRAN_TESTS} ${SIMPLE_MPI_FORTRAN_TESTS} ${SSC_BASE_TESTS}) foreach(test ${SSC_TESTS}) diff --git a/testing/adios2/engine/staging-common/TestSupp.cmake b/testing/adios2/engine/staging-common/TestSupp.cmake index 9289d7475d..c2470a6b0f 100644 --- a/testing/adios2/engine/staging-common/TestSupp.cmake +++ b/testing/adios2/engine/staging-common/TestSupp.cmake @@ -228,6 +228,9 @@ function(add_common_test basename engine) remove_engine_params_placeholder(command "${command}") separate_arguments(command) list(INSERT command 2 "${engine}" "${testname}") + if(NOT ADIOS2_RUN_MPMD_TESTS) + list(APPEND command "--disable_mpmd") + endif() add_test(NAME ${testname} COMMAND ${command}) if(testname MATCHES "([1-9][0-9]*)x([1-9][0-9]*)") math(EXPR nprocs "${CMAKE_MATCH_1} + ${CMAKE_MATCH_2}") diff --git a/testing/adios2/engine/staging-common/run_test.py.gen.in b/testing/adios2/engine/staging-common/run_test.py.gen.in index cfcbca4655..f3bafae29c 100755 --- a/testing/adios2/engine/staging-common/run_test.py.gen.in +++ b/testing/adios2/engine/staging-common/run_test.py.gen.in @@ -257,6 +257,7 @@ parser.add_argument('--max_readers', '-mr', type=int, default=1) parser.add_argument('--duration', type=int, default=60) parser.add_argument('--interval', type=int, default=5) parser.add_argument('--reader_delay', '-rd', type=int, default=0) +parser.add_argument('--disable_mpmd', action='store_true') parser.add_argument('--test_protocol', '-tp', choices=[ 'simple', 'kill_readers', 'one_client', 'kill_writer'], default='simple') @@ -342,6 +343,9 @@ if args.reader_delay != 0: print("TestDriver: Reader delay setting MPMD false\n") mpmd_possible = False +if args.disable_mpmd: + mpmd_possible = False + test_setup(args.filename) atexit.register(test_teardown, args.filename) sys.stdout.flush() From cef2b73360800b59cab816bf14c83052bb3ad432 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Sun, 10 May 2020 23:20:39 -0400 Subject: [PATCH 3/4] ci: Adjust format dependencies on Travis --- .travis.yml | 16 ---------------- scripts/travis/run-format.sh | 11 +++++++++++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 865483e82d..a20150e939 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,6 @@ sudo: false language: cpp dist: xenial -addons: - apt: - packages: - - libmpich-dev -before_install: - - pushd ${HOME} - - wget http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz - - popd -install: - - pushd ${HOME} - - tar -xf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz - - export PATH="${PWD}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:${PATH}" - - export PATH="${PWD}/cmake-3.7.2-Linux-x86_64/bin:${PATH}" - - popd - - pip install --user flake8 - - git config --global clangformat.binary ${HOME}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin/clang-format env: matrix: - BUILD_MATRIX_ENTRY=format diff --git a/scripts/travis/run-format.sh b/scripts/travis/run-format.sh index e810b47ac5..8395840ae9 100755 --- a/scripts/travis/run-format.sh +++ b/scripts/travis/run-format.sh @@ -11,6 +11,17 @@ then exit 1 fi +# Install clang-format +pushd ${HOME} +wget http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz +tar -xf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz +export PATH="${PWD}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:${PATH}" +git config --global clangformat.binary ${HOME}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin/clang-format +popd + +# Install flake8 +pip install --user flake8 + cd ${SOURCE_DIR} # Check C and C++ code with clang-format From 8866571b45174a16f26d040eae6111c9d7f58edd Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Sun, 10 May 2020 23:23:47 -0400 Subject: [PATCH 4/4] ci: Move Mac 10.15 build back to Azure --- .github/workflows/build-and-test.yml | 30 ---------------------------- azure-pipelines.yml | 4 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 9dca8dc18d..143445c4f0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -115,33 +115,3 @@ jobs: run: scripts/ci/gh-actions/run.sh build - name: Test run: scripts/ci/gh-actions/run.sh test - - macos: - runs-on: ${{ matrix.os }} - env: - GH_YML_JOBNAME: ${{ matrix.jobname }} - GH_YML_OS: macOS - - strategy: - fail-fast: false - matrix: - jobname: [ - macos1015-xcode111-make ] - include: - - jobname: macos1015-xcode111-make - os: macos-10.15 - - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Setup - run: scripts/ci/gh-actions/macos-setup.sh - - name: Update - run: scripts/ci/gh-actions/run.sh update - - name: Configure - run: scripts/ci/gh-actions/run.sh configure - - name: Build - run: scripts/ci/gh-actions/run.sh build - - name: Test - run: scripts/ci/gh-actions/run.sh test diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d441aa55bd..fc2bca5fc0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,8 +51,8 @@ jobs: matrix: macos1014_xcode103_ninja: hostImage: 'macOS-10.14' -# macos1014_xcode103_openmpi_make: -# hostImage: 'macOS-10.14' + macos1015_xcode111_make: + hostImage: 'macOS-10.15' pool: vmImage: $[ variables['hostImage'] ]