From 22a7838efb836cdd1256e19f1c3b1aa584f58f82 Mon Sep 17 00:00:00 2001
From: Rich Hornung <hornung1@llnl.gov>
Date: Wed, 9 Oct 2024 12:54:45 -0700
Subject: [PATCH] Add new icpx build script that works for various
 installations of icpx

---
 host-configs/lc-builds/toss4/icpx_X.cmake |  4 +--
 scripts/lc-builds/toss4_icpx.sh           | 31 ++++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/host-configs/lc-builds/toss4/icpx_X.cmake b/host-configs/lc-builds/toss4/icpx_X.cmake
index 2f5301bd22..b1bf7af286 100755
--- a/host-configs/lc-builds/toss4/icpx_X.cmake
+++ b/host-configs/lc-builds/toss4/icpx_X.cmake
@@ -8,8 +8,8 @@
 set(RAJA_COMPILER "RAJA_COMPILER_ICC" CACHE STRING "")
 
 ##set(COMMON_FLAGS "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1")
-##set(COMMON_OPT_FLAGS "-march=native -finline-functions -fp-model=precise")
-set(COMMON_OPT_FLAGS "-march=native -finline-functions")
+set(COMMON_OPT_FLAGS "-march=native -finline-functions -fp-model=precise")
+##set(COMMON_OPT_FLAGS "-march=native -finline-functions")
 
 ##set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_FLAGS} -O3 ${COMMON_OPT_FLAGS}" CACHE STRING "")
 ##set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -O3 -g ${COMMON_OPT_FLAGS}" CACHE STRING "")
diff --git a/scripts/lc-builds/toss4_icpx.sh b/scripts/lc-builds/toss4_icpx.sh
index d6fe0d867b..faa0286c8e 100755
--- a/scripts/lc-builds/toss4_icpx.sh
+++ b/scripts/lc-builds/toss4_icpx.sh
@@ -35,12 +35,20 @@ module load cmake/3.23.1
 # times at a potential cost of slower 'forall' execution.
 ##
 
-source /usr/tce/packages/intel/intel-${COMP_VER}/setvars.sh
+COMPILER_BIN_DIR="/usr/tce/packages/intel/intel-${COMP_VER}/bin"
+
+if [[ ${COMP_VER} == 2024.2.1 ]]
+then
+  COMPILER_BIN_DIR="/collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/2024.2/bin"
+  source /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/setvars.sh
+else
+  source /usr/tce/packages/intel/intel-${COMP_VER}/setvars.sh
+fi
 
 cmake \
   -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_CXX_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/bin/icpx \
-  -DCMAKE_C_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/bin/icx \
+  -DCMAKE_CXX_COMPILER=icpx \
+  -DCMAKE_C_COMPILER=icx \
   -DBLT_CXX_STD=c++14 \
   -C ../host-configs/lc-builds/toss4/icpx_X.cmake \
   -DRAJA_ENABLE_FORCEINLINE_RECURSIVE=Off \
@@ -48,3 +56,20 @@ cmake \
   -DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
   "$@" \
   ..
+
+if [[ ${COMP_VER} == 2024.2.1 ]]
+then
+
+echo
+echo "***********************************************************************"
+echo
+echo "cd into directory build_${BUILD_SUFFIX} and run make to build RAJA"
+echo
+echo "To successfully build and run all tests, you may need to run the"
+echo "command to make sure your environment is set up properly:"
+echo
+echo "  source /collab/usr/global/tools/intel/toss_4_x86_64_ib/oneapi-2024.2.1/setvars.sh"
+echo
+echo "***********************************************************************"
+
+fi