From 13e24315e7299018cf0971b87506afa2d446e566 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Thu, 17 Oct 2024 13:27:46 -0700 Subject: [PATCH 1/4] Modify build script and host-config file for Intel builds. --- host-configs/lc-builds/toss4/icpx_X.cmake | 4 ++-- scripts/lc-builds/toss4_icpx.sh | 28 ++++++++++++++++++++--- 2 files changed, 27 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..a1499ce08d 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 88cc43d824..d7d7c7dd85 100755 --- a/scripts/lc-builds/toss4_icpx.sh +++ b/scripts/lc-builds/toss4_icpx.sh @@ -35,12 +35,17 @@ 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 +if [[ ${COMP_VER} == 2024.2.1 ]] +then + 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 \ @@ -49,3 +54,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 From ee749f97819aff5e4902ac19da2aab1fe920c7f6 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:13:54 +0200 Subject: [PATCH 2/4] Point at radiuss-spack-configs with new intel compiler and "fix" for intel 2023 --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index 00c06c2d02..e2f3fb4bdb 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 00c06c2d0258802fbf4a57ff987314d4acd9f629 +Subproject commit e2f3fb4bdb4e803ae32775c361b61b1c34eb3203 From de6a7831c91b21ac024be7bf7d2a870aa0358596 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:32:21 +0200 Subject: [PATCH 3/4] Point at new RSC main commit --- scripts/radiuss-spack-configs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index e2f3fb4bdb..522da3898f 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit e2f3fb4bdb4e803ae32775c361b61b1c34eb3203 +Subproject commit 522da3898fcc8942f8eb3270f01c8212937589f5 From 9a936d3c39aa0a901ef54451f0b61871a371e776 Mon Sep 17 00:00:00 2001 From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:26:33 +0200 Subject: [PATCH 4/4] use -01 and fp-precise with intel 2023 --- .gitlab/jobs/poodle.yml | 5 ++--- .gitlab/jobs/ruby.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml index 3b2a174b97..8486266704 100644 --- a/.gitlab/jobs/poodle.yml +++ b/.gitlab/jobs/poodle.yml @@ -29,13 +29,12 @@ gcc_10_3_1: SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}" extends: .job_on_poodle -# Known issue currently under investigation +# custom variant # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843 intel_2023_2_1: variables: - SPEC: "${PROJECT_POODLE_VARIANTS} %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}" + SPEC: "${PROJECT_POODLE_VARIANTS} +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}" extends: .job_on_poodle - allow_failure: true ############ # Extra jobs diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml index 2258878c3e..c745ca4a6c 100644 --- a/.gitlab/jobs/ruby.yml +++ b/.gitlab/jobs/ruby.yml @@ -29,13 +29,12 @@ gcc_10_3_1: SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_RUBY_DEPS}" extends: .job_on_ruby -# Known issue currently under investigation +# custom variant # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843 intel_2023_2_1: variables: - SPEC: "${PROJECT_RUBY_VARIANTS} %intel@=2023.2.1 ${PROJECT_RUBY_DEPS}" + SPEC: "${PROJECT_RUBY_VARIANTS} +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ${PROJECT_RUBY_DEPS}" extends: .job_on_ruby - allow_failure: true ############ # Extra jobs