now working on venado

LLNL · Jan 3, 2025 · 34ed853 · 34ed853
1 parent 50096c5
commit 34ed853
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/host-configs/lanl-builds/nvcc_gcc_X.cmake b/host-configs/lanl-builds/nvcc_gcc_X.cmake
@@ -7,18 +7,40 @@
 
 set(RAJA_COMPILER "RAJA_COMPILER_GCC" CACHE STRING "")
 
+set(ENABLE_CUDA ON CACHE BOOL "")
+
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -funroll-loops -finline-functions" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -march=native -funroll-loops -finline-functions" CACHE STRING "")
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "")
 
 set(HOST_OPT_FLAGS "-Xcompiler -O3 -Xcompiler -fopenmp")
 
-set(gtest_disable_pthreads ON CACHE BOOL "")
+set(RAJA_DATA_ALIGN 64 CACHE STRING "")
+
+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 "")
 set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo -O3 ${HOST_OPT_FLAGS}" CACHE STRING "")
 
-set(RAJA_DATA_ALIGN 64 CACHE STRING "")
+set(CUDA_SEPARABLE_COMPILATION ON CACHE BOOL "" )
 
-set(RAJA_HOST_CONFIG_LOADED On CACHE BOOL "")
+# nvcc does not like gtest's 'pthreads' flag
+set(gtest_disable_pthreads ON CACHE BOOL "")
diff --git a/scripts/lanl-builds/cray_nvcc_gcc.sh b/scripts/lanl-builds/cray_nvcc_gcc.sh
@@ -35,20 +35,9 @@ echo
 rm -rf build_${BUILD_SUFFIX} >/dev/null
 mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}
 
-module load cmake/3.29.6
-
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/${COMP_GCC_VER}/bin/g++ \
-  -DBLT_CXX_STD=c++14 \
-  -Dgtest_disable_pthreads=ON \
-  -DGTEST_HAS_PTHREAD=0 \
   -C ../host-configs/lanl-builds/cray/nvcc_gcc_X.cmake \
-  -DENABLE_OPENMP=Off \
-  -DENABLE_CUDA=On \
-  -DCUDA_TOOLKIT_ROOT_DIR=/opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda \
-  -DCMAKE_CUDA_COMPILER=/opt/nvidia/hpc_sdk/Linux_aarch64/24.7/cuda/${COMP_NVCC_VER}/bin/nvcc  \
-  -DCMAKE_CUDA_ARCHITECTURES=${COMP_ARCH} \
   -DENABLE_BENCHMARKS=On \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
   "$@" \
@@ -62,6 +51,6 @@ echo
 echo "  Please note that you have to disable CUDA GPU hooks when you run"
 echo "  the RAJA tests; for example,"
 echo
-echo "    lrun -1 --smpiargs="-disable_gpu_hooks" make test"
+echo "    make test"
 echo
 echo "***********************************************************************"