Skip to content

Bump cmake min required version #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhornung67 wants to merge 9 commits into
base: develop
Choose a base branch
from
+23 −9
Open

Bump cmake min required version #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64b8071
Bump cmake min required version to 3.24
rhornung67 Dec 23, 2025
da0f11a
Merge branch 'develop' into task/rhornung67/bump-cmake
rhornung67 Jan 5, 2026
4bffddd
Merge branch 'develop' into task/rhornung67/bump-cmake
rhornung67 Jan 5, 2026
46728b1
Update intel compiler images
rhornung67 Jan 6, 2026
5de1184
Update clang images
rhornung67 Jan 6, 2026
ca206a5
turning off intel 2024.02 since the image doesn't work
rhornung67 Jan 6, 2026
dbddeca
Merge branch 'develop' into task/rhornung67/bump-cmake
rhornung67 Jan 6, 2026
7b959c7
Readded intel to check new image
rhornung67 Jan 7, 2026
bc4cf84
Image name changed
rhornung67 Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:ubuntu-24.04-intel-2024.2 AS intel2024_2
ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
Expand All @@ -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:ubuntu-24.04-intel-2024.2 AS intel2024_2_debug
ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
Expand All @@ -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:ubuntu-24.04-intel-2024.2 AS intel2024_2_sycl
ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
Expand Down
16 changes: 15 additions & 1 deletion RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Member

@artv3 artv3 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a big fan of updating the release_notes / change log per PR!

Copy link
Member Author

@rhornung67 rhornung67 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto. If we are disciplined enough to check on that for each PR review, we can do it.

Copy link
Member

@smithsg84 smithsg84 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI, a check can be added to verify the release notes / changlog file has been changed. Used this on a prior project to remind people to update. Happy to add that if you want. It was both useful and annoying at times.

Copy link
Member Author

@rhornung67 rhornung67 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooooo, that sounds good. Please make a PR or whatever needs to be done to add that.



Version 2025.12.0 -- Release date 2025-12-19
============================================

Expand All @@ -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
Expand Down
Loading