From 9d8fcf71e3e1ee53fef20ca353ac358c3b67694f Mon Sep 17 00:00:00 2001
From: Cyrus Harrison <cyrush@llnl.gov>
Date: Mon, 19 Aug 2024 12:58:44 -0700
Subject: [PATCH] updates to rzadams and rzvernal for mpi (#1362)

* updates to rzadams and rzvernal for mpi

* add rzadams
---
 .../build_ascent/build_ascent_hip_rzadams.sh  | 19 +++++++++++++++++++
 .../build_ascent/build_ascent_hip_rzvernal.sh |  9 ++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100755 scripts/build_ascent/build_ascent_hip_rzadams.sh

diff --git a/scripts/build_ascent/build_ascent_hip_rzadams.sh b/scripts/build_ascent/build_ascent_hip_rzadams.sh
new file mode 100755
index 000000000..4e14af63b
--- /dev/null
+++ b/scripts/build_ascent/build_ascent_hip_rzadams.sh
@@ -0,0 +1,19 @@
+module load cmake/3.24.2
+module load craype-accel-amd-gfx940
+module load rocmcc/6.1.2-magic
+
+export MPICH_GPU_SUPPORT_ENABLED=1
+export ROCM_ARCH=gfx942
+
+export CC=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/bin/amdclang
+export CXX=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/bin/amdclang++
+export ROCM_PATH=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/
+
+export enable_mpi="${enable_mpi:=ON}"
+export enable_python="${enable_python:=ON}"
+export build_caliper="${build_caliper:=true}"
+export build_pyvenv="${bbuild_pyvenv:=true}"
+
+./build_ascent_hip.sh
+
+
diff --git a/scripts/build_ascent/build_ascent_hip_rzvernal.sh b/scripts/build_ascent/build_ascent_hip_rzvernal.sh
index 716a1874b..07b75bc62 100755
--- a/scripts/build_ascent/build_ascent_hip_rzvernal.sh
+++ b/scripts/build_ascent/build_ascent_hip_rzvernal.sh
@@ -5,12 +5,11 @@ module load rocmcc/6.1.2-magic
 export MPICH_GPU_SUPPORT_ENABLED=1
 export ROCM_ARCH=gfx90a
 
-export CC=/opt/rocm-6.1.2/bin/amdclang
-export CXX=/opt/rocm-6.1.2/bin/amdclang++
-#export CFLAGS="-I${ROCM_PATH}/include"
-#export CXXFLAGS="-I${ROCM_PATH}/include -Wno-pass-failed"
-#export LDFLAGS="-L${ROCM_PATH}/lib -lamdhip64"
+export CC=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/bin/amdclang
+export CXX=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/bin/amdclang++
+export ROCM_PATH=/usr/tce/packages/rocmcc/rocmcc-6.1.2-magic/
 
+export enable_mpi="${enable_mpi:=ON}"
 export enable_python="${enable_python:=ON}"
 export build_caliper="${build_caliper:=true}"
 export build_pyvenv="${bbuild_pyvenv:=true}"