diff --git a/var/spack/repos/builtin/packages/conquest/package.py b/var/spack/repos/builtin/packages/conquest/package.py index ed4df2829f7..5a1208acc8f 100644 --- a/var/spack/repos/builtin/packages/conquest/package.py +++ b/var/spack/repos/builtin/packages/conquest/package.py @@ -75,7 +75,7 @@ def edit(self, spec, prefix): lapack_ld = self.spec["lapack"].libs.ld_flags blas_ld = self.spec["blas"].libs.ld_flags - fftw_ld = self.spec["fftw"].libs.ld_flags + fftw_ld = self.spec["fftw-api"].libs.ld_flags libxc_ld = self.spec["libxc"].libs.ld_flags # Starting from 1.3 there's automated logic in the Makefile that picks diff --git a/var/spack/repos/builtin/packages/cutlass/package.py b/var/spack/repos/builtin/packages/cutlass/package.py index 0a59aaefc95..b2196eb41d9 100644 --- a/var/spack/repos/builtin/packages/cutlass/package.py +++ b/var/spack/repos/builtin/packages/cutlass/package.py @@ -14,6 +14,13 @@ class Cutlass(CMakePackage, CudaPackage): version("main", branch="main") version("master", branch="master") + version("3.9.1", sha256="7ffed3d7363a485c7d8ade63b3944c0a1e3e4cf2f22007f6d1cc3849c96bdc88") + version("3.9.0", sha256="0ea98a598d1f77fade5187ff6ec6d9e6ef3acd267ee68850aae6e800dcbd69c7") + version("3.8.0", sha256="14a5e6314f23e41295d8377b6fa6028b35392757a0ee4538a4eacaaa5d7eee37") + version("3.7.0", sha256="dfcafb7435a1b114ce32faee4f3257e276caf08f55fea04fa8bf3efa3a83c814") + version("3.6.0", sha256="7576f3437b90d0de5923560ccecebaa1357e5d72f36c0a59ad77c959c9790010") + version("3.5.1", sha256="20b7247cda2d257cbf8ba59ba3ca40a9211c4da61a9c9913e32b33a2c5883a36") + version("3.5.0", sha256="ef6af8526e3ad04f9827f35ee57eec555d09447f70a0ad0cf684a2e426ccbcb6") version("3.4.1", sha256="aebd4f9088bdf2fd640d65835de30788a6c7d3615532fcbdbc626ec3754becd4") version("3.4.0", sha256="49f4b854acc2a520126ceefe4f701cfe8c2b039045873e311b1f10a8ca5d5de1") version("3.3.0", sha256="99876de94a04d0b9cdee81d4f29659bde1426b416926aef4d9a3a3a7869511a3") diff --git a/var/spack/repos/builtin/packages/dlb/package.py b/var/spack/repos/builtin/packages/dlb/package.py index 328744899f2..af0d6286bda 100644 --- a/var/spack/repos/builtin/packages/dlb/package.py +++ b/var/spack/repos/builtin/packages/dlb/package.py @@ -21,6 +21,8 @@ class Dlb(AutotoolsPackage): license("LGPL-3.0-or-later") version("main", branch="main") + version("3.5.2", sha256="ec81284f77aa07c1589a91f75ed1c88501beb6c8340f5bcad603c210f5c446d4") + version("3.5.1", sha256="32ec884c90220478f9873bf37eb11b536bfc3739d108ba6b29edefb651a10c34") version("3.5.0", sha256="df7fe979059998c2199dc4ee3775d623287fcce728be07e2f6657da2314daf6b") version("3.4.1", sha256="7c071b75c126f8e77c1a30369348751624d5636edcbd663bf3d41fa04733c894") version("3.4", sha256="6091d032c11a094a3ce0bec11c0a164783fdff83cb4ec870c9d8e192410c353a") diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index ed7fc1f0a06..ac9df33201a 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -38,6 +38,7 @@ class Hipsycl(CMakePackage, ROCmPackage): variant("cuda", default=False, description="Enable CUDA backend for SYCL kernels") variant("rocm", default=False, description="Enable ROCM backend for SYCL kernels") + depends_on("c", type="build") depends_on("cxx", type="build") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 6a684a0e40c..b6579c77884 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -16,7 +16,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): homepage = "https://icl.utk.edu/magma/" git = "https://github.com/icl-utk-edu/magma" url = "https://icl.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz" - maintainers("stomov", "luszczek", "G-Ragghianti") + maintainers("luszczek", "G-Ragghianti") tags = ["e4s"] @@ -53,29 +53,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): depends_on("cuda@8:", when="@2.5.1: +cuda") # See PR #14471 depends_on("hipblas", when="+rocm") depends_on("hipsparse", when="+rocm") - # This ensures that rocm-core matches the hip package version in the case that - # hip is an external package. - for ver in [ - "5.5.0", - "5.5.1", - "5.6.0", - "5.6.1", - "5.7.0", - "5.7.1", - "6.0.0", - "6.0.2", - "6.1.0", - "6.1.1", - "6.1.2", - "6.2.0", - "6.2.1", - "6.2.4", - "6.3.0", - "6.3.1", - "6.3.2", - "6.3.3", - ]: - depends_on(f"rocm-core@{ver}", when=f"@2.8.0: +rocm ^hip@{ver}") + depends_on("rocm-core", when="@2.8.0: +rocm") depends_on("python", when="@master", type="build") conflicts("~cuda", when="~rocm", msg="magma: Either CUDA or HIP support must be enabled") @@ -215,7 +193,9 @@ def test_c(self): with working_dir(test_dir): pkg_config_path = self.prefix.lib.pkgconfig with spack.util.environment.set_env(PKG_CONFIG_PATH=pkg_config_path): - make("c") + make = self.spec["gmake"].command + CC = "hipcc" if self.spec.satisfies("+rocm") else self.compiler.cc + make("c", f"CC={CC}") tests = [ ("example_sparse", "sparse solver"), ("example_sparse_operator", "sparse operator"), @@ -239,6 +219,7 @@ def test_fortran(self): with working_dir(test_dir): pkg_config_path = self.prefix.lib.pkgconfig with spack.util.environment.set_env(PKG_CONFIG_PATH=pkg_config_path): + make = self.spec["gmake"].command make("fortran") example_f = which("example_f") example_f() diff --git a/var/spack/repos/builtin/packages/mpl/package.py b/var/spack/repos/builtin/packages/mpl/package.py index d5ee0f9949e..17301036819 100644 --- a/var/spack/repos/builtin/packages/mpl/package.py +++ b/var/spack/repos/builtin/packages/mpl/package.py @@ -10,12 +10,13 @@ class Mpl(CMakePackage): homepage = "https://rabauke.github.io/mpl/html/" git = "https://github.com/rabauke/mpl.git" - url = "https://github.com/rabauke/mpl/archive/refs/tags/v0.3.0.tar.gz" + url = "https://github.com/rabauke/mpl/archive/refs/tags/v0.4.0.tar.gz" maintainers("rabauke") license("BSD-3-Clause") version("develop", branch="master") + version("0.4.0", tag="v0.4.0", commit="a7469769a3e183104594252c45c8026d3d6f87ec") version("0.3.0", tag="v0.3.0", commit="e6bd4926914127f3609a14474aa4a9c4fabbff0b") version("0.2.1", tag="v0.2.1", commit="5bee297b453d7b66a803453bfc6884611a36c4d0") version("0.2.0", tag="v0.2.0", commit="f322352c93627c1b91d8efb1c4ee2e4873aed016") diff --git a/var/spack/repos/builtin/packages/py-pyspice/package.py b/var/spack/repos/builtin/packages/py-pyspice/package.py new file mode 100644 index 00000000000..27a5f0f1538 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyspice/package.py @@ -0,0 +1,29 @@ +# Copyright Spack Project Developers. See COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPyspice(PythonPackage): + """Simulate electronic circuit using Python and the Ngspice / Xyce simulators""" + + homepage = "https://github.com/PySpice-org/PySpice" + pypi = "PySpice/PySpice-1.5.tar.gz" + + maintainers("LydDeb") + + license("GPL-3.0", checked_by="LydDeb") + + version("1.5", sha256="d28448accad98959e0f5932af8736e90a1f3f9ff965121c6881d24cdfca23d22") + + depends_on("c", type="build") + + depends_on("py-setuptools", type="build") + depends_on("py-pyyaml@5.3:", type=("build", "run")) + depends_on("py-cffi@1.14:", type=("build", "run")) + depends_on("py-matplotlib@3.2:", type=("build", "run")) + depends_on("py-numpy@1.18:", type=("build", "run")) + depends_on("py-ply@3.11:", type=("build", "run")) + depends_on("py-scipy@1.4:", type=("build", "run")) + depends_on("py-requests@2.23:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/rmgdft/package.py b/var/spack/repos/builtin/packages/rmgdft/package.py index 6aedd27cfad..95eaf223ccd 100644 --- a/var/spack/repos/builtin/packages/rmgdft/package.py +++ b/var/spack/repos/builtin/packages/rmgdft/package.py @@ -16,6 +16,7 @@ class Rmgdft(CMakePackage, CudaPackage): tags = ["ecp", "ecp-apps"] version("master", branch="master") version("develop", branch="develop") + version("6.2.0", tag="v6.2.0", commit="c00f21741c40aacebf4767adb1f274c52bfc82ea") version("6.1.0", tag="v6.1.0", commit="4dd5862725006b35d3118705197f89f13b24b858") version("5.4.0", tag="v5.4.0", commit="471251b191abb5f6ffdca4333c1fcb2add3c52f2") version("5.3.1", tag="v5.3.1", commit="dd6217ed82a8fe335acd0c030023b539d1be920a") diff --git a/var/spack/repos/builtin/packages/spiner/package.py b/var/spack/repos/builtin/packages/spiner/package.py index 2447b8a62b3..99359a41914 100644 --- a/var/spack/repos/builtin/packages/spiner/package.py +++ b/var/spack/repos/builtin/packages/spiner/package.py @@ -53,6 +53,7 @@ class Spiner(CMakePackage): depends_on("cmake@3.12:", when="@:1.5.1", type="build") depends_on("cmake@3.23:", when="@1.6.0:", type="build") + depends_on("catch2@3.7.1:", when="@1.6.3:", type="test") depends_on("catch2@2.13.4:2.13.9", type="test") depends_on("ports-of-call@1.2.0:", when="@:1.5.1") depends_on("ports-of-call@1.5.1:", when="@1.6.0:")