Skip to content

flecsi: update package requirements #4742

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
hainest merged 2 commits into from
May 17, 2026
Merged

flecsi: update package requirements #4742

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f34a930
flecsi: update package requirements
rbberger May 7, 2026
9ad6263
flecsi: mark documentation dependencies as build-only deps
rbberger May 13, 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
23 changes: 13 additions & 10 deletions repos/spack_repo/builtin/packages/flecsi/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -95,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:
Expand Down Expand Up @@ -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"):
Comment thread
rbberger marked this conversation as resolved.
options.append(self.define("CMAKE_CXX_COMPILER", self["kokkos"].kokkos_cxx))

return options
Loading