Skip to content

kokkos: cxxstd cleanup #2721

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

Merged
rbberger merged 6 commits into from
Jan 10, 2026
Merged

kokkos: cxxstd cleanup #2721

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4e7761
kokkos: cxxstd cleanup
tpadioleau Dec 10, 2025
bce1038
Fix HPX dependency
tpadioleau Dec 10, 2025
9b1192e
Use conditional for cxxstd values
tpadioleau Dec 16, 2025
926f838
Rework cxxstd variant
tpadioleau Dec 19, 2025
d320291
Factorize common parts
tpadioleau Jan 6, 2026
4276c2e
Set C++23 on hpx
tpadioleau Jan 8, 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
25 changes: 8 additions & 17 deletions repos/spack_repo/builtin/packages/kokkos/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,12 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
conflicts("+wrapper", when="~cuda")
conflicts("+wrapper", when="+cmake_lang")

cxxstds = ["11", "14", "17", "20"]
variant("cxxstd", default="17", values=cxxstds, multi=False, description="C++ standard")
with default_args(multi=False, description="C++ standard"):
variant("cxxstd", default="17", values=("14", "17", "20"), when="@3")
variant("cxxstd", default="17", values=("17", "20", "23"), when="@4")
variant("cxxstd", default="20", values=("20", "23"), when="@5")
variant("pic", default=False, description="Build position independent code")

conflicts("cxxstd=11")
conflicts("cxxstd=14", when="@4.0:")
conflicts("cxxstd=17", when="@5:")

conflicts("+cuda", when="cxxstd=17 ^cuda@:10")
conflicts("+cuda", when="cxxstd=20 ^cuda@:11")

Expand All @@ -305,19 +303,12 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
variant("alloc_async", default=False, description="Use CudaMallocAsync", when="@4.2: +cuda")

# SYCL and OpenMPTarget require C++17 or higher
for cxxstdver in cxxstds[: cxxstds.index("17")]:
conflicts(
"+sycl", when="cxxstd={0}".format(cxxstdver), msg="SYCL requires C++17 or higher"
)
conflicts(
"+openmptarget",
when="cxxstd={0}".format(cxxstdver),
msg="OpenMPTarget requires C++17 or higher",
)
conflicts("+sycl", when="cxxstd=14", msg="SYCL requires C++17 or higher")
conflicts("+openmptarget", when="cxxstd=14", msg="OpenMPTarget requires C++17 or higher")

# HPX should use the same C++ standard
for cxxstd in cxxstds:
depends_on("hpx cxxstd={0}".format(cxxstd), when="+hpx cxxstd={0}".format(cxxstd))
for cxxstd in ["14", "17", "20", "23"]:
depends_on(f"hpx cxxstd={cxxstd}", when=f"+hpx cxxstd={cxxstd}")

# HPX version constraints
depends_on("[email protected]:", when="+hpx")
Expand Down
Loading