summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--var/spack/repos/builtin/packages/flecsale/package.py45
-rw-r--r--var/spack/repos/builtin/packages/flecsi/package.py138
2 files changed, 31 insertions, 152 deletions
diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py
deleted file mode 100644
index ef09c6a29f..0000000000
--- a/var/spack/repos/builtin/packages/flecsale/package.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-from spack.pkg.builtin.boost import Boost
-
-
-class Flecsale(CMakePackage):
- """Flecsale is an ALE code based on FleCSI"""
-
- homepage = "https://github.com/laristra/flecsale"
- git = "https://github.com/laristra/flecsale.git"
-
- license("Unlicense")
-
- version("develop", branch="master", submodules=True)
-
- variant("mpi", default=True, description="Build on top of mpi conduit for mpi inoperability")
-
- depends_on("pkgconfig", type="build")
- depends_on("cmake@3.1:", type="build")
- depends_on("flecsi backend=serial", when="~mpi")
- conflicts("^flecsi backend=serial", when="+mpi")
- depends_on("python")
- depends_on("openssl")
- depends_on("boost~mpi", when="~mpi")
- depends_on("boost+mpi", when="+mpi")
-
- # TODO: replace this with an explicit list of components of Boost,
- # for instance depends_on('boost +filesystem')
- # See https://github.com/spack/spack/pull/22303 for reference
- depends_on(Boost.with_default_variants)
- depends_on("exodusii~mpi", when="~mpi")
- depends_on("exodusii+mpi", when="+mpi")
-
- def cmake_args(self):
- options = ["-DENABLE_UNIT_TESTS=ON" "-DENABLE_OPENSSL=ON" "-DENABLE_PYTHON=ON"]
-
- if "+mpi" in self.spec:
- options.extend(["-DENABLE_MPI=ON", "-DFLECSI_RUNTIME_MODEL=legion"])
-
- return options
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index cc72c4131c..ca09d28081 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -17,7 +17,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
homepage = "http://flecsi.org/"
git = "https://github.com/flecsi/flecsi.git"
- maintainers("ktsai7", "rbberger")
+ maintainers("rbberger", "opensdh")
tags = ["e4s"]
@@ -27,18 +27,11 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
version("2.2.0", tag="v2.2.0", commit="dd531ac16c5df124d76e385c6ebe9b9589c2d3ad")
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,
- deprecated=True,
- )
variant(
"backend",
default="mpi",
- values=("serial", "mpi", "legion", "hpx", "charmpp"),
+ values=("mpi", "legion", "hpx"),
description="Backend to use for distributed memory",
multi=False,
)
@@ -57,24 +50,9 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
variant("kokkos", default=False, description="Enable Kokkos Support")
variant("openmp", default=False, description="Enable OpenMP Support")
- # legacy variants
- variant("coverage", default=False, description="Enable coverage build", when="@:1")
- variant(
- "debug_backend", default=False, description="Build Backend with Debug Mode", when="@:1"
- )
- variant("disable_metis", default=False, description="Disable FindPackageMetis", when="@:1")
- variant("doxygen", default=False, description="Enable doxygen", when="@:1")
- variant("tutorial", default=False, description="Build FleCSI Tutorials", when="@:1")
- variant("flecstan", default=False, description="Build FleCSI Static Analyzer", when="@:1")
- variant("external_cinch", default=False, description="Enable External Cinch", when="@:1")
- variant("unit_tests", default=False, description="Build with Unit Tests Enabled", when="@:1")
-
# All Current FleCSI Releases
for level in ("low", "medium", "high"):
- depends_on("caliper@2.0.1~adiak~libdw", when="@:1 caliper_detail=%s" % level)
- depends_on("caliper", when="@2.0: caliper_detail=%s" % level)
- conflicts("^caliper@2.6", when="@2.0: caliper_detail=%s" % level)
- conflicts("^caliper@2.7", when="@2.0: caliper_detail=%s" % level)
+ depends_on("caliper@:2.5,2.8:", when=f"caliper_detail={level}")
depends_on("graphviz", when="+graphviz")
depends_on("hdf5+hl+mpi", when="+hdf5")
@@ -82,95 +60,56 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
depends_on("parmetis@4.0.3:")
depends_on("boost@1.70.0: cxxstd=17 +program_options +stacktrace")
- # FleCSI@1.x
- depends_on("cmake@3.12:", when="@:1")
- # Requires cinch > 1.0 due to cinchlog installation issue
- depends_on("cinch@1.01:", type="build", when="+external_cinch @:1")
- depends_on("mpi", when="backend=mpi @:1")
- depends_on("mpi", when="backend=legion @:1")
- depends_on("mpi", when="backend=hpx @:1")
- depends_on("legion+shared", when="backend=legion @:1")
- depends_on("legion+hdf5", when="backend=legion +hdf5 @:1")
- depends_on("legion build_type=Debug", when="backend=legion +debug_backend")
- depends_on("legion@cr-20191217", when="backend=legion @:1")
- depends_on("hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128", when="backend=hpx @:1")
- depends_on("hpx build_type=Debug", when="backend=hpx +debug_backend")
- depends_on("googletest@1.8.1+gmock", when="@:1")
- depends_on("python@3.0:", when="+tutorial @:1")
- depends_on("doxygen", when="+doxygen @:1")
- depends_on("llvm", when="+flecstan @:1")
- depends_on("pfunit@3.0:3", when="@:1")
- depends_on("py-gcovr", when="+coverage @:1")
- depends_on("openmpi+legacylaunchers", when="+unit_tests ^[virtuals=mpi] openmpi")
-
- # FleCSI@2.x
- depends_on("cmake@3.15:", when="@2.0:")
+ depends_on("cmake@3.15:")
depends_on("cmake@3.19:", when="@2.2:")
depends_on("cmake@3.23:", when="@2.3:")
- depends_on("boost +atomic +filesystem +regex +system", when="@2.0:2.2.1")
+ depends_on("boost +atomic +filesystem +regex +system", when="@:2.2.1")
depends_on("boost@1.79.0:", when="@2.2:")
- depends_on("kokkos@3.2.00:", when="+kokkos @2.0:")
- depends_on("kokkos +cuda +cuda_constexpr +cuda_lambda", when="+kokkos +cuda @2.0:")
- depends_on("kokkos +rocm", when="+kokkos +rocm @2.0:")
- depends_on("kokkos +openmp", when="+kokkos +openmp @2.0:")
+ depends_on("kokkos@3.2.00:", when="+kokkos")
depends_on("kokkos@3.7:", when="+kokkos @2.3:")
+ depends_on("kokkos +cuda +cuda_constexpr +cuda_lambda", when="+kokkos +cuda")
+ depends_on("kokkos +rocm", when="+kokkos +rocm")
+ depends_on("kokkos +openmp", when="+kokkos +openmp")
depends_on("legion@cr-20210122", when="backend=legion @2.0:2.2.1")
depends_on("legion@cr-20230307", when="backend=legion @2.2.0:2.2.1")
depends_on("legion@24.03.0:", when="backend=legion @2.2.2:")
- depends_on("legion+shared", when="backend=legion +shared @2.0:")
- depends_on("legion+hdf5", when="backend=legion +hdf5 @2.0:")
- depends_on("legion+kokkos", when="backend=legion +kokkos @2.0:")
- depends_on("legion+openmp", when="backend=legion +openmp @2.0:")
- depends_on("legion+cuda", when="backend=legion +cuda @2.0:")
- depends_on("legion+rocm", when="backend=legion +rocm @2.0:")
- depends_on("hdf5@1.10.7:", when="backend=legion +hdf5 @2.0:")
- depends_on("hpx@1.9.1: cxxstd=17 malloc=system", when="backend=hpx @2.0:")
- depends_on("mpi", when="@2.0:")
- depends_on("mpich@3.4.1:", when="@2.0: ^[virtuals=mpi] mpich")
- depends_on("openmpi@4.1.0:", when="@2.0: ^[virtuals=mpi] openmpi")
+ depends_on("legion+shared", when="backend=legion +shared")
+ depends_on("legion+hdf5", when="backend=legion +hdf5")
+ depends_on("legion+kokkos", when="backend=legion +kokkos")
+ depends_on("legion+openmp", when="backend=legion +openmp")
+ depends_on("legion+cuda", when="backend=legion +cuda")
+ depends_on("legion+rocm", when="backend=legion +rocm")
+ depends_on("hdf5@1.10.7:", when="backend=legion +hdf5")
+ depends_on("hpx@1.10.0: cxxstd=17 malloc=system", when="backend=hpx")
+ depends_on("mpi")
+ depends_on("mpich@3.4.1:", when="^[virtuals=mpi] mpich")
+ depends_on("openmpi@4.1.0:", when="^[virtuals=mpi] openmpi")
depends_on("graphviz@2.49.0:", when="+graphviz @2.3:")
# FleCSI 2.2+ documentation dependencies
depends_on("py-sphinx", when="+doc")
depends_on("py-sphinx-rtd-theme", when="+doc")
- depends_on("py-recommonmark", when="+doc")
+ depends_on("py-recommonmark", when="@:2.2 +doc")
depends_on("doxygen", when="+doc")
depends_on("graphviz", when="+doc")
# Propagate cuda_arch requirement to dependencies
for _flag in CudaPackage.cuda_arch_values:
- depends_on("kokkos cuda_arch=" + _flag, when="+cuda+kokkos cuda_arch=" + _flag + " @2.0:")
- depends_on(
- "legion cuda_arch=" + _flag, when="backend=legion +cuda cuda_arch=" + _flag + " @2.0:"
- )
+ depends_on(f"kokkos cuda_arch={_flag}", when=f"+cuda+kokkos cuda_arch={_flag}")
+ depends_on(f"legion cuda_arch={_flag}", when=f"backend=legion +cuda cuda_arch={_flag}")
# Propagate amdgpu_target requirement to dependencies
for _flag in ROCmPackage.amdgpu_targets:
- depends_on("kokkos amdgpu_target=" + _flag, when="+kokkos +rocm amdgpu_target=" + _flag)
+ depends_on(f"kokkos amdgpu_target={_flag}", when=f"+kokkos +rocm amdgpu_target={_flag}")
depends_on(
- "legion amdgpu_target=" + _flag,
- when="backend=legion +rocm amdgpu_target=" + _flag + " @2.0:",
+ f"legion amdgpu_target={_flag}", when=f"backend=legion +rocm amdgpu_target={_flag}"
)
- requires("%gcc@9:", when="@2: %gcc", msg="Version 9 or newer of GNU compilers required!")
-
- conflicts("+tutorial", when="backend=hpx")
- # FleCSI@2: no longer supports serial or charmpp backends
- conflicts("backend=serial", when="@2.0:")
- conflicts("backend=charmpp", when="@2.0:")
- # FleCSI@:1.4 releases do not support kokkos, omp, cuda, or rocm
- conflicts("+kokkos", when="@:1.4")
- conflicts("+openmp", when="@:1.4")
- conflicts("+cuda", when="@:1.4")
- conflicts("+rocm", when="@:1.4")
- # Unit tests require flog support
- conflicts("+unit_tests", when="~flog")
+ requires("%gcc@9:", when="%gcc", msg="Version 9 or newer of GNU compilers required!")
+
# Disallow conduit=none when using legion as a backend
conflicts("^legion conduit=none", when="backend=legion")
- # Due to overhauls of Legion and Gasnet spackages
- # flecsi@:1.4 can no longer be built with a usable legion
- conflicts("backend=legion", when="@:1.4")
- conflicts("+hdf5", when="@2: backend=hpx", msg="HPX backend doesn't support HDF5")
+ conflicts("+hdf5", when="backend=hpx", msg="HPX backend doesn't support HDF5")
def cmake_args(self):
spec = self.spec
@@ -206,29 +145,14 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
self.define_from_variant("ENABLE_GRAPHVIZ", "graphviz"),
self.define_from_variant("ENABLE_KOKKOS", "kokkos"),
self.define_from_variant("ENABLE_OPENMP", "openmp"),
- self.define_from_variant("ENABLE_DOXYGEN", "doxygen"),
- self.define_from_variant("ENABLE_COVERAGE_BUILD", "coverage"),
+ self.define_from_variant("ENABLE_DOXYGEN", "doc"),
self.define_from_variant("ENABLE_FLOG", "flog"),
- self.define_from_variant("ENABLE_FLECSIT", "tutorial"),
- self.define_from_variant("ENABLE_FLECSI_TUTORIAL", "tutorial"),
- 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_MPI", True),
+ self.define("ENABLE_UNIT_TESTS", self.run_tests),
self.define_from_variant("ENABLE_HDF5", "hdf5"),
]
- if "+external_cinch" in spec:
- options.append(self.define("CINCH_SOURCE_DIR", spec["cinch"].prefix))
-
if spec.variants["backend"].value == "hpx":
options.append(self.define("HPX_IGNORE_CMAKE_BUILD_TYPE_COMPATIBILITY", True))
- if spec.satisfies("@:1"):
- options.append(
- self.define("ENABLE_CALIPER", spec.variants["caliper_detail"].value != "none")
- )
- options.append(
- self.define_from_variant("CMAKE_DISABLE_FIND_PACKAGE_METIS", "disable_metis")
- )
-
return options
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-06 17:16:38 +0000