Skip to content

Update Omega to C++20 #405

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
mwarusz wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Update Omega to C++20 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcae301
Switch to C++20
mwarusz Apr 24, 2026
02f3a91
Disable C++20 modules in cpptrace
mwarusz May 11, 2026
379589d
Don't use deprecated is_hostspace
mwarusz Apr 24, 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 components/omega/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if (NOT DEFINED PROJECT_NAME)
# Collect machine and compiler info from CIME
init_standalone_build()

set(CMAKE_CXX_STANDARD 17) # used in E3SM
set(CMAKE_CXX_STANDARD 20) # used in E3SM
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(${OMEGA_PROJECT_NAME}
Expand Down
1 change: 1 addition & 0 deletions components/omega/external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ if (NOT TARGET cpptrace::cpptrace)
# PACKAGE_VERSION (e.g. 2.10.2) from leaking into libdwarf's configure_file
unset(PACKAGE_VERSION)
option(CPPTRACE_INHERIT_HOST_STANDARD "" ON)
option(CPPTRACE_DISABLE_CXX_20_MODULES "" ON)
add_subdirectory(
${OMEGA_SOURCE_DIR}/external/cpptrace
${CMAKE_CURRENT_BINARY_DIR}/external/cpptrace
Expand Down
5 changes: 3 additions & 2 deletions components/omega/src/infra/OmegaKokkos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ template <class T> constexpr ArrayDataType checkArrayType() {

// determine ArrayMemLoc from Kokkos array type
template <class T> constexpr ArrayMemLoc findArrayMemLoc() {
if (std::is_same_v<MemSpace, HostMemSpace>) {
if constexpr (std::is_same_v<MemSpace, HostMemSpace>) {
return ArrayMemLoc::Both;
} else if (T::is_hostspace) {
} else if constexpr (std::is_same_v<typename T::memory_space,
HostMemSpace>) {
return ArrayMemLoc::Host;
} else {
return ArrayMemLoc::Device;
Expand Down
Loading