From 64b80717b4570a451231770a23d60ba47061413d Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 23 Dec 2025 10:04:03 -0800 Subject: [PATCH 1/6] Bump cmake min required version to 3.24 --- CMakeLists.txt | 2 +- RELEASE_NOTES.md | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9438c31cdd..b64cc09d4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/thirdparty" ${CMAKE_MODULE_PA set(BLT_REQUIRED_CLANGFORMAT_VERSION "14" CACHE STRING "") include(cmake/SetupRajaOptions.cmake) -cmake_minimum_required(VERSION 3.23) +cmake_minimum_required(VERSION 3.24) # Detect C++ standard and add appropriate flag _before_ loading BLT set(COMPILERS_KNOWN_TO_CMAKE33 AppleClang Clang GNU MSVC) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c72ac952b0..5263fededd 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -20,6 +20,21 @@ Notable changes include: * Bug fixes/improvements: +Version 2025.MM.PP -- Release date 2025-mm-dd +============================================= + +This release contains ... + +Notable changes include: + + * New features / API changes: + + * Build changes/improvements: + * Bump minimum CMake version required to 3.24. + + * Bug fixes/improvements: + + Version 2025.12.0 -- Release date 2025-12-19 ============================================ @@ -34,7 +49,6 @@ Notable changes include: * Update Camp submodule to v2025.12.0 release. * Improve CMake support for configuring with Caliper and fix issue reported by a user. - * Bump minimum CMake version required to 3.24. * Bug fixes/improvements: * Fix compilation failue when a downstream library or applications is From 46728b10bd1cfdab5a61c45cf3af241b89d4e5f3 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 6 Jan 2026 08:15:29 -0800 Subject: [PATCH 2/6] Update intel compiler images --- .github/workflows/build.yml | 2 +- Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edf567f301..e875d625c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build_docker: strategy: matrix: - target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, intel2024_0, intel2024_0_debug, intel2024_0_sycl, rocm6_4_3_desul] + target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, intel2024_2, intel2024_2_debug, intel2024_2_sycl, rocm6_4_3_desul] runs-on: ubuntu-latest steps: - run: | diff --git a/Dockerfile b/Dockerfile index b605df6fda..e003680523 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENM make clean ## Don't run tests due to failure in RAJA launch tests with new reducer interface. -FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_0 +FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2 ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build @@ -85,7 +85,7 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ make clean" ## Don't run tests due to failure in RAJA launch tests with new reducer interface. -FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_0_debug +FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2_debug ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build @@ -94,7 +94,7 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ make -j 16 &&\ make clean" -FROM ghcr.io/llnl/radiuss:intel-2024.0-ubuntu-20.04 AS intel2024_0_sycl +FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2_sycl ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build From 5de118403210a29458b88d1c28671ba6e4ad2e0a Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 6 Jan 2026 11:55:30 -0800 Subject: [PATCH 3/6] Update clang images --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e003680523..b58b594424 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -DRAJA_ENABLE_WARN ctest -T test --output-on-failure && \ make clean -FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14_debug +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-clang-14 AS clang14_debug ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build @@ -56,7 +56,7 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_OPENMP ctest -T test --output-on-failure && \ make clean -FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14_style +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-clang-14 AS clang14_style USER root ENV GTEST_COLOR=1 COPY . /home/raja/workspace @@ -65,7 +65,7 @@ RUN clang-format --version && \ cmake -DENABLE_CLANGFORMAT=ON ../ && \ make check -FROM ghcr.io/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14_desul +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-clang-14 AS clang14_desul ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build From ca206a5100bbbd8be88de865713da60fc5000042 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 6 Jan 2026 12:11:13 -0800 Subject: [PATCH 4/6] turning off intel 2024.02 since the image doesn't work --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e875d625c0..7a145a7c8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build_docker: strategy: matrix: - target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, intel2024_2, intel2024_2_debug, intel2024_2_sycl, rocm6_4_3_desul] + target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, rocm6_4_3_desul] runs-on: ubuntu-latest steps: - run: | From 7b959c77531936637e14ae4db78f85572b494141 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 7 Jan 2026 10:28:01 -0800 Subject: [PATCH 5/6] Readded intel to check new image --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a145a7c8d..e875d625c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build_docker: strategy: matrix: - target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, rocm6_4_3_desul] + target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, intel2024_2, intel2024_2_debug, intel2024_2_sycl, rocm6_4_3_desul] runs-on: ubuntu-latest steps: - run: | From bc4cf84822533ded62febb270973a76da186025d Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 7 Jan 2026 10:29:58 -0800 Subject: [PATCH 6/6] Image name changed --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b58b594424..c2e40e5e42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENM make clean ## Don't run tests due to failure in RAJA launch tests with new reducer interface. -FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2 +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2 ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build @@ -85,7 +85,7 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ make clean" ## Don't run tests due to failure in RAJA launch tests with new reducer interface. -FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2_debug +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2_debug ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build @@ -94,7 +94,7 @@ RUN /bin/bash -c "source /opt/intel/oneapi/setvars.sh 2>&1 > /dev/null && \ make -j 16 &&\ make clean" -FROM ghcr.io/llnl/radiuss:intel-2024.2-ubuntu-24.04 AS intel2024_2_sycl +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-intel-2024.2 AS intel2024_2_sycl ENV GTEST_COLOR=1 COPY . /home/raja/workspace WORKDIR /home/raja/workspace/build