From da4f7c2952e4dcc9f0581db2fac43da13b0bcb47 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 17 Nov 2024 21:32:24 +0100 Subject: Add an audit to prevent using the name "all" in packages (#47651) Packages cannot be named like that, since we use "all" to indicate default settings under the "packages" section of the configuration. --- .../repos/builtin/packages/all-library/package.py | 48 ++++++++++++++++++++++ var/spack/repos/builtin/packages/all/package.py | 48 ---------------------- var/spack/repos/builtin/packages/cabana/package.py | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 var/spack/repos/builtin/packages/all-library/package.py delete mode 100644 var/spack/repos/builtin/packages/all/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/all-library/package.py b/var/spack/repos/builtin/packages/all-library/package.py new file mode 100644 index 0000000000..8841584194 --- /dev/null +++ b/var/spack/repos/builtin/packages/all-library/package.py @@ -0,0 +1,48 @@ +# 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 * + + +class AllLibrary(CMakePackage): + """A Load Balancing Library (ALL) + + The library aims to provide an easy way to include dynamic domain-based + load balancing into particle based simulation codes. + """ + + homepage = "http://slms.pages.jsc.fz-juelich.de/websites/all-website/" + url = "https://gitlab.jsc.fz-juelich.de/SLMS/loadbalancing/-/archive/v0.9.2/loadbalancing-v0.9.2.tar.gz" + + maintainers("junghans") + + license("BSD-3-Clause", checked_by="junghans") + + version("0.9.2", sha256="2b4ef52c604c3c0c467712d0912a33c82177610b67edc14df1e034779c6ddb71") + + variant("fortran", default=False, description="Build with fortran support") + variant("shared", default=True, description="Build shared libraries") + variant("vtk", default=False, description="Build with vtk support") + + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build", when="+fortran") + depends_on("vtk", when="+vtk") + + depends_on("mpi") + + def cmake_args(self): + args = [ + self.define_from_variant("BUILD_SHARED_LIBS", "shared"), + self.define_from_variant("CM_ALL_FORTRAN", "fortran"), + self.define_from_variant("CM_ALL_USE_F08", "fortran"), + self.define_from_variant("CM_ALL_VTK_OUTPUT", "vtk"), + ] + + if self.run_tests: + args.append("-DCM_ALL_TESTS=ON") + args.append("-DCM_ALL_TESTS_INTEGRATION=ON") + + return args diff --git a/var/spack/repos/builtin/packages/all/package.py b/var/spack/repos/builtin/packages/all/package.py deleted file mode 100644 index c30254cc95..0000000000 --- a/var/spack/repos/builtin/packages/all/package.py +++ /dev/null @@ -1,48 +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 * - - -class All(CMakePackage): - """A Load Balancing Library (ALL) - - The library aims to provide an easy way to include dynamic domain-based - load balancing into particle based simulation codes. - """ - - homepage = "http://slms.pages.jsc.fz-juelich.de/websites/all-website/" - url = "https://gitlab.jsc.fz-juelich.de/SLMS/loadbalancing/-/archive/v0.9.2/loadbalancing-v0.9.2.tar.gz" - - maintainers("junghans") - - license("BSD-3-Clause", checked_by="junghans") - - version("0.9.2", sha256="2b4ef52c604c3c0c467712d0912a33c82177610b67edc14df1e034779c6ddb71") - - variant("fortran", default=False, description="Build with fortran support") - variant("shared", default=True, description="Build shared libraries") - variant("vtk", default=False, description="Build with vtk support") - - depends_on("c", type="build") - depends_on("cxx", type="build") - depends_on("fortran", type="build", when="+fortran") - depends_on("vtk", when="+vtk") - - depends_on("mpi") - - def cmake_args(self): - args = [ - self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - self.define_from_variant("CM_ALL_FORTRAN", "fortran"), - self.define_from_variant("CM_ALL_USE_F08", "fortran"), - self.define_from_variant("CM_ALL_VTK_OUTPUT", "vtk"), - ] - - if self.run_tests: - args.append("-DCM_ALL_TESTS=ON") - args.append("-DCM_ALL_TESTS_INTEGRATION=ON") - - return args diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index 42852dc123..3905b30b29 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -93,7 +93,7 @@ class Cabana(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos+cuda_lambda@4.1:", when="+cuda@0.7:") # Dependencies for subpackages - depends_on("all", when="@0.5.0:+all") + depends_on("all-library", when="@0.5.0:+all") depends_on("arborx", when="@0.3.0:+arborx") depends_on("hypre-cmake@2.22.0:", when="@0.4.0:+hypre") depends_on("hypre-cmake@2.22.1:", when="@0.5.0:+hypre") -- cgit v1.2.3-70-g09d2