Merge branch 'develop' into feature/seanofthemillers/adding_radeon_support

Author: rhornung67

.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

.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

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 "")

include/RAJA/policy/openmp_target/params/reduce.hpp

@@ -26,7 +26,7 @@ namespace detail {
   // Resolve
   template<typename EXEC_POL, typename OP, typename T, typename VOp>
   camp::concepts::enable_if< type_traits::is_target_openmp_policy<EXEC_POL> >
-  resolve(Reducer<OP, T, I, VOp>& red) {
+  resolve(Reducer<OP, T, VOp>& red) {
     red.combineTarget(red.m_valop.val);
   }
 

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

scripts/radiuss-spack-configs

@@ -37,9 +37,10 @@ if(RAJA_ENABLE_OPENMP)
   list(APPEND BACKENDS OpenMP)
 endif()
 
-if(RAJA_ENABLE_TARGET_OPENMP)
-  list(APPEND BACKENDS OpenMPTarget)
-endif()
+# Add this back in when OpenMP Target implementation exists for multi-reducer
+#if(RAJA_ENABLE_TARGET_OPENMP)
+#  list(APPEND BACKENDS OpenMPTarget)
+#endif()
 
 if(RAJA_ENABLE_CUDA)
   list(APPEND BACKENDS Cuda)