Merge pull request QMCPACK#3502 from ye-luo/fix-nightly

Fix and update nightly test scripts.
PDoakORNL · Oct 2, 2021 · 618cdb2 · 618cdb2
2 parents c0ed5f1 + 0a13c01
commit 618cdb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CMake/ctest_script.cmake b/CMake/ctest_script.cmake
@@ -202,8 +202,8 @@ if(DEFINED QMC_MIXED_PRECISION)
   set(CTEST_OPTIONS "${CTEST_OPTIONS};-DQMC_MIXED_PRECISION=${QMC_MIXED_PRECISION}")
 endif()
 
-if(DEFINED CUDA_ARCH)
-  set(CTEST_OPTIONS "${CTEST_OPTIONS};-DCUDA_ARCH='${CUDA_ARCH}'")
+if(DEFINED CMAKE_CUDA_ARCHITECTURES)
+  set(CTEST_OPTIONS "${CTEST_OPTIONS};-DCMAKE_CUDA_ARCHITECTURES='${CMAKE_CUDA_ARCHITECTURES}'")
 endif()
 
 if(DEFINED BUILD_AFQMC)

diff --git a/tests/test_automation/nightly_test_scripts/nightly_anl_bora.sh b/tests/test_automation/nightly_test_scripts/nightly_anl_bora.sh
@@ -83,8 +83,8 @@ if [[ $sys == *"ClangDev"* ]]; then
 
   CTEST_FLAGS="$CTEST_FLAGS -DCMAKE_C_FLAGS=-march=skylake -DCMAKE_CXX_FLAGS=-march=skylake"
   if [[ $sys == *"Offload-CUDA"* ]]; then
-    CTEST_FLAGS="$CTEST_FLAGS -DQMC_OPTIONS='-DENABLE_OFFLOAD=ON;-DUSE_OBJECT_TARGET=ON;-DCUDA_HOST_COMPILER=`which gcc`;-DCUDA_PROPAGATE_HOST_FLAGS=OFF;-DQMC_NIO_MAX_SIZE=16'"
-    CTEST_FLAGS="$CTEST_FLAGS -DENABLE_CUDA=1 -DCUDA_ARCH=sm_61"
+    CTEST_FLAGS="$CTEST_FLAGS -DQMC_OPTIONS='-DENABLE_OFFLOAD=ON;-DUSE_OBJECT_TARGET=ON;-DCMAKE_CUDA_HOST_COMPILER=`which gcc`;-DQMC_NIO_MAX_SIZE=16'"
+    CTEST_FLAGS="$CTEST_FLAGS -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61"
     CTEST_LABELS="-L deterministic -LE unstable"
     export N_CONCURRENT_TESTS=4
   else
@@ -101,11 +101,11 @@ elif [[ $sys == *"Intel"* ]]; then
 
   CTEST_FLAGS="$CTEST_FLAGS -DCMAKE_C_FLAGS=-xCOMMON-AVX512 -DCMAKE_CXX_FLAGS=-xCOMMON-AVX512"
   if [[ $sys == *"-CUDA2"* ]]; then
-    CTEST_FLAGS="$CTEST_FLAGS -DENABLE_CUDA=1 -DCUDA_ARCH=sm_61 -DQMC_OPTIONS='-DQMC_NIO_MAX_SIZE=16'"
+    CTEST_FLAGS="$CTEST_FLAGS -DENABLE_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61 -DQMC_OPTIONS='-DQMC_NIO_MAX_SIZE=16'"
     CTEST_LABELS="-L 'deterministic|performance' -LE unstable"
     export N_CONCURRENT_TESTS=4
   elif [[ $sys == *"-legacy-CUDA"* ]]; then
-    CTEST_FLAGS="$CTEST_FLAGS -DQMC_CUDA=1 -DCUDA_ARCH=sm_61 -DQMC_OPTIONS='-DQMC_NIO_MAX_SIZE=16'"
+    CTEST_FLAGS="$CTEST_FLAGS -DQMC_CUDA=1 -DCMAKE_CUDA_ARCHITECTURES=61 -DQMC_OPTIONS='-DQMC_NIO_MAX_SIZE=16'"
     CTEST_LABELS="-L 'deterministic|performance' -LE unstable"
     export N_CONCURRENT_TESTS=1
   else