From c49231dad3fe9464c1084da14ee485cd5adb525f Mon Sep 17 00:00:00 2001
From: Shreyas Khandekar <60454060+ShreyasKhandekar@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:36:52 -0500
Subject: [PATCH] Changes based on review

Signed-off-by: Shreyas Khandekar <60454060+ShreyasKhandekar@users.noreply.github.com>
---
 util/cron/test-gpu-ex-cuda-12.bash                | 1 -
 util/cron/test-gpu-ex-cuda-12.interop.bash        | 8 ++++----
 util/cron/test-gpu-ex-cuda-12.specialization.bash | 2 +-
 util/cron/test-perf.gpu-ex-cuda-12.bash           | 2 +-
 util/cron/test-perf.gpu-ex-cuda-12.um.bash        | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/util/cron/test-gpu-ex-cuda-12.bash b/util/cron/test-gpu-ex-cuda-12.bash
index ff13152932df..69a18fe76b4a 100755
--- a/util/cron/test-gpu-ex-cuda-12.bash
+++ b/util/cron/test-gpu-ex-cuda-12.bash
@@ -12,7 +12,6 @@ export CHPL_LLVM=bundled  # CUDA 12 is only supported with bundled LLVM
 export CHPL_COMM=none
 export CHPL_LOCALE_MODEL=gpu
 export CHPL_LAUNCHER_PARTITION=allgriz
-export CHPL_TEST_GPU=true
 export CHPL_GPU=nvidia  # amd is also detected automatically
 
 export CHPL_NIGHTLY_TEST_CONFIG_NAME="gpu-ex-cuda-12"
diff --git a/util/cron/test-gpu-ex-cuda-12.interop.bash b/util/cron/test-gpu-ex-cuda-12.interop.bash
index 974132a6c3bd..e50294790c2e 100755
--- a/util/cron/test-gpu-ex-cuda-12.interop.bash
+++ b/util/cron/test-gpu-ex-cuda-12.interop.bash
@@ -8,17 +8,17 @@ source $CWD/common-hpe-cray-ex.bash
 
 
 # We need 12.4 for the stream test because the CUDA driver on pinoak
-# only supports PTX for 12.4, untill the driver is updated, we need to
+# only supports PTX for 12.4, until the driver is updated, we need to
 # stick with 12.4 instead of 12.5
-module load cuda/12.4  # default is CUDA 12
+module load cuda/12.4  # default is CUDA 12.5
 
 # We need cublas for the cublas interop test, but since we are using 12.4 above
 # pinoak doesn't have the cublas library for 12.4, so we need to use the cublas
 # from 12.5 (which is compatible across minor versions)
 # This can be removed once we use CUDA 12.5
-export CHPL_LIB_PATH="/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/lib64"
+export CHPL_LIB_PATH="/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/math_libs/lib64:$CHPL_LIB_PATH"
 
-export CHPL_LLVM=bundled  # CUDA 12 is only supported with bundled LLVM
+export CHPL_LLVM=bundled  # Using bundled LLVM since that's safer
 export CHPL_TEST_GPU=true
 export CHPL_LAUNCHER_PARTITION=allgriz
 export CHPL_NIGHTLY_TEST_DIRS="gpu/interop/"
diff --git a/util/cron/test-gpu-ex-cuda-12.specialization.bash b/util/cron/test-gpu-ex-cuda-12.specialization.bash
index 5228ca3f7a5b..9fda01da052e 100755
--- a/util/cron/test-gpu-ex-cuda-12.specialization.bash
+++ b/util/cron/test-gpu-ex-cuda-12.specialization.bash
@@ -8,7 +8,7 @@ source $CWD/common-hpe-cray-ex.bash
 
 module load cudatoolkit  # default is CUDA 12
 
-export CHPL_LLVM=bundled  # CUDA 12 is only supported with bundled LLVM
+export CHPL_LLVM=bundled  # Using bundled LLVM since that's safer
 export CHPL_COMM=none
 export CHPL_LOCALE_MODEL=gpu
 export CHPL_LAUNCHER_PARTITION=allgriz
diff --git a/util/cron/test-perf.gpu-ex-cuda-12.bash b/util/cron/test-perf.gpu-ex-cuda-12.bash
index e50b0d49a4b8..acbf70ca0751 100755
--- a/util/cron/test-perf.gpu-ex-cuda-12.bash
+++ b/util/cron/test-perf.gpu-ex-cuda-12.bash
@@ -8,7 +8,7 @@ source $CWD/common-hpe-cray-ex.bash
 
 module load cudatoolkit  # default is CUDA 12
 
-export CHPL_LLVM=bundled  # CUDA 12 is only supported with bundled LLVM
+export CHPL_LLVM=bundled  # Using bundled LLVM since that's safer
 export CHPL_COMM=none
 export CHPL_LOCALE_MODEL=gpu
 export CHPL_LAUNCHER_PARTITION=allgriz
diff --git a/util/cron/test-perf.gpu-ex-cuda-12.um.bash b/util/cron/test-perf.gpu-ex-cuda-12.um.bash
index 75f5c38c52f8..ee99ad6e923c 100755
--- a/util/cron/test-perf.gpu-ex-cuda-12.um.bash
+++ b/util/cron/test-perf.gpu-ex-cuda-12.um.bash
@@ -8,7 +8,7 @@ source $CWD/common-hpe-cray-ex.bash
 
 module load cudatoolkit  # default is CUDA 12
 
-export CHPL_LLVM=bundled  # CUDA 12 is only supported with bundled LLVM
+export CHPL_LLVM=bundled # Using bundled LLVM since that's safer
 export CHPL_COMM=none
 export CHPL_LOCALE_MODEL=gpu
 export CHPL_LAUNCHER_PARTITION=allgriz