From 58ac79acceeba078a3b266a67a03062592e02d61 Mon Sep 17 00:00:00 2001 From: Matthias Wolf Date: Wed, 9 Oct 2024 14:25:09 +0200 Subject: [PATCH] py-bglibpy, morpho-kit: purge --- .../packages/morpho-kit/h5.patch | 23 ------- .../packages/morpho-kit/package.py | 54 ---------------- .../packages/py-bglibpy/package.py | 36 ----------- .../packages/touchdetector/package.py | 64 +++++-------------- 4 files changed, 17 insertions(+), 160 deletions(-) delete mode 100644 bluebrain/repo-bluebrain/packages/morpho-kit/h5.patch delete mode 100644 bluebrain/repo-bluebrain/packages/morpho-kit/package.py delete mode 100644 bluebrain/repo-bluebrain/packages/py-bglibpy/package.py diff --git a/bluebrain/repo-bluebrain/packages/morpho-kit/h5.patch b/bluebrain/repo-bluebrain/packages/morpho-kit/h5.patch deleted file mode 100644 index b20991807a33d3..00000000000000 --- a/bluebrain/repo-bluebrain/packages/morpho-kit/h5.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit f19b3d110e55dcbb25d6a8962a49aa87b5b859b0 -Author: Matthias Wolf -Date: Thu Feb 17 11:12:40 2022 +0100 - - dependencies: we have an explicit dependency on HighFive, link to it. - - Otherwise, this fails to compile on Monterey. - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b13b7bd..776776b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -64,6 +64,10 @@ foreach(lib morphokit_shared morphokit_static) - PUBLIC - MorphIO::morphio - ) -+ target_link_libraries(${lib} -+ PRIVATE -+ HighFive -+ ) - endforeach(lib) - - install( diff --git a/bluebrain/repo-bluebrain/packages/morpho-kit/package.py b/bluebrain/repo-bluebrain/packages/morpho-kit/package.py deleted file mode 100644 index f77a22db32881e..00000000000000 --- a/bluebrain/repo-bluebrain/packages/morpho-kit/package.py +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2013-2018 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 * - - -class MorphoKit(CMakePackage): - """Higher-level library for reading / writing morphology files""" - - homepage = "https://bbpgitlab.epfl.ch/hpc/morpho-kit" - git = "ssh://git@bbpgitlab.epfl.ch/hpc/morpho-kit.git" - - submodules = True - - version("develop", branch="main") - version("0.3.6", tag="v0.3.6") - version("0.3.5", tag="v0.3.5") - version("0.3.4", tag="v0.3.4") - version("0.3.3", tag="0.3.3") - version("0.3.2", tag="v0.3.2") - version("0.3.1", tag="v0.3.1") - version("0.3.0", tag="v0.3.0") - version("0.2.0", tag="v0.2.0") - - depends_on("cmake@3.2:", type="build") - depends_on("morphio@2.3.9:", when="@0.3.4") - depends_on("morphio@3.3.5:", when="@0.3.5:") - depends_on("cli11", when="@0.3.3:") # for utilities - depends_on("libsonata", when="@0.3.3:") # for utilities - depends_on("highfive@2.4.0:", when="@0.3.3:") # for utilities - - # The HighFive update is needed for paged HDF5 features. Unfortunately, the - # page buffer is artificially unsupported in pHDF5. Hence, we depend on a - # particular, patched version of HDF5. - depends_on("highfive@2.6.2: +mpi+page_buffer_patch", when="@0.3.5:") - - # MPI is needed for the morphology merger. - depends_on("mpi", when="@0.3.5:") - - depends_on("boost", when="@0.2.0") - - patch("h5.patch", when="@0.3.2") - - def cmake_args(self): - args = [ - "-DBUILD_BINDINGS:BOOL=OFF", - ] - - if self.spec.satisfies("@0.3.5:"): - args.append("-DMORPHOKIT_HAS_PATCHED_HDF5:BOOL=ON") - - return args diff --git a/bluebrain/repo-bluebrain/packages/py-bglibpy/package.py b/bluebrain/repo-bluebrain/packages/py-bglibpy/package.py deleted file mode 100644 index e7e06d9066904d..00000000000000 --- a/bluebrain/repo-bluebrain/packages/py-bglibpy/package.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2013-2018 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 * - - -class PyBglibpy(PythonPackage): - """Pythonic Blue Brain simulator access""" - - homepage = "https://bbpgitlab.epfl.ch/cells/bglibpy" - git = "ssh://git@bbpgitlab.epfl.ch/cells/bglibpy.git" - - version("develop", branch="main") - version("4.8.2", commit="0d72a870f39da8201bf0f6dd8171984a89372cff") - version("4.10.1", commit="50ec3f984103882f603d48b1a1dacc489d5361da") - - depends_on("py-setuptools", type=("build", "run")) - depends_on("neuron+python", type=("build", "run")) - - # dependencies from setup.py - depends_on("py-numpy@1.8:", type=("build", "run")) - depends_on("py-matplotlib@3.0.0:", type=("build", "run")) - depends_on("py-cachetools", type=("build", "run")) - depends_on("py-bluepy@2.4.2:2", type=("build", "run")) - depends_on("py-bluepy-configfile@0.1.18:", type=("build", "run")) - depends_on("py-pandas@1.0.0:", type=("build", "run")) - - # skip import test, because bglibpy needs HOC_LIBRARY_PATH - # that could be provided by neurodamus-core - import_modules = [] - - def setup_run_environment(self, env): - env.set("NEURON_INIT_MPI", "0") - env.unset("PMI_RANK") diff --git a/bluebrain/repo-bluebrain/packages/touchdetector/package.py b/bluebrain/repo-bluebrain/packages/touchdetector/package.py index 11667a5d9dd6c1..bb9bdf9092e14c 100644 --- a/bluebrain/repo-bluebrain/packages/touchdetector/package.py +++ b/bluebrain/repo-bluebrain/packages/touchdetector/package.py @@ -18,8 +18,6 @@ class Touchdetector(CMakePackage): version("develop", branch="main") version("7.0.1", tag="v7.0.1") - version("7.0.0", tag="v7.0.0") - version("6.0.3", tag="6.0.3") variant("caliper", default=True, description="Enables profiling with Caliper") variant("asan", default=False, description="Enables AdressSanitizer") @@ -35,61 +33,33 @@ class Touchdetector(CMakePackage): depends_on("benchmark", when="+benchmark") depends_on("caliper@2.8.0:+mpi", when="+caliper") - depends_on("catch2@2", when="@6") - depends_on("catch2@3", when="@7:") + depends_on("catch2@3") depends_on("eigen") depends_on("fmt@:5.999 cxxstd=20") depends_on("intel-oneapi-tbb") depends_on("libsonata@0.1.9: cxxstd=20") - depends_on("morphio@3.3.5:", when="@7:") - depends_on("morpho-kit@0.3.5:", when="@:6.0.3") + depends_on("morphio@3.3.5:") depends_on("nlohmann-json") - depends_on("pugixml", when="@4.5:6") - depends_on("random123", when="@5.3.3:") - depends_on("range-v3@:0.10", when="@5.3.3:") - depends_on("yaml-cpp", when="@7:") + depends_on("random123") + depends_on("range-v3@:0.10") + depends_on("yaml-cpp") depends_on("mvapich2", when="+asan@5.7.0:") depends_on("mvapich2", when="+ubsan@5.7.0:") - depends_on("highfive+mpi", when="@7:") - - def patch(self): - if self.spec.satisfies("@5.6.1"): - filter_file( - r"(int messageLength) = -1;$", - r"\1 = 0;", - "touchdetector/DistributedTouchDetector.cxx", - ) + depends_on("highfive+mpi") def cmake_args(self): - args = [] - - if self.spec.satisfies("@:5.6.1"): - args += [ - self.define("CMAKE_C_COMPILER", self.spec["mpi"].mpicc), - self.define("CMAKE_CXX_COMPILER", self.spec["mpi"].mpicxx), - ] - - if self.spec.satisfies("@5.7.0:"): - use_tests = self.spec.satisfies("@develop") or "+test" in self.spec - args += [ - self.define_from_variant("ENABLE_CALIPER", "caliper"), - self.define_from_variant("ENABLE_ASAN", "asan"), - self.define_from_variant("ENABLE_UBSAN", "ubsan"), - self.define_from_variant("ENABLE_BENCHMARKS", "benchmark"), - self.define("ENABLE_TESTS", use_tests), - ] - - if "+clang-tidy" in self.spec: - self.args.append(self.define("CMAKE_CXX_CLANG_TIDY", "clang-tidy")) + use_tests = self.spec.satisfies("@develop") or "+test" in self.spec + args = [ + self.define_from_variant("ENABLE_CALIPER", "caliper"), + self.define_from_variant("ENABLE_ASAN", "asan"), + self.define_from_variant("ENABLE_UBSAN", "ubsan"), + self.define_from_variant("ENABLE_BENCHMARKS", "benchmark"), + self.define("ENABLE_TESTS", use_tests), + ] + + if "+clang-tidy" in self.spec: + self.args.append(self.define("CMAKE_CXX_CLANG_TIDY", "clang-tidy")) return args - - def setup_build_environment(self, env): - # The default CMAKE_PREFIX_PATH may not contain the necessary symlink to the TBB - # CMake glue, set it ourselves. - # - # This conditional needs to be removed in 2023 with a new deployment. - if "tbb" in self.spec and hasattr(self.spec["tbb"].package, "component_prefix"): - env.prepend_path("CMAKE_PREFIX_PATH", self.spec["tbb"].package.component_prefix)