Merge branch 'develop' into feature/bowen/script-clang-format-off

LLNL · Oct 14, 2024 · 356d72b · 356d72b
2 parents 1ddca41 + a7aa1b4
commit 356d72b
Show file tree

Hide file tree

Showing 31 changed files with 158 additions and 138 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12_debug, gcc13, clang13, clang15, rocm6, rocm6_desul, intel2024, intel2024_debug, intel2024_sycl]
+        target: [gcc12_debug, gcc13, clang13, clang14_debug, clang15, rocm6, rocm6_desul, intel2024, intel2024_debug, intel2024_sycl]
     runs-on: ubuntu-latest
     steps:
     - run: |

diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
@@ -17,26 +17,26 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # when possible so that the comparison with the original job is easier.
 
-# Known issue currently under investigation
-# 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}"
-  extends: .job_on_poodle
-  allow_failure: true
-
 # Identical to shared job, but use OpenMP tasks and no vectorization
 clang_14_0_6:
   variables:
-    SPEC: " ~shared +openmp +omptask +tests %clang@=14.0.6 ${PROJECT_POODLE_DEPS}"
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %clang@=14.0.6 ${PROJECT_POODLE_DEPS}"
   extends: .job_on_poodle
 
 # Identical to shared job, but use OpenMP tasks and no vectorization
 gcc_10_3_1:
   variables:
-    SPEC: " ~shared +openmp +omptask +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}"
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}"
   extends: .job_on_poodle
 
+# Known issue currently under investigation
+# 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}"
+  extends: .job_on_poodle
+  allow_failure: true
+
 ############
 # Extra jobs
 ############

diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml
@@ -20,13 +20,13 @@
 # Identical to shared job, but use OpenMP tasks and no vectorization
 clang_14_0_6:
   variables:
-    SPEC: " ~shared +openmp +omptask +tests %clang@=14.0.6 ${PROJECT_RUBY_DEPS}"
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %clang@=14.0.6 ${PROJECT_RUBY_DEPS}"
   extends: .job_on_ruby
 
 # Identical to shared job, but use OpenMP tasks and no vectorization
 gcc_10_3_1:
   variables:
-    SPEC: " ~shared +openmp +omptask +tests %gcc@=10.3.1 ${PROJECT_RUBY_DEPS}"
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_RUBY_DEPS}"
   extends: .job_on_ruby
 
 # Known issue currently under investigation

diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-07-07",
+"spack_branch": "develop-2024-10-06",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -42,8 +42,6 @@ jobs:
         docker_target: gcc12
       gcc12_desul:
         docker_target: gcc12_desul
-      clang14_debug:
-        docker_target: clang14_debug
       clang15_desul:
         docker_target: clang15_desul
   pool:

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -17,10 +17,9 @@ raja_add_benchmark(
   SOURCES benchmark-atomic.cpp)
 endif()
 
-#TODO: Fix build issues
-#raja_add_benchmark(
-#  NAME ltimes
-#  SOURCES ltimes.cpp)
+raja_add_benchmark(
+  NAME ltimes
+  SOURCES ltimes.cpp)
 
 raja_add_benchmark(
   NAME raja_view_blur