pass timeout

SCOREC · Nov 7, 2024 · 3c78c7d · 3c78c7d
1 parent 286cfec
commit 3c78c7d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/globus-test.yml b/.github/workflows/globus-test.yml
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  globus-test:
+  test-${{ inputs.machine }}:
     runs-on: ubuntu-latest
     timeout-minutes: 30
 

diff --git a/.github/workflows/perlmutter/install.sh b/.github/workflows/perlmutter/install.sh
@@ -99,8 +99,9 @@ cmake -S pcms -B build-pcms \
   -DCMAKE_C_COMPILER=cc \
   -DCMAKE_CXX_COMPILER=CC \
   -DCMAKE_BUILD_TYPE=Release \
-  -Dredev_DIR=$PWD/build-redev/install/lib64/cmake/redev \
+  -DPCMS_TIMEOUT=100 \
   -Dperfstubs_DIR=$PWD/build-perfstubs \
+  -Dredev_DIR=$PWD/build-redev/install/lib64/cmake/redev \
   -DOmega_h_DIR=$PWD/build-omega_h/install/lib64/cmake/Omega_h/ \
   -DKokkos_DIR=$PWD/build-kokkos/install/lib64/cmake/Kokkos/ \
   -DCatch2_DIR=$PWD/build-Catch2/install/lib64/cmake/Catch2/ \

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -45,6 +45,9 @@ function(increaseTimeoutForValgrind TIME TIME_VAR_OUT)
         math(EXPR TIME_OUT "${TIME} * ${factor}")
         set(${TIME_VAR_OUT} ${TIME_OUT} PARENT_SCOPE)
     endif ()
+    if (DEFINED PCMS_TIMEOUT)
+        set(${TIME_VAR_OUT} ${PCMS_TIMEOUT} PARENT_SCOPE)
+    endif ()
 endfunction()
 
 function(mpi_test TESTNAME PROCS EXE)
@@ -100,14 +103,14 @@ if (PCMS_ENABLE_OMEGA_H)
     add_exe(test_ohClassPtn)
     set(cyclone1p ${PCMS_TEST_DATA_DIR}/cyclone/23elements/mesh.osh/)
     dual_mpi_test(TESTNAME test_ohClassPtnSendRecv
-            TIMEOUT 60
+            TIMEOUT 4
             NAME1 rdv EXE1 ./test_ohClassPtn PROCS1 2 ARGS1 ${rendezvous} ${cyclone1p}
             NAME2 app EXE2 ./test_ohClassPtn PROCS2 1 ARGS2 ${notRendezvous} ${cyclone1p})
 
     add_exe(test_ohClassPtn_appRibPtn)
     set(cyclone2p ${PCMS_TEST_DATA_DIR}/cyclone/23elements/2p.osh/)
     dual_mpi_test(TESTNAME test_ohClassPtn_appRibPtn
-            TIMEOUT 60
+            TIMEOUT 8
             NAME1 rdv EXE1 ./test_ohClassPtn_appRibPtn PROCS1 2 ARGS1 ${rendezvous} ${cyclone1p}
             NAME2 app EXE2 ./test_ohClassPtn_appRibPtn PROCS2 2 ARGS2 ${notRendezvous} ${cyclone2p})
 
@@ -121,7 +124,7 @@ if (PCMS_ENABLE_OMEGA_H)
     add_exe(test_ohOverlap)
     if(HOST_NPROC GREATER 10)
         dual_mpi_test(TESTNAME test_ohOverlap_d3d_20p
-                TIMEOUT 60
+                TIMEOUT 10
                 NAME1 rdv EXE1 ./test_ohOverlap PROCS1 4 ARGS1 ${rendezvous} ${d3d1p} ${d3d4p_cpn}
                 NAME2 app EXE2 ./test_ohOverlap PROCS2 16 ARGS2 ${notRendezvous} ${d3d16p} ignored)
     endif()
@@ -130,42 +133,42 @@ if (PCMS_ENABLE_OMEGA_H)
     add_exe(test_twoClientOverlap)
     if(HOST_NPROC GREATER 14)
         tri_mpi_test(TESTNAME test_twoClientOverlap_d3d_28p
-                TIMEOUT 60
+                TIMEOUT 12
                 NAME1 rdv EXE1 ./test_twoClientOverlap PROCS1 4 ARGS1 -1 ${d3d1p} ${d3d4p_cpn}
                 NAME2 client0 EXE2 ./test_twoClientOverlap PROCS2 16 ARGS2 0 ${d3d16p} ignored
                 NAME3 client1 EXE3 ./test_twoClientOverlap PROCS3 8 ARGS3 1 ${d3d8p} ignored)
     endif()
     add_executable(proxy_coupling test_proxy_coupling.cpp)
     target_link_libraries(proxy_coupling PUBLIC pcms::core test_support)
     tri_mpi_test(TESTNAME test_proxy_coupling_4p
-            TIMEOUT 60
+            TIMEOUT 10
             NAME1 rdv EXE1 ./proxy_coupling PROCS1 2 ARGS1 -1 ${d3d1p} ${d3d2p_cpn}
             NAME2 client0 EXE2 ./proxy_coupling PROCS2 1 ARGS2 0 ${d3d1p} ignored
             NAME3 client1 EXE3 ./proxy_coupling PROCS3 1 ARGS3 1 ${d3d1p} ignored)
     if(HOST_NPROC GREATER 13)
         tri_mpi_test(TESTNAME test_proxy_coupling_26p
-                TIMEOUT 60
+                TIMEOUT 12
                 NAME1 rdv EXE1 ./proxy_coupling PROCS1 2 ARGS1 -1 ${d3d1p} ${d3d2p_cpn}
                 NAME2 client0 EXE2 ./proxy_coupling PROCS2 16 ARGS2 0 ${d3d16p} ignored
                 NAME3 client1 EXE3 ./proxy_coupling PROCS3 8 ARGS3 1 ${d3d8p} ignored)
     endif()
     if (HOST_NPROC GREATER 14)
         tri_mpi_test(TESTNAME test_proxy_coupling_28p
-                TIMEOUT 60
+                TIMEOUT 12
                 NAME1 rdv EXE1 ./proxy_coupling PROCS1 4 ARGS1 -1 ${d3d1p} ${d3d4p_cpn}
                 NAME2 client0 EXE2 ./proxy_coupling PROCS2 16 ARGS2 0 ${d3d16p} ignored
                 NAME3 client1 EXE3 ./proxy_coupling PROCS3 8 ARGS3 1 ${d3d8p} ignored)
     endif ()
     if(HOST_NPROC GREATER 16)
         tri_mpi_test(TESTNAME test_proxy_coupling_32p
-                TIMEOUT 60
+                TIMEOUT 12
                 NAME1 rdv EXE1 ./proxy_coupling PROCS1 8 ARGS1 -1 ${d3d1p} ${d3d8p_cpn}
                 NAME2 client0 EXE2 ./proxy_coupling PROCS2 16 ARGS2 0 ${d3d16p} ignored
                 NAME3 client1 EXE3 ./proxy_coupling PROCS3 8 ARGS3 1 ${d3d8p} ignored)
     endif()
     if(HOST_NPROC GREATER 20)
         tri_mpi_test(TESTNAME test_proxy_coupling_40p
-                TIMEOUT 60
+                TIMEOUT 16
                 NAME1 rdv EXE1 ./proxy_coupling PROCS1 16 ARGS1 -1 ${d3d1p} ${d3d16p_cpn}
                 NAME2 client0 EXE2 ./proxy_coupling PROCS2 16 ARGS2 0 ${d3d16p} ignored
                 NAME3 client1 EXE3 ./proxy_coupling PROCS3 8 ARGS3 1 ${d3d8p} ignored)
@@ -215,11 +218,11 @@ if (PCMS_ENABLE_C)
             add_executable(test_proxy_couple_xgc_cpp_interface test_proxy_coupling_xgc_server.cpp)
             target_link_libraries(test_proxy_couple_xgc_cpp_interface PUBLIC pcms::core MPI::MPI_C test_support)
             dual_mpi_test(TESTNAME xgc_proxy_to_xgc
-                    TIMEOUT 60
+                    TIMEOUT 10
                     NAME1 cinterface EXE1 $<TARGET_FILE:test_proxy_couple_xgc_c_interface> PROCS1 2 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
                     NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 1 ARGS2 ${d3d1p} ${d3d1p_cpn} 0)
             dual_mpi_test(TESTNAME xgc_proxy_to_omega
-                    TIMEOUT 60
+                    TIMEOUT 10
                     NAME1 cinterface EXE1 $<TARGET_FILE:test_proxy_couple_xgc_c_interface> PROCS1 4 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
                     NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 2 ARGS2 ${d3d1p} ${d3d2p_cpn} 1)
         endif ()
@@ -230,10 +233,10 @@ if(PCMS_ENABLE_Fortran)
     target_link_libraries(test_proxy_coupling_xgc_client_fortran PUBLIC pcms::fortranapi MPI::MPI_Fortran)
     set_target_properties(test_proxy_coupling_xgc_client_fortran PROPERTIES LINKER_LANGUAGE CXX)
     dual_mpi_test(TESTNAME xgc_fortran_proxy_to_omega
-            TIMEOUT 60
+            TIMEOUT 10
             NAME1 finterface EXE1 $<TARGET_FILE:test_proxy_coupling_xgc_client_fortran> PROCS1 2 ARGS1 ${PCMS_TEST_DATA_DIR}/d3d/meshRclassification.txt
             NAME2 cppinterface EXE2 $<TARGET_FILE:test_proxy_couple_xgc_cpp_interface> PROCS2 2 ARGS2 ${d3d1p} ${d3d2p_cpn} 1)
 endif()
 
 add_executable(xgc_n0_server xgc_n0_coupling_server.cpp)
-target_link_libraries(xgc_n0_server PUBLIC pcms::core test_support)
+target_link_libraries(xgc_n0_server PUBLIC pcms::core test_support)