From f34a930b6c8c2819c40b22d8cc85c430fe0c50e9 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 7 May 2026 15:37:11 -0600 Subject: [PATCH 1/2] flecsi: update package requirements --- repos/spack_repo/builtin/packages/flecsi/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/repos/spack_repo/builtin/packages/flecsi/package.py b/repos/spack_repo/builtin/packages/flecsi/package.py index 293927237e5..4d8ae7446a7 100644 --- a/repos/spack_repo/builtin/packages/flecsi/package.py +++ b/repos/spack_repo/builtin/packages/flecsi/package.py @@ -75,7 +75,8 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos", when="+kokkos @2.3:") depends_on("kokkos", when="@2.4:") depends_on("kokkos +cuda", when="+kokkos +cuda") - requires("^kokkos +cuda_constexpr +cuda_lambda", when="^kokkos +cuda") + requires("^kokkos +cuda_lambda", when="^kokkos@:4 +cuda") + requires("^kokkos +cuda_constexpr", when="^kokkos +cuda") depends_on("kokkos +rocm", when="+kokkos +rocm") depends_on("kokkos +openmp", when="+kokkos +openmp") requires("+openmp", when="@:2.3 ^kokkos +openmp") @@ -143,13 +144,15 @@ def cmake_args(self): self.define_from_variant("ENABLE_DOCUMENTATION", "doc"), ] - if self.spec.satisfies("^kokkos +rocm"): + if self.spec.satisfies("^kokkos +rocm") and not self.spec.satisfies( + "^kokkos %cxx=llvm-amdgpu" + ): options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_C_COMPILER", self.spec["hip"].hipcc)) if self.spec.satisfies("backend=legion"): # CMake pulled in via find_package(Legion) won't work without this options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix))) - elif self.spec.satisfies("^kokkos"): + elif self.spec.satisfies("^kokkos +cuda"): options.append(self.define("CMAKE_CXX_COMPILER", self["kokkos"].kokkos_cxx)) return options From 9ad6263617132316ac33f14aedbd010ade2683e1 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Wed, 13 May 2026 10:40:13 -0600 Subject: [PATCH 2/2] flecsi: mark documentation dependencies as build-only deps --- .../spack_repo/builtin/packages/flecsi/package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/repos/spack_repo/builtin/packages/flecsi/package.py b/repos/spack_repo/builtin/packages/flecsi/package.py index 4d8ae7446a7..b321449d311 100644 --- a/repos/spack_repo/builtin/packages/flecsi/package.py +++ b/repos/spack_repo/builtin/packages/flecsi/package.py @@ -96,13 +96,13 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): depends_on("graphviz@2.49.0:", when="+graphviz @2.3:") # FleCSI documentation dependencies - depends_on("py-sphinx", when="+doc") - depends_on("py-sphinx-rtd-theme@:2", when="+doc") - depends_on("py-recommonmark", when="@:2.2 +doc") - depends_on("doxygen", when="+doc") - depends_on("graphviz", when="+doc") - depends_on("texlive", when="@2.4.1: +doc") - depends_on("pdf2svg", when="@2.4.1: +doc") + depends_on("py-sphinx", when="+doc", type="build") + depends_on("py-sphinx-rtd-theme@:2", when="+doc", type="build") + depends_on("py-recommonmark", when="@:2.2 +doc", type="build") + depends_on("doxygen", when="+doc", type="build") + depends_on("graphviz", when="+doc", type="build") + depends_on("texlive", when="@2.4.1: +doc", type="build") + depends_on("pdf2svg", when="@2.4.1: +doc", type="build") # Propagate cuda_arch requirement to dependencies for _flag in CudaPackage.cuda_arch_values: