Set NVHPC_CUDA_HOME for Phoenix

Author: max-Hawkins

CMakeLists.txt

@@ -482,7 +482,6 @@ function(MFC_SETUP_TARGET)
                 foreach (cc ${MFC_CUDA_CC})
                     target_compile_options(${a_target}
                         PRIVATE -gpu=cc${cc}
-			PRIVATE -gpu=cuda${CUDA_VERSION}
                     )
                 endforeach()
 

toolchain/bootstrap/modules.sh

@@ -91,8 +91,8 @@ if ! module load $MODULES; then
 fi
 
 if [ $(echo "$VARIABLES" | grep = | wc -c) -gt 0 ]; then
-    log " $ export $VARIABLES"
-    export $VARIABLES > /dev/null
+    log " $ export $(eval "echo $VARIABLES")"
+    export $(eval "echo $VARIABLES") > /dev/null
 fi
 
 # Don't check for Cray paths on Carpenter, otherwise do check if they exist

toolchain/modules

@@ -45,7 +45,7 @@ p     GT Phoenix
 p-all python/3.10.10
 p-cpu gcc/12.3.0 openmpi/4.1.5
 p-gpu nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
-p-gpu MFC_CUDA_CC=70,80,89,90 CC=nvc CXX=nvc++ FC=nvfortran
+p-gpu MFC_CUDA_CC=70,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran
 
 f     OLCF Frontier
 f-all cce/18.0.0 cpe/24.07 rocm/6.1.3 cray-mpich/8.1.28