diff options
author | Richard Berger <rberger@lanl.gov> | 2024-01-17 14:49:33 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-17 13:49:33 -0800 |
commit | eda4d3fa06f0d6c1aec383fe0bc6dddf81b3395d (patch) | |
tree | 4eb5c66b4ef7b2e7953aed39a1be59297a3c9fa7 | |
parent | 68e00e7073ecc0e56f1eee8af4ebe87f5f15eb60 (diff) | |
download | spack-eda4d3fa06f0d6c1aec383fe0bc6dddf81b3395d.tar.gz spack-eda4d3fa06f0d6c1aec383fe0bc6dddf81b3395d.tar.bz2 spack-eda4d3fa06f0d6c1aec383fe0bc6dddf81b3395d.tar.xz spack-eda4d3fa06f0d6c1aec383fe0bc6dddf81b3395d.zip |
FleCSI updates (#42127)
* flecsi: simplify hdf5 variant logic
* flecsi: deprecate 1.4 version
-rw-r--r-- | var/spack/repos/builtin/packages/flecsi/package.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 47b01d1487..c11b4ecf6a 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -29,7 +29,11 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): version("2.1.0", tag="v2.1.0", commit="533df139c267e2a93c268dfe68f9aec55de11cf0") version("2.0.0", tag="v2.0.0", commit="5ceebadf75d1c98999ea9e9446926722d061ec22") version( - "1.4.1", tag="v1.4.1", commit="ab974c3164056e6c406917c8ca771ffd43c5a031", submodules=True + "1.4.1", + tag="v1.4.1", + commit="ab974c3164056e6c406917c8ca771ffd43c5a031", + submodules=True, + deprecated=True, ) variant( @@ -173,9 +177,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): self.define_from_variant("CALIPER_DETAIL", "caliper_detail"), self.define_from_variant("ENABLE_FLOG", "flog"), self.define_from_variant("ENABLE_GRAPHVIZ", "graphviz"), - self.define( - "ENABLE_HDF5", "+hdf5" in spec and spec.variants["backend"].value != "hpx" - ), + self.define_from_variant("ENABLE_HDF5", "hdf5"), self.define_from_variant("ENABLE_KOKKOS", "kokkos"), self.define_from_variant("ENABLE_OPENMP", "openmp"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), @@ -208,9 +210,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): self.define_from_variant("ENABLE_FLECSTAN", "flecstan"), self.define("ENABLE_MPI", spec.variants["backend"].value != "serial"), self.define("ENABLE_UNIT_TESTS", self.run_tests or "+unit_tests" in spec), - self.define( - "ENABLE_HDF5", "+hdf5" in spec and spec.variants["backend"].value != "hpx" - ), + self.define_from_variant("ENABLE_HDF5", "hdf5"), ] if "+external_cinch" in spec: |