Move some options back into the script

LLNL · Jan 3, 2025 · 7f531aa · 7f531aa
1 parent 18af531
commit 7f531aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/host-configs/lanl-builds/nvcc_gcc_X.cmake b/host-configs/lanl-builds/nvcc_gcc_X.cmake
@@ -21,20 +21,16 @@ set(RAJA_HOST_CONFIG_LOADED On CACHE BOOL "")
 
 set(ENABLE_FORTRAN OFF CACHE BOOL "")
 
-set(GCC_HOME "/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0")
 set(CMAKE_C_COMPILER   "${GCC_HOME}/bin/gcc" CACHE PATH "")
 set(CMAKE_CXX_COMPILER "${GCC_HOME}/bin/g++" CACHE PATH "")
 set(BLT_CXX_STD "c++17" CACHE STRING "")
 
 #------------------------------------------------------------------------------
 # CUDA support
 #------------------------------------------------------------------------------
-
-set(CUDA_TOOLKIT_ROOT_DIR "/opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda/12.5" CACHE PATH "")
 set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "")
 set(CMAKE_CUDA_HOST_COMPILER "${CMAKE_CXX_COMPILER}" CACHE PATH "")
 
-set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "")
 set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -G" CACHE STRING "")
 set(CMAKE_CUDA_FLAGS_RELEASE "-O3 ${HOST_OPT_FLAGS}" CACHE STRING "")
 set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0" CACHE STRING "")

diff --git a/scripts/lanl-builds/cray_nvcc_gcc.sh b/scripts/lanl-builds/cray_nvcc_gcc.sh
@@ -37,6 +37,9 @@ mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
+  -DGCC_HOME=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/${COMP_GCC_VER} \
+  -DCMAKE_CUDA_ARCHITECTURES=${COMP_ARCH} \
+  -DCUDA_TOOLKIT_ROOT_DIR=/opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda/${COMP_NVCC_VER} \
   -C ../host-configs/lanl-builds/cray/nvcc_gcc_X.cmake \
   -DENABLE_BENCHMARKS=On \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \