From c4de793a61596a6787afb07ed0dd1dfee349f34f Mon Sep 17 00:00:00 2001 From: Kristi Belcher Date: Mon, 13 Apr 2026 15:11:19 -0700 Subject: [PATCH 1/4] updating CHAI to c++20 --- CMakeLists.txt | 7 ++++--- tests/integration/managed_ptr_tests.cpp | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 018e2960..13c8ea15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,12 +29,13 @@ message(STATUS "Using CMake version ${CMAKE_VERSION}") ################################ # BLT ################################ -set(BLT_CXX_STD c++17 CACHE STRING "") +set(BLT_CXX_STD c++20 CACHE STRING "") if(("${BLT_CXX_STD}" STREQUAL "c++98") OR ("${BLT_CXX_STD}" STREQUAL "c++11") OR - ("${BLT_CXX_STD}" STREQUAL "c++14")) - message(FATAL_ERROR "CHAI requires a minimum C++ standard of c++17. Please set BLT_CXX_STD appropriately.") + ("${BLT_CXX_STD}" STREQUAL "c++14") OR + ("${BLT_CXX_STD}" STREQUAL "c++17")) + message(FATAL_ERROR "CHAI requires a minimum C++ standard of c++20. Please set BLT_CXX_STD appropriately.") endif() if (NOT BLT_LOADED) diff --git a/tests/integration/managed_ptr_tests.cpp b/tests/integration/managed_ptr_tests.cpp index 73358b61..6ad3d7ee 100644 --- a/tests/integration/managed_ptr_tests.cpp +++ b/tests/integration/managed_ptr_tests.cpp @@ -6,6 +6,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "gtest/gtest.h" +#define CHAI_USE_VAR(x) static_cast(x) + #define GPU_TEST(X, Y) \ static void gpu_test_##X##Y(); \ TEST(X, Y) { gpu_test_##X##Y(); } \ @@ -872,6 +874,8 @@ class ABase { // Virtual function to manipulate an array of objects CHAI_HOST_DEVICE virtual void setArrayValues(int size, int value) { // Base implementation does nothing + CHAI_USE_VAR(size); + CHAI_USE_VAR(value); } CHAI_HOST_DEVICE virtual int getTypeID() const { return 0; } @@ -919,6 +923,7 @@ TEST(managed_ptr, polymorphic_with_ManagedArray_unpacker) // Use virtual function to modify array through the member pointer const int base_value = 10; forall( sequential(), 0, 1,[=](int i ) { + CHAI_USE_VAR(i); poly_ptr->setArrayValues(size, base_value); }); From 57e9f008ae0fbc0bbfcb26347f9e71dce95636d4 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 26 May 2026 12:52:50 -0700 Subject: [PATCH 2/4] Update gitignore and release notes --- .gitignore | 1 + RELEASE_NOTES.md | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 6128db31..06e33edd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ Win32/x64/ *.orig *.code-workspace slirp.out +.codex diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2a1185dd..76e0b0cc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -12,6 +12,12 @@ in this file. The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [Unreleased] = Release date yyyy-mm-dd + +### Changed +- CHAI now requires C++20 as the minimum C++ standard. +- CHAI now requires CUDA 12 as the minimum CUDA version. + ## [Version 2025.12.0] = Release date 2025-12-22 ### Fixed From 9dbced0da004aad8b07f2fde5b935d6f26ebd5db Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 26 May 2026 12:55:18 -0700 Subject: [PATCH 3/4] Update RAJA and Umpire --- src/tpl/raja | 2 +- src/tpl/umpire | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tpl/raja b/src/tpl/raja index e827035c..d9a03fd5 160000 --- a/src/tpl/raja +++ b/src/tpl/raja @@ -1 +1 @@ -Subproject commit e827035c630e71a9358e2f21c2f3cf6fd5fb6605 +Subproject commit d9a03fd56f7fb81540aeacbf082eb35dbb840b9c diff --git a/src/tpl/umpire b/src/tpl/umpire index 0372fbd6..f81afcab 160000 --- a/src/tpl/umpire +++ b/src/tpl/umpire @@ -1 +1 @@ -Subproject commit 0372fbd6e1f17d7e6dd72693f8b857f3ec7559e9 +Subproject commit f81afcab0e07c431288e950d471aa739df68f7f7 From dc59ee71313aeec4c564c0ddac387c408ac45587 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Tue, 26 May 2026 13:29:38 -0700 Subject: [PATCH 4/4] Update to newer gcc docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e63cbdfe..0ae341e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # SPDX-License-Identifier: BSD-3-Clause ############################################################################## -FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS gcc +FROM ghcr.io/llnl/radiuss:ubuntu-24.04-gcc-13 AS gcc ENV GTEST_COLOR=1 COPY . /home/chai/workspace WORKDIR /home/chai/workspace/build