From e05f12f18e7da45f332e0e08afa7c005a6930ea4 Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Fri, 8 Sep 2023 10:57:14 -0700 Subject: veloc: add v1.7 (#39465) * updates for VELOC 1.6 * veloc: add v1.7 --------- Co-authored-by: Bogdan Nicolae --- var/spack/repos/builtin/packages/veloc/package.py | 34 ++++++++--------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 4ca315364b..b470582aa2 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.pkg.builtin.boost import Boost class Veloc(CMakePackage): @@ -12,12 +11,14 @@ class Veloc(CMakePackage): checkpoint-restart runtime for HPC supercomputing infrastructures""" homepage = "https://github.com/ECP-VeloC/VELOC" - url = "https://github.com/ECP-VeloC/VELOC/archive/1.5.tar.gz" + url = "https://github.com/ECP-VeloC/VELOC/archive/veloc-1.7.tar.gz" git = "https://github.com/ecp-veloc/veloc.git" + maintainers = ["bnicolae"] tags = ["e4s"] version("main", branch="main") + version("1.7", sha256="ca50cb300830ea7f7e5679d32e3671ce4ea250eac384e7231def8dbb90e0cf31") version("1.6", sha256="451b46ad13e360270044c0dba09d8e4fbd64149f8e8d71310fdb520424c5eeaa") version("1.5", sha256="892f3623c73254d40fbbb8cbc3056219a31510e37aae2ede4100c04743701a5c") version("1.4", sha256="d5d12aedb9e97f079c4428aaa486bfa4e31fe1db547e103c52e76c8ec906d0a8") @@ -26,40 +27,29 @@ class Veloc(CMakePackage): version("1.1", sha256="2bbdacf3e0ce4e7c9e360874d8d85b405525bdc7bd992bdb1f1ba49218072160") version("1.0", sha256="d594b73d6549a61fce8e67b8984a17cebc3e766fc520ed1636ae3683cdde77cb") - # 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("libpthread-stubs") depends_on("mpi") + depends_on("boost") depends_on("er") depends_on("axl@:0.3.0", when="@:1.5") - depends_on("openssl") # Relies on the OpenSSL crypto library for checksums - depends_on("pdsh", when="@master") - depends_on("cmake@3.9:", type="build") + depends_on("axl@0.5.0:", when="@1.6:") + depends_on("openssl") + depends_on("cmake@3.10:", type="build") - with when("@1.6:"): - depends_on("axl@0.5.0:") - depends_on("redset") - depends_on("rankstr") - depends_on("shuffile") - depends_on("kvtree") - - conflicts("%gcc@:4.9.3") - - # requires C++11 def flag_handler(self, name, flags): flags = list(flags) if name == "cxxflags": - flags.append(self.compiler.cxx11_flag) + if self.spec.satisfies("@:1.5"): + flags.append(self.compiler.cxx11_flag) + else: + flags.append(self.compiler.cxx17_flag) return (None, None, flags) def cmake_args(self): args = [ "-DWITH_AXL_PREFIX=%s" % self.spec["axl"].prefix, "-DWITH_ER_PREFIX=%s" % self.spec["er"].prefix, - "-DBOOST_ROOT=%s" % self.spec["boost"].prefix, "-DMPI_CXX_COMPILER=%s" % self.spec["mpi"].mpicxx, + "-DBOOST_ROOT=%s" % self.spec["boost"].prefix, ] - return args -- cgit v1.2.3-60-g2f50