Try running shorter tests in some cases to prevent timeouts

LLNL · Aug 15, 2024 · 4948225 · 4948225
1 parent 55c5228
commit 4948225
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,6 +40,9 @@ jobs:
     strategy:
       matrix:
         shared: 
+## ====================================
+## Shared library build generated undefined symbol errors that are not
+## understood -RDH
 ##      - args: 
 ##          BUILD_SHARED_LIBS=On 
 ##          CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=On
@@ -59,6 +62,7 @@ jobs:
             ENABLE_WARNINGS_AS_ERRORS=Off
             BLT_CXX_STD=c++17
             CMAKE_BUILD_TYPE=Release
+            PERFSUITE_RUN_SHORT_TEST=On
             ${{ matrix.shared.args }}
           run-build: true
           build-args: '--parallel 16'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,10 +15,6 @@ else()
   cmake_minimum_required(VERSION 3.20)
 endif()
 
-option(ENABLE_RAJA_SEQUENTIAL "Run sequential variants of RAJA kernels. Disable
-this, and all other variants, to run _only_ base variants." On)
-option(ENABLE_KOKKOS "Include Kokkos implementations of the kernels in the RAJA Perfsuite" Off)
-
 #
 # Note: the BLT build system is inheritted by RAJA and is initialized by RAJA
 #
@@ -41,6 +37,13 @@ include(blt/SetupBLT.cmake)
 # Define RAJA PERFSUITE settings...
 #
 
+option(PERFSUITE_RUN_SHORT_TEST "Run kernels only once for tests" Off)
+
+option(ENABLE_RAJAPERF_SEQUENTIAL "Run sequential variants of RAJA kernels. Disable
+this, and all other variants, to run _only_ base variants." On)
+
+option(ENABLE_KOKKOS "Include Kokkos implementations of the kernels in the RAJA Perfsuite" Off)
+
 cmake_dependent_option(RAJA_PERFSUITE_ENABLE_TESTS "Enable RAJA Perf Suite Tests" On "ENABLE_TESTS" Off)
 
 if (ENABLE_TESTS)
@@ -129,9 +132,14 @@ include_directories(${RAJA_INCLUDE_DIRS})
 
 set(CAMP_ENABLE_TESTS Off CACHE BOOL "")
 
-if (ENABLE_RAJA_SEQUENTIAL)
+if (ENABLE_RAJAPERF_SEQUENTIAL)
   add_definitions(-DRUN_RAJA_SEQ)
 endif ()
+
+if (PERFSUITE_RUN_SHORT_TEST)
+  add_definitions(-DRUN_RAJAPERF_SHORT_TEST)
+endif()
+
 if (ENABLE_OPENMP)
   add_definitions(-DRUN_OPENMP)
 endif ()

diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ FROM ghcr.io/llnl/radiuss:gcc-12-ubuntu-22.04 AS gcc12_debug
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
+RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Debug -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On -DPERFSUITE_RUN_SHORT_TEST=On .. && \
     make -j 6 &&\
     ctest -T test --output-on-failure
 
@@ -63,7 +63,7 @@ FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14_debug
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug  -DENABLE_OPENMP=On .. && \
+RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug  -DENABLE_OPENMP=On -DPERFSUITE_RUN_SHORT_TEST=On .. && \
     make -j 6 &&\
     ctest -T test --output-on-failure
 

diff --git a/test/test-raja-perf-suite.cpp b/test/test-raja-perf-suite.cpp
@@ -55,7 +55,11 @@ TEST(ShortSuiteTest, Basic)
   std::vector< std::string > sargv{};
   sargv.emplace_back(std::string("dummy "));  // for executable name
   sargv.emplace_back(std::string("--checkrun"));
+#if defined(RUN_RAJAPERF_SHORT_TEST)
+  sargv.emplace_back(std::string("1"));
+#else
   sargv.emplace_back(std::string("3"));
+#endif
   sargv.emplace_back(std::string("--show-progress"));
   sargv.emplace_back(std::string("--disable-warmup"));