From 37ddb1512213d8d6e30b0a79b839d156307403c4 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Thu, 28 Dec 2023 01:07:43 +0000 Subject: [PATCH] Update Bridges2 modules (#274) --- mfc.sh | 9 ++++++++- toolchain/modules | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mfc.sh b/mfc.sh index 75c4a0f91..542acd863 100755 --- a/mfc.sh +++ b/mfc.sh @@ -142,7 +142,14 @@ if [ "$1" == 'load' ]; then fi done - ok "All modules have been loaded for $M$COMPUTER$CR on $M$CG$CR"'s.' + if [ "$cg" == 'gpu' ]; then + isnv=$($FC --version | grep NVIDIA | wc -l) + if [ $isnv -eq 0 ]; then + export CC=nvc CXX=nvc++ FC=nvfortran + fi + fi + ok 'All modules and environment variables have been loaded.' + return elif [ "$1" == "format" ]; then diff --git a/toolchain/modules b/toolchain/modules index a4275d61a..b6fe4753c 100644 --- a/toolchain/modules +++ b/toolchain/modules @@ -15,7 +15,7 @@ s-gpu nvhpc/22.11 cuda/nvhpc b PSC Bridges2 b-all python/3.8.6 b-cpu allocations/1.0 gcc/10.2.0 openmpi/4.0.5-gcc10.2.0 -b-gpu openmpi/4.0.5-nvhpc22.9 nvhpc/22.9 +b-gpu openmpi/4.0.5-nvhpc22.9 nvhpc/22.9 cuda a OLCF Ascent a-all python cmake/3.22.2