diff --git a/.ci/env b/.ci/env index 3b04ded95b5..9c6460447c3 100644 --- a/.ci/env +++ b/.ci/env @@ -1,2 +1,2 @@ -SPACK_CHECKOUT_VERSION=06f3ac473591a77e6a623838fc2b164b7c06023b +SPACK_CHECKOUT_VERSION=a429ffcb690fc2098657e6ed14e12ad6af48c928 SPACK_CHECKOUT_REPO=spack/spack diff --git a/.ci/gitlab/.gitlab-ci.yml b/.ci/gitlab/.gitlab-ci.yml index a046a6b2928..0bf91c00a55 100644 --- a/.ci/gitlab/.gitlab-ci.yml +++ b/.ci/gitlab/.gitlab-ci.yml @@ -489,6 +489,28 @@ radiuss-build: SPACK_CI_TARGET: "x86_64_v4" tags: ["spack", "public", "aws", "medium", "x86_64_v4"] +.radiuss-cuda: + variables: + SPACK_CI_STACK_NAME: radiuss-cuda + +radiuss-cuda-generate: + extends: [ ".radiuss-cuda", ".generate-x86_64", ".tags-x86_64_v4" ] + image: + name: ghcr.io/spack/ubuntu-24.04:v2024-09-05-v2 + entrypoint: [''] + +radiuss-cuda-build: + extends: [ ".radiuss-cuda", ".build" ] + trigger: + << : *trigger_build + include: + - artifact: jobs_scratch_dir/radiuss-cuda/cloud-ci-pipeline.yml + job: radiuss-cuda-generate + needs: + - artifacts: True + job: radiuss-cuda-generate + + # Parallel Pipeline for aarch64 (reuses override image, but generates and builds on aarch64) .radiuss-aarch64: @@ -568,7 +590,7 @@ tools-sdk-build: tutorial-generate: extends: [ ".tutorial", ".generate-x86_64"] - image: ghcr.io/spack/tutorial-ubuntu-22.04:main + image: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30 tutorial-build: extends: [ ".tutorial", ".build" ] @@ -581,49 +603,115 @@ tutorial-build: - artifacts: True job: tutorial-generate -################################# -# Machine Learning - Linux x86_64 -################################# -.ml-linux-x86_64: +####################################### +# Machine Learning - Linux x86_64 (CPU) +####################################### +.ml-linux-x86_64-cpu: + variables: + SPACK_CI_STACK_NAME: ml-linux-x86_64-cpu + +ml-linux-x86_64-cpu-generate: + extends: [ ".generate-x86_64", .ml-linux-x86_64-cpu, ".tags-x86_64_v4" ] + image: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + +ml-linux-x86_64-cpu-build: + extends: [ ".build", ".ml-linux-x86_64-cpu" ] + trigger: + << : *trigger_build + include: + - artifact: jobs_scratch_dir/ml-linux-x86_64-cpu/cloud-ci-pipeline.yml + job: ml-linux-x86_64-cpu-generate + needs: + - artifacts: True + job: ml-linux-x86_64-cpu-generate + +######################################## +# Machine Learning - Linux x86_64 (CUDA) +######################################## +.ml-linux-x86_64-cuda: variables: - SPACK_CI_STACK_NAME: ml-linux-x86_64 + SPACK_CI_STACK_NAME: ml-linux-x86_64-cuda -ml-linux-x86_64-generate: - extends: [ ".generate-x86_64", .ml-linux-x86_64, ".tags-x86_64_v4" ] +ml-linux-x86_64-cuda-generate: + extends: [ ".generate-x86_64", .ml-linux-x86_64-cuda, ".tags-x86_64_v4" ] image: ghcr.io/spack/ubuntu-24.04:v2025-09-15 -ml-linux-x86_64-build: - extends: [ ".build", ".ml-linux-x86_64" ] +ml-linux-x86_64-cuda-build: + extends: [ ".build", ".ml-linux-x86_64-cuda" ] trigger: << : *trigger_build include: - - artifact: jobs_scratch_dir/ml-linux-x86_64/cloud-ci-pipeline.yml - job: ml-linux-x86_64-generate + - artifact: jobs_scratch_dir/ml-linux-x86_64-cuda/cloud-ci-pipeline.yml + job: ml-linux-x86_64-cuda-generate needs: - artifacts: True - job: ml-linux-x86_64-generate + job: ml-linux-x86_64-cuda-generate -################################## -# Machine Learning - Linux aarch64 -################################## -.ml-linux-aarch64: +######################################## +# Machine Learning - Linux x86_64 (ROCm) +######################################## +.ml-linux-x86_64-rocm: + variables: + SPACK_CI_STACK_NAME: ml-linux-x86_64-rocm + +ml-linux-x86_64-rocm-generate: + extends: [ ".generate-x86_64", .ml-linux-x86_64-rocm, ".tags-x86_64_v4" ] + image: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + +ml-linux-x86_64-rocm-build: + extends: [ ".build", ".ml-linux-x86_64-rocm" ] + trigger: + << : *trigger_build + include: + - artifact: jobs_scratch_dir/ml-linux-x86_64-rocm/cloud-ci-pipeline.yml + job: ml-linux-x86_64-rocm-generate + needs: + - artifacts: True + job: ml-linux-x86_64-rocm-generate + +######################################## +# Machine Learning - Linux aarch64 (CPU) +######################################## +.ml-linux-aarch64-cpu: + variables: + SPACK_CI_STACK_NAME: ml-linux-aarch64-cpu + +ml-linux-aarch64-cpu-generate: + extends: [ ".generate-aarch64", .ml-linux-aarch64-cpu ] + image: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + +ml-linux-aarch64-cpu-build: + extends: [ ".build", ".ml-linux-aarch64-cpu" ] + trigger: + << : *trigger_build + include: + - artifact: jobs_scratch_dir/ml-linux-aarch64-cpu/cloud-ci-pipeline.yml + job: ml-linux-aarch64-cpu-generate + needs: + - artifacts: True + job: ml-linux-aarch64-cpu-generate + +######################################### +# Machine Learning - Linux aarch64 (CUDA) +######################################### +.ml-linux-aarch64-cuda: variables: - SPACK_CI_STACK_NAME: ml-linux-aarch64 + SPACK_CI_STACK_NAME: ml-linux-aarch64-cuda -ml-linux-aarch64-generate: - extends: [ ".generate-aarch64", .ml-linux-aarch64 ] +ml-linux-aarch64-cuda-generate: + extends: [ ".generate-aarch64", .ml-linux-aarch64-cuda ] image: ghcr.io/spack/ubuntu-24.04:v2025-09-15 -ml-linux-aarch64-build: - extends: [ ".build", ".ml-linux-aarch64" ] +ml-linux-aarch64-cuda-build: + extends: [ ".build", ".ml-linux-aarch64-cuda" ] trigger: << : *trigger_build include: - - artifact: jobs_scratch_dir/ml-linux-aarch64/cloud-ci-pipeline.yml - job: ml-linux-aarch64-generate + - artifact: jobs_scratch_dir/ml-linux-aarch64-cuda/cloud-ci-pipeline.yml + job: ml-linux-aarch64-cuda-generate needs: - artifacts: True - job: ml-linux-aarch64-generate + job: ml-linux-aarch64-cuda-generate ######################################### # Machine Learning - Darwin aarch64 (MPS) diff --git a/.ci/gitlab/configs/linux/ci.yaml b/.ci/gitlab/configs/linux/ci.yaml index 9add0f89153..67d2b921d5c 100644 --- a/.ci/gitlab/configs/linux/ci.yaml +++ b/.ci/gitlab/configs/linux/ci.yaml @@ -13,6 +13,8 @@ ci: - wrf build-job: tags: [ "spack", "huge" ] + # 24h for long ROCm/ML rebuilds; GitLab project/runner max must allow this + timeout: 1440 minutes variables: CI_JOB_SIZE: huge SPACK_BUILD_JOBS: "12" diff --git a/CODEOWNERS b/CODEOWNERS index babfea34faa..1d97e87a2f6 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -24,7 +24,9 @@ /stacks/tools-sdk/ @kwryankrattiger /stacks/tutorial/ @alecbcs @becker33 @tldahlgren @tgamblin /stacks/windows-vis/ @johnwparent @kwryankrattiger @scheibelp -/stacks/radiuss*/ @adrienbernede @davidbeckingsale +/stacks/radiuss/ @adrienbernede @davidbeckingsale +/stacks/radiuss-cuda/ @adrienbernede @davidbeckingsale +/stacks/radiuss-aarch64/ @adrienbernede @davidbeckingsale ### # CI Components maintained by Kitware diff --git a/repos/spack_repo/builtin/packages/acts/package.py b/repos/spack_repo/builtin/packages/acts/package.py index a6c7032ea47..9866c274644 100644 --- a/repos/spack_repo/builtin/packages/acts/package.py +++ b/repos/spack_repo/builtin/packages/acts/package.py @@ -50,7 +50,6 @@ class Acts(CMakePackage, CudaPackage): # Supported Acts versions version("main", branch="main") - version("45.3.0", commit="d1323a298569942d98ff46ee413031ebd604290d") version("45.2.0", commit="c476557b74ccc8369fe1ef2c1f2e27cca4a356b6") version("45.1.1", commit="da50efc7b15cad8fdc5e194719c72d7d8b706823") version("45.1.0", commit="061a9d87b0fc07b554ec0b3849e875cf964f8323") @@ -477,7 +476,6 @@ class Acts(CMakePackage, CudaPackage): depends_on("py-particle @0.24", when="@44:") depends_on("py-pybind11 @2.6.2:", when="+python @18:") depends_on("py-pybind11 @2.13.1:", when="+python @36:") - depends_on("py-pybind11 @3.0.1:", when="+python @45.3:") depends_on("py-pytest", when="+python +unit_tests") depends_on("py-setuptools", when="@44:44.1.0") depends_on("py-sympy @1.13", when="@44:") diff --git a/repos/spack_repo/builtin/packages/amg4psblas/package.py b/repos/spack_repo/builtin/packages/amg4psblas/package.py deleted file mode 100644 index 1f9dcb0a4a2..00000000000 --- a/repos/spack_repo/builtin/packages/amg4psblas/package.py +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.autotools import AutotoolsPackage - -# flake8: noqa: F401,F403 -from spack.package import * - - -class Amg4psblas(AutotoolsPackage): - """AMG4PSBLAS: Algebraic MultiGrid preconditioners for PSBLAS. - Part of the Parallel Sparse Computation Toolkit (PSCToolkit), AMG4PSBLAS provides - advanced preconditioners including Algebraic Multigrid (AMG) and Domain Decomposition - methods for use with the PSBLAS sparse linear system solvers. - """ - - homepage = "https://psctoolkit.github.io/" - git = "https://github.com/sfilippone/amg4psblas.git" - url = "https://github.com/sfilippone/amg4psblas/archive/refs/tags/v1.2.0.tar.gz" - - # List of GitHub accounts to notify when the package is updated. - maintainers("pasquadambra", "cirdans-home", "sfilippone") - - # SPDX identifier of the project's license below. - license("BSD-3-Clause", checked_by="cirdans-home") - - version("develop", branch="development") - version("1.2.0", sha256="971cac9917a84dad97eccef76feb89b5ea66afa0b80d13f45a62dd5685c01878") - version("1.2.0-rc3", sha256="589e23829ea569b984db964b0c40fdf2ae7165290c9118da45b0418514b5cf3a") - - # Variants for third-party libraries - variant("mumps", default=False, description="Activates mumps interface") - variant("umfpack", default=False, description="Activates UMFPACK interface") - variant("superlu", default=False, description="Activates SuperLU interface") - variant("superlu_dist", default=False, description="Activates SuperLU_dist interface") - # Variants for psblas - variant("mpi", default=True, description="Activates MPI support") - variant( - "cuda", - default=False, - description="Activate CUDA support, requires a CUDA-capable psblas with right" - "cudacc flags", - ) - variant("openmp", default=False, description="Activate OpenMP support") - # Additional configure options - variant("ccopt", default="none", description="Additional CCOPT flags") - variant("cxxopt", default="none", description="Additional CXXOPT flags") - variant("fcopt", default="none", description="Additional FCOPT flags") - variant("extra_opt", default="none", description="Additional EXTRA_OPT flags") - variant("libs", default="none", description="Additional link flags") - variant("clibs", default="none", description="Additional CLIBS flags") - variant("flibs", default="none", description="Additional FLIBS flags") - - # Dependencies: - depends_on("c", type="build") - depends_on("cxx", type="build") - depends_on("fortran", type="build") - # psblas - depends_on("psblas@develop", when="@develop") - depends_on("psblas@3.9.0", when="@1.2.0") - depends_on("psblas@3.9.0-rc3", when="@1.2.0-rc3") - depends_on("psblas+mpi", when="+mpi") - depends_on("psblas~mpi", when="~mpi") - depends_on("psblas+cuda", when="+cuda") - depends_on("psblas~cuda", when="~cuda") - depends_on("psblas+openmp", when="+openmp") - depends_on("psblas~openmp", when="~openmp") - # third-party libraries - depends_on("mumps+openmp", when="+openmp+mumps") - depends_on("mumps~openmp", when="~openmp+mumps") - depends_on("superlu", when="+superlu") - depends_on("psblas+metis", when="+superlu") - depends_on("superlu-dist+openmp", when="+openmp+superlu_dist") - depends_on("superlu-dist~openmp", when="~openmp+superlu_dist") - depends_on("suite-sparse", when="+umfpack") - # Conflicts - conflicts("~mpi", when="+mumps", msg="MUMPS requires MPI support") - conflicts("~mpi", when="+superlu_dist", msg="SuperLU_dist requires MPI support") - - def configure_args(self): - args = [f"--prefix={self.prefix}"] - args.append(f"--with-psblas={self.spec['psblas'].prefix}") - # Check external libraries - if "+mumps" in self.spec: - args.append(f"--with-mumpsdir={self.spec['mumps'].prefix}") - args.append(f"--with-mumpsincdir={self.spec['mumps'].prefix.include}") - args.append(f"--with-mumpslibdir={self.spec['mumps'].libs.directories[0]}") - if "+umfpack" in self.spec: - args.append(f"--with-umfpackdir={self.spec['suite-sparse'].prefix}") - args.append(f"--with-umfpackincdir={self.spec['suite-sparse'].prefix.include}") - args.append(f"--with-umfpacklibdir={self.spec['suite-sparse'].libs.directories[0]}") - if "+superlu" in self.spec: - args.append(f"--with-superludir={self.spec['superlu'].prefix}") - args.append(f"--with-superluincdir={self.spec['superlu'].prefix.include}") - args.append(f"--with-superlulibdir={self.spec['superlu'].libs.directories[0]}") - if "+superlu_dist" in self.spec: - args.append(f"--with-superludistdir={self.spec['superlu-dist'].prefix}") - args.append(f"--with-superludistincdir={self.spec['superlu-dist'].prefix.include}") - args.append( - f"--with-superludistlibdir={self.spec['superlu-dist'].libs.directories[0]}" - ) - # All the other options - for opt in ["ccopt", "cxxopt", "fcopt", "extra_opt", "libs", "clibs", "flibs"]: - val = self.spec.variants[opt].value - if val != "none": - args.append(f"--with-{opt.replace('_', '-')}={val}") - return args - - @run_after("install") - def samples(self, spec, prefix): - with working_dir(prefix.samples.advanced.fileread): - make() - with working_dir(prefix.samples.advanced.pdegen): - make() diff --git a/repos/spack_repo/builtin/packages/cargo_c/package.py b/repos/spack_repo/builtin/packages/cargo_c/package.py index 44ce6808d6c..b6441d56787 100644 --- a/repos/spack_repo/builtin/packages/cargo_c/package.py +++ b/repos/spack_repo/builtin/packages/cargo_c/package.py @@ -19,8 +19,5 @@ class CargoC(CargoPackage): version("0.10.17", sha256="a92b752f35e3ef54c992b2ba382466eb58a11020d13e62a25a4101bc055d5146") version("0.10.16", sha256="c0ebb3175393da5b55c3cd83ba1ae9d42d32e2aece6ceff1424239ffb68eb3e3") - depends_on("c", type="build") - - depends_on("openssl") depends_on("rust@1.89:", type="build", when="@0.10.17:") depends_on("rust@1.88:", type="build", when="@0.10.16:") diff --git a/repos/spack_repo/builtin/packages/composable_kernel/package.py b/repos/spack_repo/builtin/packages/composable_kernel/package.py index 7f0ee26aba3..6f21a6373df 100644 --- a/repos/spack_repo/builtin/packages/composable_kernel/package.py +++ b/repos/spack_repo/builtin/packages/composable_kernel/package.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from spack_repo.builtin.build_systems.cmake import CMakePackage, generator +from spack_repo.builtin.build_systems.cmake import CMakePackage from spack_repo.builtin.build_systems.rocm import ROCmPackage from spack.package import * @@ -71,8 +71,6 @@ def url_for_version(self, version): depends_on("pkgconfig", type="build") depends_on("cmake@3.16:", type="build") - generator("ninja") - for ver in [ "7.2.0", "7.1.1", @@ -139,3 +137,11 @@ def cmake_args(self): if self.spec.satisfies("@6.2:"): args.append(self.define("BUILD_DEV", "OFF")) return args + + def build(self, spec, prefix): + with working_dir(self.build_directory): + # only instances is necessary to build and install + if self.spec.satisfies("@5.6.0:"): + make() + else: + make("instances") diff --git a/repos/spack_repo/builtin/packages/eccodes/package.py b/repos/spack_repo/builtin/packages/eccodes/package.py index 0e1eb48107c..8d68e523936 100644 --- a/repos/spack_repo/builtin/packages/eccodes/package.py +++ b/repos/spack_repo/builtin/packages/eccodes/package.py @@ -101,7 +101,7 @@ class Eccodes(CMakePackage): depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated - depends_on("fortran", when="+fortran", type="build") + depends_on("fortran", type="build") # generated depends_on("netcdf-c", when="+netcdf") # Cannot be built with openjpeg@2.0.x. diff --git a/repos/spack_repo/builtin/packages/exodusii/package.py b/repos/spack_repo/builtin/packages/exodusii/package.py index 2c61d053d82..2599af71d57 100644 --- a/repos/spack_repo/builtin/packages/exodusii/package.py +++ b/repos/spack_repo/builtin/packages/exodusii/package.py @@ -31,12 +31,6 @@ class Exodusii(CMakePackage): license("BSD-3-Clause") version("master", branch="master") - version( - "2025-10-14", sha256="d2442cff8ba963cd538f75fb4d7eb50b3f5c75cb01c8603af8185481f25db042" - ) - version( - "2025-08-28", sha256="7a8092dec82af8c5074911ce1d156176948addf7ccf34362c16bba99eff0ee72" - ) version( "2025-08-19", sha256="cdd571a26e77f7a0053c1c5638fed19a111f43f82b8a4c0f7e7b3339dc4cd401" ) @@ -78,7 +72,6 @@ class Exodusii(CMakePackage): variant("shared", default=True, description="Enables the build of shared libraries") variant("mpi", default=True, description="Enables MPI parallelism.") variant("thread_safe", default=False, description="Enable thread-safe exodus library") - variant("tests", default=False, description="Build tests") depends_on("c", type="build") depends_on("cxx", type="build") @@ -123,7 +116,6 @@ def cmake_args(self): from_variant(project_name_base + "_ENABLE_SEACASExodus_for", "fortran"), from_variant(project_name_base + "_ENABLE_SEACASExoIIv2for32", "fortran"), define(project_name_base + "_HIDE_DEPRECATED_CODE", False), - from_variant("BUILD_TESTING", "tests"), from_variant("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "shared"), from_variant("BUILD_SHARED_LIBS", "shared"), from_variant("SEACASExodus_ENABLE_THREADSAFE", "thread_safe"), diff --git a/repos/spack_repo/builtin/packages/fastq_scan/package.py b/repos/spack_repo/builtin/packages/fastq_scan/package.py deleted file mode 100644 index 9336ab8eda7..00000000000 --- a/repos/spack_repo/builtin/packages/fastq_scan/package.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. - -from spack_repo.builtin.build_systems.makefile import MakefilePackage - -from spack.package import * - - -class FastqScan(MakefilePackage): - """Fastq-scan reads a FASTQ from stdin and outputs summary statistics in JSON.""" - - homepage = "https://github.com/rpetit3/fastq-scan" - url = "https://github.com/rpetit3/fastq-scan/archive/refs/tags/v1.0.1.tar.gz" - - maintainers("josue-iac") - - license("MIT") - - version("1.0.1", sha256="b0b781cfac1e0fb90a432151c290f7e79a1af882f643406cc62ec8ec994fdf6d") - version("1.0.0", sha256="3f1157196cf51294b421c640eb67593a059c8cee2f80f5479358c51f88f496c5") - version("0.4.4", sha256="e05779660495b26af51de00562f6c28f2ab32be16794ea223ba82dc78d112ee1") - version("0.4.3", sha256="4d0ff86d746040051f830697c0f793ba039b0a1f5eae6ef641406fe7551cf169") - version("0.4.2", sha256="d991f6978f2fb05363cbf548d2c8396e52503c332e73c5159c2f1cb5228fb249") - version("0.4.1", sha256="5fc4bf0b00da283a709c38c77fe4b30b98567cca9198fbdf033fd7aee2673032") - version("0.4.0", sha256="45ca1fcc824c0abbc057cae190808c56f842b2d565f6ca7f2a4aac6372045c4e") - version("0.3", sha256="e63cc9efa157e5dc65173b0fce1c87a8fdbaf7be2f493b6e1fc40d128510d101") - version("0.2", sha256="0f5235fe6b358b29c7e9330e5db0ae5f25b01ddf6703426d6d8a529503d920cc") - - depends_on("zlib", type=("build", "link")) - - @property - def build_targets(self): - return [f"CXX={self.compiler.cxx}", "all"] - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install("fastq-scan", prefix.bin) - install("README.md", prefix) diff --git a/repos/spack_repo/builtin/packages/file/package.py b/repos/spack_repo/builtin/packages/file/package.py index 671f6421a2b..75c7ca48640 100644 --- a/repos/spack_repo/builtin/packages/file/package.py +++ b/repos/spack_repo/builtin/packages/file/package.py @@ -18,11 +18,8 @@ class File(AutotoolsPackage): maintainers("sethrj") - executables = ["^file$"] - license("BSD-2-Clause") - version("5.46", sha256="c9cc77c7c560c543135edc555af609d5619dbef011997e988ce40a3d75d86088") version("5.45", sha256="fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82") version("5.44", sha256="3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b") version("5.43", sha256="8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991") @@ -33,9 +30,12 @@ class File(AutotoolsPackage): version("5.38", sha256="593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34") version("5.37", sha256="e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f") + executables = ["^file$"] + variant("static", default=True, description="Also build static libraries") - depends_on("c", type="build") + depends_on("c", type="build") # generated + depends_on("bzip2") depends_on("xz", when="@5.38:") depends_on("zlib-api") diff --git a/repos/spack_repo/builtin/packages/garfieldpp/package.py b/repos/spack_repo/builtin/packages/garfieldpp/package.py index 5ce603be591..7b1e8f7fbd7 100644 --- a/repos/spack_repo/builtin/packages/garfieldpp/package.py +++ b/repos/spack_repo/builtin/packages/garfieldpp/package.py @@ -27,8 +27,6 @@ class Garfieldpp(CMakePackage): variant("examples", default=False, description="Build garfield examples") version("master", branch="master") - version("2025.12", sha256="51b66fdd2bada636c4f586a08a1795aadf65de57a387970a5735945bca0bd394") - version("2025.01", sha256="0343aa4a5984ecfc52561c931c844658494afe768fbfedab65e7bfd7a7b503b3") version("5.0", sha256="453e83c2829f57046c471a691e7cd9630650a3c6a696f3be6e86bf2d5159e7b3") version("4.0", sha256="82bc1f0395213bd30a7cd854426e6757d0b4155e99ffd4405355c9648fa5ada3") version("3.0", sha256="c1282427a784658bc38b71c8e8cfc8c9f5202b185f0854d85f7c9c5a747c5406") @@ -41,12 +39,6 @@ class Garfieldpp(CMakePackage): depends_on("gsl") depends_on("geant4", when="+examples") - conflicts( - "^root@6.38:", - when="@:2025.01", - msg="Garfield++ <= 2025.01 is not compatible with ROOT >= 6.38", - ) - def cmake_args(self): args = [ "-DCMAKE_INSTALL_LIBDIR=lib", diff --git a/repos/spack_repo/builtin/packages/ginkgo/package.py b/repos/spack_repo/builtin/packages/ginkgo/package.py index 256e090ffd1..ebde648d335 100644 --- a/repos/spack_repo/builtin/packages/ginkgo/package.py +++ b/repos/spack_repo/builtin/packages/ginkgo/package.py @@ -79,8 +79,6 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi@3.1:", when="+mpi") depends_on("rocthrust", when="+rocm") - # https://github.com/ginkgo-project/ginkgo/issues/1983 - depends_on("rocthrust@:7.1", when="@:1.11 +rocm") depends_on("hipsparse", when="+rocm") depends_on("hipblas", when="+rocm") depends_on("rocrand", when="+rocm") @@ -91,7 +89,8 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): depends_on("rocprim", when="+rocm") depends_on("hip", when="+rocm") depends_on("hwloc@2.1:", when="+hwloc") - depends_on("papi@7.1.0: +sde", when="+sde") + depends_on("papi@master+sde", when="+sde @:1.10.0") + depends_on("papi@7.1.0: +sde", when="+sde @1.11.0:") depends_on("googletest", type="test") depends_on("numactl", type="test", when="+hwloc") diff --git a/repos/spack_repo/builtin/packages/git/package.py b/repos/spack_repo/builtin/packages/git/package.py index beb092deb4d..630f116a216 100644 --- a/repos/spack_repo/builtin/packages/git/package.py +++ b/repos/spack_repo/builtin/packages/git/package.py @@ -18,8 +18,6 @@ class Git(AutotoolsPackage): homepage = "https://git-scm.com" url = "https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.12.0.tar.gz" - git = "https://github.com/git/git.git" - maintainers("jennfshr") tags = ["build-tools"] @@ -28,13 +26,9 @@ class Git(AutotoolsPackage): license("GPL-2.0-only") - sanity_check_is_file = ["bin/git"] - # Every new git release comes with a corresponding manpage resource: # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.gz # https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc - version("master", branch="master") - version("2.53.0", sha256="429dc0f5fe5f14109930cdbbb588c5d6ef5b8528910f0d738040744bebdc6275") version("2.52.0", sha256="6880cb1e737e26f81cf7db9957ab2b5bb2aa1490d87619480b860816e0c10c32") version("2.51.2", sha256="9b44c2b337ec838e10aad42439d390963904449710d30c9e7e4ba449f45da98f") version("2.51.1", sha256="b049d79e6a6cb3d81334bf689af6301f4d4c884191dfae65d2bb314a90384831") @@ -57,7 +51,6 @@ class Git(AutotoolsPackage): depends_on("c", type="build") # generated for _version, _sha256_manpage in { - "2.53.0": "4954390466c125e82dce4a978dd1dadda13a916564d908cfdbd319f2e174a8ae", "2.52.0": "14426e66b5a12c188e44f53f89282bc586b34ebc3a22fafa8eb80d0bbe370f10", "2.51.2": "811aa98750c6d5e4c67848c9991f3d0cbe6cb109da5aefaf4a08c1d760533410", "2.51.1": "7c4568091b95af3a52508be4e988da4fbe194f4f410024d6af3f1af3735e3b08", @@ -110,15 +103,6 @@ class Git(AutotoolsPackage): depends_on("tk", type=("build", "link"), when="+tcltk") depends_on("diffutils", type="build", when="@2.48:") - # v2.53.0 made a lot of improvements to the makefile, but caused a bug with the git - # osxcredentialhelper sub component - # https://lore.kernel.org/git/pull.2046.v4.git.1771551540816.gitgitgadget@gmail.com/ - patch( - "https://github.com/gitgitgadget/git/commit/3e9cc24e68ef311500406ef4d170be30e36e1231.patch?full_index=1", - sha256="67fa97142eed2ab2b0e9385b233254adb4bdf4dd42addf966d6ece3fd2a3c294", - when="@2.53.0 platform=darwin", - ) - @classmethod def determine_version(cls, exe): output = Executable(exe)("--version", output=str, error=str) @@ -190,24 +174,24 @@ def configure_args(self): spec = self.spec configure_args = [ - f"--with-curl={spec['curl'].prefix}", - f"--with-expat={spec['expat'].prefix}", - f"--with-openssl={spec['openssl'].prefix}", - f"--with-zlib={spec['zlib-api'].prefix}", + "--with-curl={0}".format(spec["curl"].prefix), + "--with-expat={0}".format(spec["expat"].prefix), + "--with-openssl={0}".format(spec["openssl"].prefix), + "--with-zlib={0}".format(spec["zlib-api"].prefix), ] if self.spec["iconv"].name == "libiconv": configure_args.append(f"--with-iconv={self.spec['iconv'].prefix}") if self.spec.satisfies("+perl"): - configure_args.append(f"--with-perl={spec['perl'].command.path}") + configure_args.append("--with-perl={0}".format(spec["perl"].command.path)) if self.spec.satisfies("^pcre"): - configure_args.append(f"--with-libpcre={spec['pcre'].prefix}") + configure_args.append("--with-libpcre={0}".format(spec["pcre"].prefix)) if self.spec.satisfies("^pcre2"): - configure_args.append(f"--with-libpcre2={spec['pcre2'].prefix}") + configure_args.append("--with-libpcre2={0}".format(spec["pcre2"].prefix)) if self.spec.satisfies("+tcltk"): - configure_args.append(f"--with-tcltk={self.spec['tk'].prefix.bin.wish}") + configure_args.append("--with-tcltk={0}".format(self.spec["tk"].prefix.bin.wish)) else: configure_args.append("--without-tcltk") @@ -279,8 +263,8 @@ def install_manpages(self): def install_subtree(self): if self.spec.satisfies("+subtree"): with working_dir("contrib/subtree"): - make_args = ["V=1", f"prefix={self.prefix.bin}"] + make_args = ["V=1", "prefix={}".format(self.prefix.bin)] make(" ".join(make_args)) - install_args = ["V=1", f"prefix={self.prefix.bin}", "install"] + install_args = ["V=1", "prefix={}".format(self.prefix.bin), "install"] make(" ".join(install_args)) install("git-subtree", self.prefix.bin) diff --git a/repos/spack_repo/builtin/packages/hipdnn/package.py b/repos/spack_repo/builtin/packages/hipdnn/package.py index 7ad61115abd..d9d92d3d353 100644 --- a/repos/spack_repo/builtin/packages/hipdnn/package.py +++ b/repos/spack_repo/builtin/packages/hipdnn/package.py @@ -23,7 +23,6 @@ class Hipdnn(CMakePackage): license("MIT") - version("7.2.0", sha256="8ad5f4a11f1ed8a7b927f2e65f24083ca6ce902a42021a66a815190a91ccb654") version("7.1.1", sha256="2c00694c6131192354b0e785e4dcb06a302e4b7891ec50ca30927e05ba7b368b") amdgpu_targets = ROCmPackage.amdgpu_targets @@ -47,7 +46,7 @@ class Hipdnn(CMakePackage): depends_on("spdlog") depends_on("googletest") - for ver in ["7.1.1", "7.2.0"]: + for ver in ["7.1.1"]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") @@ -68,13 +67,6 @@ def patch(self): "projects/hipdnn/cmake/ClangToolChain.cmake", string=True, ) - if self.spec.satisfies("@7.2:"): - filter_file( - r"${ROCM_PATH}${DEFAULT_ROCM_LLVM_ROOT}", - self.spec["llvm-amdgpu"].prefix, - "projects/hipdnn/cmake/ClangToolChain.cmake", - string=True, - ) @classmethod def determine_version(cls, lib): @@ -116,12 +108,8 @@ def cmake_args(self): ), self.define("HIP_DNN_SPDLOG_INCLUDE_DIR", "{0}/include".format(spec["spdlog"].prefix)), self.define("HIPDNN_NO_DOWNLOAD", "ON"), - self.define("HIP_DNN_SKIP_TESTS", not self.run_tests), + self.define("HIP_DNN_SKIP_TESTS", "ON"), ] if "auto" not in self.spec.variants["amdgpu_target"]: args.append(self.define_from_variant("GPU_TARGETS", "amdgpu_target")) - if spec.satisfies("@7.2:"): - args.append(self.define("CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT", "OFF")) - args.append(self.define("CMAKE_MAKE_PROGRAM", spec["ninja"].prefix.bin.ninja)) - args.append(self.define("ROCM_LLVM_BIN_DIR", spec["llvm-amdgpu"].prefix.bin)) return args diff --git a/repos/spack_repo/builtin/packages/hwloc/package.py b/repos/spack_repo/builtin/packages/hwloc/package.py index 8c88e5a1350..65ad3db3056 100644 --- a/repos/spack_repo/builtin/packages/hwloc/package.py +++ b/repos/spack_repo/builtin/packages/hwloc/package.py @@ -39,7 +39,6 @@ class Hwloc(AutotoolsPackage, CudaPackage, ROCmPackage): executables = ["^hwloc-bind$"] version("master", branch="master") - version("2.13.0", sha256="1514a5253f0a5c23bc006d3bdd30a6f6125c9a8dc9b5fa4984913d1fff45315d") version("2.12.2", sha256="ff7d309fdff7ceddfe15c1e79eaff25f3126a134f29f44d4e85571f187a6bab8") version("2.11.1", sha256="9f320925cfd0daeaf3a3d724c93e127ecac63750c623654dca0298504aac4c2c") version("2.10.0", sha256="c7fd8a1404a9719c76aadc642864b9f77aed1dc1fc8882d6af861a9260ba240d") @@ -131,13 +130,6 @@ class Hwloc(AutotoolsPackage, CudaPackage, ROCmPackage): depends_on("ncurses ~termlib", when="@2.0:2.2") depends_on("ncurses ~termlib", when="@1.0:1.11.12") - # Removes unnecessary refresh call that fails linking with ^ncurses+termlib - patch( - "https://github.com/open-mpi/hwloc/commit/f7f1f76573ce505dae73568c912d2b2efdbf0f71.patch?full_index=1", - sha256="b4db98b39733435273e57b8229ee834ce50d2785641d1587d8039598752b1a3d", - when="@2.13.0", - ) - # When mpi=openmpi, this introduces an unresolvable dependency. # See https://github.com/spack/spack/issues/15836 for details depends_on("mpi", when="+netloc") diff --git a/repos/spack_repo/builtin/packages/icarus/package.py b/repos/spack_repo/builtin/packages/icarus/package.py index 246848a8dd7..40075883354 100644 --- a/repos/spack_repo/builtin/packages/icarus/package.py +++ b/repos/spack_repo/builtin/packages/icarus/package.py @@ -19,7 +19,6 @@ class Icarus(AutotoolsPackage): license("GPL-2.0-only") version("master", branch="master") - version("13_0", sha256="c897bbfa9848688982c6d5c30529fc29d68df0b9ff22ffa73bad89db73a7ce49") version("12_0", sha256="a68cb1ef7c017ef090ebedb2bc3e39ef90ecc70a3400afb4aa94303bc3beaa7d") version("11_0", sha256="6327fb900e66b46803d928b7ca439409a0dc32731d82143b20387be0833f1c95") version("10_3", commit="453c5465895eaca4a792d18b75e9ec14db6ea50e") diff --git a/repos/spack_repo/builtin/packages/lftp/package.py b/repos/spack_repo/builtin/packages/lftp/package.py index 8e00d9f886f..3c47d2556e0 100644 --- a/repos/spack_repo/builtin/packages/lftp/package.py +++ b/repos/spack_repo/builtin/packages/lftp/package.py @@ -16,14 +16,14 @@ class Lftp(AutotoolsPackage): license("GPL-3.0-or-later") - version("4.9.3", sha256="68116cc184ab660a78a4cef323491e89909e5643b59c7b5f0a14f7c2b20e0a29") version("4.9.2", sha256="a37589c61914073f53c5da0e68bd233b41802509d758a022000e1ae2076da733") version("4.8.1", sha256="6117866215cd889dab30ff73292cd1d35fe0e12a9af5cd76d093500d07ab65a3") version("4.7.7", sha256="7bce216050094a1146ed05bed8fe5b3518224764ffe98884a848d44dc76fff8f") version("4.6.4", sha256="791e783779d3d6b519d0c23155430b9785f2854023eb834c716f5ba78873b15a") - depends_on("c", type="build") - depends_on("cxx", type="build") + depends_on("c", type="build") # generated + depends_on("cxx", type="build") # generated + depends_on("expat") depends_on("gettext") depends_on("iconv") diff --git a/repos/spack_repo/builtin/packages/libcxi/package.py b/repos/spack_repo/builtin/packages/libcxi/package.py index 5ce229a34c1..c7b7191c7a8 100644 --- a/repos/spack_repo/builtin/packages/libcxi/package.py +++ b/repos/spack_repo/builtin/packages/libcxi/package.py @@ -17,7 +17,6 @@ class Libcxi(AutotoolsPackage): license("LGPL-2.1-or-later or BSD-3-Clause") version("main", branch="main") - version("13.1.0", tag="release/shs-13.1.0") version("13.0.0", tag="release/shs-13.0.0") version("12.0.1", tag="release/shs-12.0.1") version("12.0.0", tag="release/shs-12.0.0") diff --git a/repos/spack_repo/builtin/packages/libmesh/package.py b/repos/spack_repo/builtin/packages/libmesh/package.py index 9c001ce5d7c..3f27ddc4703 100644 --- a/repos/spack_repo/builtin/packages/libmesh/package.py +++ b/repos/spack_repo/builtin/packages/libmesh/package.py @@ -21,13 +21,11 @@ class Libmesh(AutotoolsPackage): version("master", branch="master", submodules=True) - version("1.8.4", sha256="2f904d27b763670df74e410de8e7d3e73fb17d52d06e57b32f42e44fd61cd1e6") version("1.7.6", sha256="65093cc97227193241f78647ec2f04a1852437f40d3d1c49285c6ff712cd0bc8") version("1.7.5", sha256="03a50cb471e7724a46623f0892cf77152f969d9ba89f8fcebd20bdc0845aab83") version("1.7.4", sha256="0d603aacd2761292dff61ff7ce59d9fddd8691133f0219f7d1576bd4626b77b2") version("1.7.3", sha256="fe0bec45a083ddd9e87dc51ab7e68039f3859e7ef0c4a87e76e562b172b6f739") version("1.7.1", sha256="0387d62773cf92356eb128ba92f767e56c298d78f4b97446e68bf288da1eb6b4") - version("1.5.3", sha256="836d5e1de00436a02d8986f2e73b16171167569f062c706080a902c565e9d514") version("1.4.1", sha256="67eb7d5a9c954d891ca1386b70f138333a87a141d9c44213449ca6be69a66414") version("1.4.0", sha256="62d7fce89096c950d1b38908484856ea63df57754b64cde6582e7ac407c8c81d") version("1.3.1", sha256="638cf30d05c249315760f16cbae4804964db8857a04d5e640f37617bef17ab0f") @@ -45,9 +43,7 @@ class Libmesh(AutotoolsPackage): variant( "exodusii", default=False, description="Compile with the bundled ExodusII output library" ) - variant( - "vtk", default=False, when="+mpi", description="Compile with VTK input/output library" - ) + variant("vtk", default=False, description="Compile with VTK input/output library") variant( "fparser", default=False, @@ -130,7 +126,6 @@ class Libmesh(AutotoolsPackage): multi=False, ) variant("shared", default=True, description="Enables the build of shared libraries") - variant("poly2tri", default=False, description="Enable poly2tri library support") conflicts( "+metaphysicl", @@ -143,7 +138,6 @@ class Libmesh(AutotoolsPackage): depends_on("c", type="build") depends_on("cxx", type="build") depends_on("fortran", type="build") - depends_on("m4", type="build") depends_on("boost", when="+boost") @@ -162,7 +156,7 @@ class Libmesh(AutotoolsPackage): depends_on("slepc", when="+slepc") depends_on("petsc", when="+petsc") depends_on("tbb", when="threads=tbb") - depends_on("vtk+mpi", when="+vtk") + depends_on("vtk", when="+vtk") def configure_args(self): options = [] @@ -230,8 +224,8 @@ def configure_args(self): options.append("--enable-netcdf=no") if self.spec.satisfies("+vtk"): - options.append("--enable-vtk-required") - options.append(f"VTK_DIR={self.spec['vtk'].prefix}") + options.append("--enable-vtk") + options.append("--with-vtk=%s" % self.spec["vtk"].prefix) else: options.append("--disable-vtk") @@ -280,7 +274,7 @@ def configure_args(self): options.append("--disable-metis") if self.spec.satisfies("+petsc") or self.spec.satisfies("+slepc"): - options.append("--enable-petsc-required") + options.append("--enable-petsc=yes") options.append("PETSC_DIR=%s" % self.spec["petsc"].prefix) else: options.append("--enable-petsc=no") @@ -331,8 +325,6 @@ def configure_args(self): else: options.append("--enable-tbb=no") - options += self.enable_or_disable("poly2tri") - return options def setup_dependent_build_environment( diff --git a/repos/spack_repo/builtin/packages/libmetatomic_torch/package.py b/repos/spack_repo/builtin/packages/libmetatomic_torch/package.py index 2c2a7ec5e20..13dc8c5c4b0 100644 --- a/repos/spack_repo/builtin/packages/libmetatomic_torch/package.py +++ b/repos/spack_repo/builtin/packages/libmetatomic_torch/package.py @@ -17,8 +17,6 @@ class LibmetatomicTorch(CMakePackage): maintainers("HaoZeke", "Luthaf", "RMeli") license("BSD-3-Clause", checked_by="HaoZeke") - version("0.1.10", sha256="c75b1a58fcc37ccef942d2457bfaa98d32a6b985202dec3d90e2b86d5bf66ecf") - # 0.1.9 is skipped because it is partially broken version("0.1.8", sha256="358e426e762a45b3def076183bf6e1ecadbbd9089a9d6ddc5576907dbf5594fd") version("0.1.7", sha256="726f5711b70c4b8cc80d9bc6c3ce6f3449f31d20acc644ab68dab083aa4ea572") version("0.1.6", sha256="4cb9b7bb530a98119186167c31fb00ea7ef3bcc45d593e449e7670e9313e5327") diff --git a/repos/spack_repo/builtin/packages/libxcrypt/package.py b/repos/spack_repo/builtin/packages/libxcrypt/package.py index a89be701199..5daa4ba4a7b 100644 --- a/repos/spack_repo/builtin/packages/libxcrypt/package.py +++ b/repos/spack_repo/builtin/packages/libxcrypt/package.py @@ -12,14 +12,11 @@ class Libxcrypt(AutotoolsPackage): homepage = "https://github.com/besser82/libxcrypt" url = "https://github.com/besser82/libxcrypt/releases/download/v4.4.30/libxcrypt-4.4.30.tar.xz" - tags = ["build-tools"] - maintainers("haampie") license("LGPL-2.1-or-later") - version("4.5.2", sha256="71513a31c01a428bccd5367a32fd95f115d6dac50fb5b60c779d5c7942aec071") version("4.4.38", sha256="80304b9c306ea799327f01d9a7549bdb28317789182631f1b54f4511b4206dd6") # 4.4.37 requires pkg-config and is not included here version("4.4.36", sha256="e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943") @@ -29,7 +26,8 @@ class Libxcrypt(AutotoolsPackage): patch("truncating-conversion.patch", when="@4.4.30") - depends_on("c", type="build") + depends_on("c", type="build") # generated + # Some distros have incomplete perl installs, +open catches that. depends_on("perl@5.14:+open", type="build") diff --git a/repos/spack_repo/builtin/packages/libxslt/package.py b/repos/spack_repo/builtin/packages/libxslt/package.py index c0922e46f84..3fca2afa5ff 100644 --- a/repos/spack_repo/builtin/packages/libxslt/package.py +++ b/repos/spack_repo/builtin/packages/libxslt/package.py @@ -45,7 +45,6 @@ class Libxslt(CMakePackage, AutotoolsPackage): variant("python", default=False, description="Build Python bindings") depends_on("c", type="build") - depends_on("cmake@3.18:", when="@1.1.38:", type="build") depends_on("pkgconfig", type="build") depends_on("iconv") diff --git a/repos/spack_repo/builtin/packages/linaro_forge/package.py b/repos/spack_repo/builtin/packages/linaro_forge/package.py index c6a39f2090b..42d37af6e62 100644 --- a/repos/spack_repo/builtin/packages/linaro_forge/package.py +++ b/repos/spack_repo/builtin/packages/linaro_forge/package.py @@ -24,9 +24,6 @@ class LinaroForge(Package): maintainers("kenche-linaro") if platform.machine() == "aarch64": - version( - "25.1.2", sha256="4bd7928dae0d9e3f01c6cecc671ad31b957731a1f137c81993b7b20373c5623d" - ) version( "25.1.1", sha256="41595c4e4e0f560d59cd1c70517471d6fe64ee2c1224d1a531cc2d2a2867ad27" ) @@ -128,9 +125,6 @@ class LinaroForge(Package): ) version("23.0", sha256="0962c7e0da0f450cf6daffe1156e1f59e02c9f643df458ec8458527afcde5b4d") elif platform.machine() == "x86_64": - version( - "25.1.2", sha256="277f810b6cb52428a10c3317d07d0887140b8dbe5269485ba6715e23be3b55bb" - ) version( "25.1.1", sha256="a256fdbf57450511969d1c8121c1c45ec55b1212e2608fae2779b15a103819a1" ) diff --git a/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py b/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py index ad7d62b7818..bf79e566800 100644 --- a/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py +++ b/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py @@ -96,8 +96,9 @@ class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage): provides("libllvm@20", when="@7.0:7.1") provides("libllvm@22", when="@7.2") - depends_on("c", type="build") - depends_on("cxx", type="build") + depends_on("c", type="build") # generated + depends_on("cxx", type="build") # generated + depends_on("fortran", type="build") # generated depends_on("cmake@3.13.4:", type="build") depends_on("python", type="build") diff --git a/repos/spack_repo/builtin/packages/lmod/package.py b/repos/spack_repo/builtin/packages/lmod/package.py index 5fdd582f0c9..91c57727758 100644 --- a/repos/spack_repo/builtin/packages/lmod/package.py +++ b/repos/spack_repo/builtin/packages/lmod/package.py @@ -67,7 +67,7 @@ class Lmod(AutotoolsPackage): depends_on("c", type="build") depends_on("pkgconfig", type="build") - depends_on("procps", type="build", when="platform=linux") + depends_on("procps", type="build") depends_on("sed", type="build") depends_on("bc", type="build", when="@8.7.10:") depends_on("tcl", type=("build", "link", "run")) diff --git a/repos/spack_repo/builtin/packages/lua_luafilesystem/package.py b/repos/spack_repo/builtin/packages/lua_luafilesystem/package.py index 6b77896e4af..b80507dd29e 100644 --- a/repos/spack_repo/builtin/packages/lua_luafilesystem/package.py +++ b/repos/spack_repo/builtin/packages/lua_luafilesystem/package.py @@ -28,16 +28,13 @@ def url_for_version(self, version): license("MIT") - version("1.9.0", sha256="1142c1876e999b3e28d1c236bf21ffd9b023018e336ac25120fb5373aade1450") version("1.8.0", sha256="16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495") version("1.7.0-2", sha256="23b4883aeb4fb90b2d0f338659f33a631f9df7a7e67c54115775a77d4ac3cc59") version("1.6.3", sha256="11c7b1fc2e560c0a521246b84e6257138d97dddde5a19e405714dbabcb9436ca") - depends_on("c", type="build") - depends_on("lua-lang@:5.5", when="@1.9:") - depends_on("lua-lang@:5.4", when="@1.8") - depends_on("lua-lang@:5.3", when="@1.6.3:1.7") - depends_on("lua-lang@5.1:") + depends_on("c", type="build") # generated + + depends_on("lua-lang@:5.3", when="@:1.7") class LuaBuilder(lua.LuaBuilder): diff --git a/repos/spack_repo/builtin/packages/lua_luaposix/package.py b/repos/spack_repo/builtin/packages/lua_luaposix/package.py index dff1889fb16..f44ce25458f 100644 --- a/repos/spack_repo/builtin/packages/lua_luaposix/package.py +++ b/repos/spack_repo/builtin/packages/lua_luaposix/package.py @@ -8,28 +8,23 @@ class LuaLuaposix(LuaPackage): - """Lua POSIX bindings, including ncurses""" + """Lua posix bindings, including ncurses""" - homepage = "https://github.com/luaposix/luaposix" - url = "https://github.com/luaposix/luaposix/archive/refs/tags/v36.3.tar.gz" + homepage = "https://github.com/luaposix/luaposix/" + url = "https://github.com/luaposix/luaposix/archive/release-v33.4.0.tar.gz" license("MIT") - version("36.3", sha256="82cd9a96c41a4a3205c050206f0564ff4456f773a8f9ffc9235ff8f1907ca5e6") + version( + "35.0", + sha256="a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809", + url="https://github.com/luaposix/luaposix/archive/refs/tags/v35.0.tar.gz", + ) version("36.1", sha256="5e48e8ea5adfd8958bcdbaba132f5766473afedecc5c14ae3593464a5463a616") - version("35.0", sha256="a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809") version("33.4.0", sha256="e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21") version("33.2.1", sha256="4fb34dfea67f4cf3194cdecc6614c9aea67edc3c4093d34137669ea869c358e1") - def url_for_version(self, version): - if version >= Version("35.0"): - return f"https://github.com/luaposix/luaposix/archive/refs/tags/v{version}.tar.gz" - return f"https://github.com/luaposix/luaposix/archive/release-v{version}.tar.gz" - depends_on("c", type="build") - depends_on("lua-lang@:5.4", when="@35.0:") - depends_on("lua-lang@:5.3", when="@33.2:34") - depends_on("lua-lang@:5.2", when="@:33.1") - depends_on("lua-lang@5.1:") - depends_on("lua-bit32", when="^lua-lang@5.1") + depends_on("libxcrypt", when="platform=linux") + depends_on("lua-bit32", when="^lua-lang@5.1") diff --git a/repos/spack_repo/builtin/packages/memtailor/package.py b/repos/spack_repo/builtin/packages/memtailor/package.py index fea64946626..c93d7b09710 100644 --- a/repos/spack_repo/builtin/packages/memtailor/package.py +++ b/repos/spack_repo/builtin/packages/memtailor/package.py @@ -24,7 +24,6 @@ class Memtailor(AutotoolsPackage): license("BSD-3-Clause", checked_by="d-torrance") - version("1.3", sha256="10f0c016e67912be1711a54b18c54d7024c8bfcaf0f279e11187402994150a20") version("1.2", sha256="86cd8f888d23f53256937b47cebe8430daeb8146ca9816c4d3aef0fc5ebc702b") version("1.1", sha256="ce0dc2e5befd1e1f65c99510bc68ddc5b60f13066eac12ec5ce4e1da822e44eb") version("1.0.2025.05.13", commit="07c84a6852212495182ec32c3bdb589579e342b5") diff --git a/repos/spack_repo/builtin/packages/nim/package.py b/repos/spack_repo/builtin/packages/nim/package.py index 558c61a2c59..b4be17db281 100644 --- a/repos/spack_repo/builtin/packages/nim/package.py +++ b/repos/spack_repo/builtin/packages/nim/package.py @@ -16,7 +16,7 @@ class Nim(Package): """ homepage = "https://nim-lang.org/" - url = "https://nim-lang.org/download/nim-2.2.8.tar.xz" + url = "https://nim-lang.org/download/nim-2.2.6.tar.xz" git = "https://github.com/nim-lang/Nim.git" license("MIT", checked_by="Buldram") @@ -24,7 +24,6 @@ class Nim(Package): maintainers("Buldram") version("develop", branch="devel") - version("2.2.8", sha256="114191afa083c5059dcbe5ce88dbe4f42542cff04e2c3017668ee438bc0b8cfc") version("2.2.6", sha256="657b0e3d5def788148d2a87fa6123fa755b2d92cad31ef60fd261e451785528b") version("2.2.4", sha256="f82b419750fcce561f3f897a0486b180186845d76fb5d99f248ce166108189c7") version("2.2.2", sha256="7fcc9b87ac9c0ba5a489fdc26e2d8480ce96a3ca622100d6267ef92135fd8a1f") diff --git a/repos/spack_repo/builtin/packages/openfpgaloader/package.py b/repos/spack_repo/builtin/packages/openfpgaloader/package.py index 65e2de194e6..0fd8d1a138a 100644 --- a/repos/spack_repo/builtin/packages/openfpgaloader/package.py +++ b/repos/spack_repo/builtin/packages/openfpgaloader/package.py @@ -23,7 +23,6 @@ class Openfpgaloader(CMakePackage): license("Apache-2.0 OR MIT") version("master", branch="master") - version("1.1.0", sha256="d2d3da194e3e578ce81f1156f85c128eb6021b73b0c67bbeec9cd5d8bea35fda") version("1.0.0", sha256="cf19b596e5dea21891b1be3cb9a04be7a1501926ee0919dcc5c9f1b6d3bd0a96") version("0.13.1", sha256="372f1942dec8a088bc7475f94ccf5a86264cb74e9154d8a162b8d4d26d3971e3") version("0.12.1", sha256="8fb2d1aa3a0de50222f6286c47220a5bc7b73708b60fb7d58f764deebd43d82d") diff --git a/repos/spack_repo/builtin/packages/openmpi/package.py b/repos/spack_repo/builtin/packages/openmpi/package.py index 1cc580c21b8..355a7a2b9b3 100644 --- a/repos/spack_repo/builtin/packages/openmpi/package.py +++ b/repos/spack_repo/builtin/packages/openmpi/package.py @@ -76,9 +76,6 @@ class Openmpi(AutotoolsPackage, CudaPackage, ROCmPackage): version("main", branch="main", submodules=True) # Current - version( - "5.0.10", sha256="0acecc4fc218e5debdbcb8a41d182c6b0f1d29393015ed763b2a91d5d7374cc6" - ) # libmpi.so.40.40.7 version( "5.0.9", sha256="dfb72762531170847af3e4a0f21d77d7b23cf36f67ce7ce9033659273677d80b" ) # libmpi.so.40.40.7 diff --git a/repos/spack_repo/builtin/packages/openvdb/package.py b/repos/spack_repo/builtin/packages/openvdb/package.py index 137277b2b68..d80c173179b 100644 --- a/repos/spack_repo/builtin/packages/openvdb/package.py +++ b/repos/spack_repo/builtin/packages/openvdb/package.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -import shutil +import sys from spack_repo.builtin.build_systems.cmake import CMakePackage @@ -14,15 +14,15 @@ class Openvdb(CMakePackage): """OpenVDB - a sparse volume data format.""" homepage = "https://github.com/AcademySoftwareFoundation/openvdb" - url = "https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v13.0.0.tar.gz" + url = "https://github.com/AcademySoftwareFoundation/openvdb/archive/v10.0.0.tar.gz" git = "https://github.com/AcademySoftwareFoundation/openvdb.git" - license("MPL-2.0") # Github account name for drew@lagrangian.xyz maintainers("eloop") - version("master", branch="master") - version("13.0.0", sha256="4d6a91df5f347017496fe8d22c3dbb7c4b5d7289499d4eb4d53dd2c75bb454e1") + license("MPL-2.0") + + version("develop", branch="develop") version("10.0.0", sha256="6d4f6b5ccd0f9d35a4886d9a51a98c97fa314f75bf9737c5121e91b706e2db70") version("9.1.0", sha256="914ee417b4607c75c95b53bc73a0599de4157c7d6a32e849e80f24e40fb64181") version("8.2.0", sha256="d2e77a0720db79e9c44830423bdb013c24a1cf50994dd61d570b6e0c3e0be699") @@ -35,129 +35,61 @@ class Openvdb(CMakePackage): variant("vdb_print", default=False, description="Build the vdb_print tool.") variant("vdb_lod", default=False, description="Build the vdb_lod tool.") variant("vdb_render", default=False, description="Build the vdb_render tool.") - # variant("ax", default=False, description="Build the AX extension.") - - depends_on("cxx", type="build") - depends_on("cmake@3.18:", type="build") # VDB 10+ needed newer cmake. - depends_on("cmake@3.24:", type="build", when="@13:") - depends_on("git", type="build", when="@develop") - - depends_on("ilmbase", when="@8:9") # note: ilmbase has been rolled into OpenEXR 3 - depends_on("imath@3.1:", when="@13:") + variant("ax", default=False, description="Build the AX extension (untested).") - depends_on("openexr") - depends_on("openexr@2.3", when="@8:9") - depends_on("openexr@2.3:", when="@10") - depends_on("openexr@3.2:", when="@13:") + depends_on("cxx", type="build") # generated - depends_on("intel-tbb") + depends_on("ilmbase", when="@8:9") + depends_on("ilmbase@2.3:3.1", when="@10:") + depends_on("openexr", when="@8:9") + depends_on("openexr@2.3:3.1", when="@10:") depends_on("intel-tbb@:2020.1", when="@:8.1") - depends_on("intel-tbb@2021", when="@8.2:10") - depends_on("intel-tbb@2021:", when="@13:") - - depends_on("jemalloc") + depends_on("intel-tbb@2021", when="@8.2:") depends_on("zlib-api") - depends_on("c-blosc@1.17:") - - depends_on("boost+iostreams+system@1.82:", type=("build", "link"), when="@:10") - depends_on("boost+iostreams@1.82:", type=("build", "link"), when="@13:") - - with when("+python"): - extends("python") - depends_on("py-numpy", type=("build", "link")) - with when("@13:"): - depends_on("python@3.11", type=("build", "link")) - depends_on("py-nanobind", type=("build")) - with when("@:10"): - depends_on("python@3.10", type=("build", "link")) - # pre py-nanobind they used boost python - depends_on("boost+python+numpy") - - # This section still not ready for prime time. Seems to be very - # picky on particular versions of llmv.. AX requires quite a few - # things, and hasn't been properly released - # depends_on("llvm@18.1.8", when="+ax") - # depends_on("bison@3.7.0:", when="+ax") - # depends_on("flex@2.6.4:", when="+ax") + depends_on("c-blosc@1.17.0") # depends_on('c-blosc@1.5:') + depends_on("py-numpy", when="+python") + depends_on("boost+iostreams+system+python+numpy", when="+python") + depends_on("boost+iostreams+system", when="~python") + extends("python", when="+python") + + # AX requires quite a few things, and hasn't been properly released + # yet. I've only managed to build llvm@8.0.1 under centos8. It + # looks like the next version of OpenVDB will support llvm@12.0.0. + depends_on("llvm@8.0.1", when="+ax") + depends_on("bison", when="+ax") + depends_on("flex", when="+ax") + depends_on("git", type="build", when="@develop") def cmake_args(self): - args = [ self.define("OPENVDB_BUILD_CORE", True), - # Force the specific Spack-built Boost prefix - self.define("Boost_ROOT", self.spec["boost"].prefix), - self.define("Boost_NO_BOOST_CMAKE", True), - self.define("Boost_NO_SYSTEM_PATHS", True), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("OPENVDB_BUILD_VDB_PRINT", "vdb_print"), self.define_from_variant("OPENVDB_BUILD_VDB_LOD", "vdb_lod"), self.define_from_variant("OPENVDB_BUILD_VDB_RENDER", "vdb_render"), + self.define_from_variant("OPENVDB_BUILD_AX", "ax"), + self.define_from_variant("OPENVDB_BUILD_AX_BINARIES", "ax"), self.define_from_variant("OPENVDB_BUILD_PYTHON_MODULE", "python"), - # AX removed for the time being - # self.define_from_variant("OPENVDB_BUILD_AX", "ax"), - # self.define_from_variant("OPENVDB_BUILD_AX_BINARIES", "ax"), + self.define_from_variant("USE_NUMPY", "python"), ] - - if self.spec.satisfies("+python"): - args.append(self.define("Python3_EXECUTABLE", self.spec["python"].command.path)) - return args + # Before v8.2.0 the python extension is being installed in the + # wrong directory by OpenVDB's cmake, instead it needs to be in + # python_platlib. And for RHEL systems we find the dso in + # lib64/ instead of lib/. @run_after("install") - def fix_python_layout(self): - """Fixes the lib64 vs lib issue for RHEL/Rocky etc""" + def post_install(self): spec = self.spec - if "+python" not in spec: - return - - # Explicitly use string paths for os.path operations - prefix_str = str(self.prefix) - py_ver = spec["python"].version.up_to(2) - target_dir = os.path.join(prefix_str, "lib", f"python{py_ver}", "site-packages") - - # pattern is globally available in Spack DSL - pattern = f"openvdb*.{dso_suffix}" - matches = find(prefix_str, pattern, recursive=True) - - if not matches: - if find(target_dir, pattern, recursive=True): - return - raise InstallError(f"Python extension 'openvdb' not found in {self.prefix}") - - mkdirp(target_dir) - - for src in matches: - # Avoid moving if it's already in the right place - if os.path.normpath(os.path.dirname(src)) == os.path.normpath(target_dir): - continue - - install(src, target_dir) - os.remove(src) - - # Cleanup lib64 remnants - old_path = os.path.join(prefix_str, "lib64", f"python{py_ver}") - if os.path.isdir(old_path): - shutil.rmtree(old_path, ignore_errors=True) - - def test_python_import(self): - """Verify that OpenVDB can create and manipulate a grid.""" - - if "+python" not in self.spec: - return - - python_exe = self.spec["python"].command.path - py = Executable(python_exe) - - # This script creates a FloatGrid, sets a value, and checks it. - # It tests: 1. Import, 2. C++ Binding, 3. Memory Allocation - test_script = ( - "import openvdb as vdb; " - "grid = vdb.FloatGrid(); " - "grid.name = 'test_grid'; " - "accessor = grid.getAccessor(); " - "accessor.setValueOn((0, 0, 0), 1.0); " - "assert grid.activeVoxelCount() == 1; " - "print('OpenVDB Functional Test: PASSED')" - ) - - py("-c", test_script) + if "+python" in spec and spec.satisfies("@:8.0.1"): + if sys.platform == "darwin": + pyso = "pyopenvdb.dylib" + else: + pyso = "pyopenvdb.so" + pyver = f"python{self['python'].version.up_to(2)}" + + src = self.prefix.lib.join(pyver).join(pyso) + if not os.path.isfile(src): + src = self.prefix.lib64.join(pyver).join(pyso) + assert os.path.isfile(src) + os.rename(src, os.path.join(python_platlib, pyso)) diff --git a/repos/spack_repo/builtin/packages/pmix/package.py b/repos/spack_repo/builtin/packages/pmix/package.py index 97ecc0a4384..0ec321d4f87 100644 --- a/repos/spack_repo/builtin/packages/pmix/package.py +++ b/repos/spack_repo/builtin/packages/pmix/package.py @@ -39,10 +39,7 @@ class Pmix(AutotoolsPackage): license("BSD-3-Clause-Open-MPI") version("master", branch="master", submodules=True) - version("6.1.0", sha256="bb9021c8e100a376f5070ecca727f83a29b5f652dfe381793b88daa79a3b98a2") version("6.0.0", sha256="bfe969966d0ce82e032739cac286239bd5ad74a831d7adae013284919f125318") - version("5.0.10", sha256="78663f6b932589d68e24feaf7f8a948d60be68d91965f3effbacb4cd88cf9a95") - version("5.0.9", sha256="38d0667636e35a092e61f97be2dd84481f4cf566bfca11bb73c6b3d5da993b7a") version("5.0.8", sha256="bf5f0a341d0ec7f465627a7570f4dcda3b931bc859256428a35f6c72f13462d0") version("5.0.7", sha256="b9e6ad482fcdcb58c9b9553ae56956b6d7df875d5605b6ecb96adaff16b2b07a") version("5.0.6", sha256="ea51baa0fdee688d54bc9f2c11937671381f00de966233eec6fd88807fb46f83") diff --git a/repos/spack_repo/builtin/packages/procps/package.py b/repos/spack_repo/builtin/packages/procps/package.py index 2dfa618f569..aa0ed6fdf7d 100644 --- a/repos/spack_repo/builtin/packages/procps/package.py +++ b/repos/spack_repo/builtin/packages/procps/package.py @@ -19,7 +19,6 @@ class Procps(AutotoolsPackage): license("GPL-2.0-or-later") version("master", branch="master") - version("4.0.6", sha256="1bbe8ff21dcd05a6adcda99a67d2e99cbd515c9e3a78fd3cc915b12aeb330d40") version("4.0.4", sha256="3214fab0f817d169f2c117842ba635bafb1cd6090273e311a8b5c6fc393ddb9d") version("4.0.3", sha256="14cc21219c45d196772274ea3f194f6d668b6cc667fbde9ee6d8039121b73fa6") version("4.0.2", sha256="b03e4b55eaa5661e726acb714e689356d80bc056b09965c2284d039ba8dc21e8") @@ -32,15 +31,16 @@ class Procps(AutotoolsPackage): variant("nls", default=True, description="Enable Native Language Support.") - depends_on("c", type="build") + depends_on("c", type="build") # generated + depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") depends_on("pkgconfig", type="build") - depends_on("gettext", type="build") # required by autogen.sh depends_on("dejagnu", type="test") depends_on("iconv") + depends_on("gettext", type="build") # required by autogen.sh with when("+nls"): depends_on("gettext") # msgfmt 0.22 gives parsing errors diff --git a/repos/spack_repo/builtin/packages/proj/package.py b/repos/spack_repo/builtin/packages/proj/package.py index acf1518c072..177d5ace255 100644 --- a/repos/spack_repo/builtin/packages/proj/package.py +++ b/repos/spack_repo/builtin/packages/proj/package.py @@ -176,7 +176,7 @@ def cmake_args(self): else: test_flag = "PROJ4_TESTS" args.append(self.define(test_flag, self.pkg.run_tests)) - if self.spec.satisfies("%curl build_system=cmake"): + if self.spec["curl"].satisfies("build_system=cmake"): args.append(self.define("CMAKE_CXX_FLAGS", "-DCURL_STATICLIB")) return args diff --git a/repos/spack_repo/builtin/packages/prrte/package.py b/repos/spack_repo/builtin/packages/prrte/package.py index b9c75318b2f..fcb905095c9 100644 --- a/repos/spack_repo/builtin/packages/prrte/package.py +++ b/repos/spack_repo/builtin/packages/prrte/package.py @@ -24,10 +24,7 @@ class Prrte(AutotoolsPackage): license("BSD-3-Clause-Open-MPI") version("develop", branch="master") - version("4.1.0", sha256="285ad62b670075708b9fcfe14c54baa599733bc274d10502a82e8eebba0b7c70") version("4.0.0", sha256="3c2ec961e0ba0c99128c7bf3545f4789d55a85a70ce958e868ae5e3db6ed4de4") - version("3.0.13", sha256="635a546b3d3cfa587f4122bfaa0038df07b56381ffd649e57b089893712fa231") - version("3.0.12", sha256="5ee344c1ef915e48d93c5c7bb77f0a7d47f3e4aec9bc5069e67d1dccadd91968") version("3.0.11", sha256="37af5a82d333a54c0bac358f06c194427b7dbfa7b8b85f2ddd1145acf71cfdd4") version("3.0.10", sha256="f5525d88937a5664ab5248a7c05e9ee51389937cd0993398e8270ed5cf53d638") version("3.0.9", sha256="29766b5c81faa6320625ab0670a0b24b2b75f5cf1abe4aa7f3bad56487a6a7e1") @@ -48,7 +45,6 @@ class Prrte(AutotoolsPackage): depends_on("c", type="build") # generated depends_on("pmix") - depends_on("pmix@6.1:", when="@4.1:") depends_on("pmix@6:", when="@4:") depends_on("pmix@:5", when="@:3") # NOTE: prrte 3.0.1 requires pmix 4.2.4 diff --git a/repos/spack_repo/builtin/packages/psblas/package.py b/repos/spack_repo/builtin/packages/psblas/package.py index 7d5062acac5..4b0cd8d9eea 100644 --- a/repos/spack_repo/builtin/packages/psblas/package.py +++ b/repos/spack_repo/builtin/packages/psblas/package.py @@ -15,7 +15,7 @@ class Psblas(AutotoolsPackage): # Url for your package's homepage here. homepage = "https://psctoolkit.github.io/" git = "https://github.com/sfilippone/psblas3.git" - url = "https://github.com/sfilippone/psblas3/archive/refs/tags/v3.9.0.tar.gz" + url = "https://github.com/sfilippone/psblas3/archive/refs/tags/v3.9.0-rc1.tar.gz" # List of GitHub accounts to notify when the package is updated. maintainers("cirdans-home", "sfilippone") @@ -23,14 +23,12 @@ class Psblas(AutotoolsPackage): # SPDX identifier of the project's license below. license("BSD-3-Clause", checked_by="cirdans-home") - version("develop", branch="development") + version("development", branch="development") version( - "3.9.0", - sha256="ce523ed2d266fb6dc8723c45a2bcbf40a1c67b7ca61cd9408032a73af7cf8605", + "3.9.0-rc1", + sha256="7a7091ce52582b6fc442e8793e36461be36c0947272ea803ad72736ec2d56da8", preferred=True, ) - version("3.9.0-rc3", sha256="7744b3a2cb5d2d3b90e740d905590ee9b8d69c02148dce10ee1b8dc7667e53b1") - version("3.9.0-rc1", sha256="7a7091ce52582b6fc442e8793e36461be36c0947272ea803ad72736ec2d56da8") version("3.8.1-2", sha256="285ddb7c9a793ea7ecb428d68cf23f4cc04f1c567631aa84bc2bedb65a3d1b0c") version("3.8.1", sha256="02e1f00e644426eb15eb08c735cf9c8ae692392f35c2cfe4f7474e1ab91575dc") version("3.8.0-2", sha256="86a76bb0987edddd4c10c810d7f18e13742aadc66ac14ad3679669809c1184fa") @@ -50,7 +48,9 @@ class Psblas(AutotoolsPackage): # MPI variant("mpi", default=True, description="Activates MPI support") # CUDA - variant("cuda", default=False, description="Activate CUDA support", when="@3.9.0-rc1:") + variant( + "cuda", default=False, description="Activate CUDA support", when="@development,3.9.0-rc1" + ) variant( "cudacc", default="70,75,80,86,89,90", @@ -63,9 +63,19 @@ class Psblas(AutotoolsPackage): # SuiteSparse: Enable AMD library support via SuiteSparse variant("amd", default=False, description="Activate AMD support via SuiteSparse") # OpenMP - variant("openmp", default=False, description="Activates OpenMP support", when="@3.9.0-rc1:") + variant( + "openmp", + default=False, + description="Activates OpenMP support", + when="@development,3.9.0-rc1", + ) # OpenACC support (requires GCC >= 14.2.0) - variant("openacc", default=False, description="Activate OpenACC support", when="@3.9.0-rc1:") + variant( + "openacc", + default=False, + description="Activate OpenACC support", + when="@development,3.9.0-rc1", + ) # Additional configure options variant("ccopt", default="none", description="Additional CCOPT flags") variant("cxxopt", default="none", description="Additional CXXOPT flags") @@ -163,15 +173,7 @@ def install(self, spec, prefix): make("install") def samples(self, spec, prefix): - fileread = prefix.samples.fileread - if spec.satisfies("@3.8.0-2:3.9.0-rc1"): - pargen = prefix.samples.pargen - elif spec.satisfies("@3.9.0-rc3:"): - pargen = prefix.samples.pdegen - else: - raise InstallError("Unsupported version layout") - - with working_dir(fileread): + with working_dir(prefix.samples.fileread): make() - with working_dir(pargen): + with working_dir(prefix.samples.pargen): make() diff --git a/repos/spack_repo/builtin/packages/py_antipickle/package.py b/repos/spack_repo/builtin/packages/py_antipickle/package.py deleted file mode 100644 index 7749a3121a1..00000000000 --- a/repos/spack_repo/builtin/packages/py_antipickle/package.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyAntipickle(PythonPackage): - """Like pickle. But different.""" - - homepage = "https://pypi.org/project/antipickle" - pypi = "antipickle/antipickle-0.2.0.tar.gz" - - maintainers("LydDeb") - - license("MIT", checked_by="LydDeb") - - version("0.2.0", sha256="361f37beacfa54081b20af54afaeb0420c7b12a3b3e4c932e083b07f9d3e7143") - - depends_on("python@3.7:", type=("build", "run")) - depends_on("py-hatchling", type="build") - depends_on("py-msgpack@1.0.4:", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_beartype/package.py b/repos/spack_repo/builtin/packages/py_beartype/package.py index 0e14dd08238..564415a304c 100644 --- a/repos/spack_repo/builtin/packages/py_beartype/package.py +++ b/repos/spack_repo/builtin/packages/py_beartype/package.py @@ -15,12 +15,9 @@ class PyBeartype(PythonPackage): license("MIT") - version("0.21.0", sha256="f9a5078f5ce87261c2d22851d19b050b64f6a805439e8793aecf01ce660d3244") version("0.16.2", sha256="47ec1c8c3be3f999f4f9f829e8913f65926aa7e85b180d9ffd305dc78d3e7d7b") version("0.15.0", sha256="2af6a8d8a7267ccf7d271e1a3bd908afbc025d2a09aa51123567d7d7b37438df") # See PYTHON_VERSION_MIN in beartype/meta.py - depends_on("python@3.9:", type=("build", "run"), when="@0.21.0:") depends_on("python@3.8:", type=("build", "run")) - depends_on("py-hatchling@1.14:", type="build", when="@0.19:") - depends_on("py-setuptools@:49,50.1:", type="build", when="@:0.18") + depends_on("py-setuptools@:49,50.1:", type="build") diff --git a/repos/spack_repo/builtin/packages/py_biopython/package.py b/repos/spack_repo/builtin/packages/py_biopython/package.py index 808e08522d7..40c097bc772 100644 --- a/repos/spack_repo/builtin/packages/py_biopython/package.py +++ b/repos/spack_repo/builtin/packages/py_biopython/package.py @@ -20,9 +20,6 @@ class PyBiopython(PythonPackage): license("BSD-3-Clause") - version("1.85", sha256="5dafab74059de4e78f49f6b5684eddae6e7ce46f09cfa059c1d1339e8b1ea0a6") - version("1.84", sha256="60fbe6f996e8a6866a42698c17e552127d99a9aab3259d6249fbaabd0e0cc7b4") - version("1.83", sha256="78e6bfb78de63034037afd35fe77cb6e0a9e5b62706becf78a7d922b16ed83f7") version("1.81", sha256="2cf38112b6d8415ad39d6a611988cd11fb5f33eb09346666a87263beba9614e0") version("1.80", sha256="52805e9af88767e450e2df8113b5bc59e964e2e8a7bb803a83570bdbb51c0e43") version("1.79", sha256="edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b") @@ -33,13 +30,11 @@ class PyBiopython(PythonPackage): depends_on("c", type="build") # generated - depends_on("python@3.9:", type=("build", "run"), when="@1.84:") - depends_on("python@3.8:", type=("build", "run"), when="@1.83:") - depends_on("python@3.6:", type=("build", "run"), when="@1.77:") - depends_on("python@2.7,3.5:3.9", type=("build", "run"), when="@1.75:1.76") - depends_on("python@2.7,3.4:3.9", type=("build", "run"), when="@1.70:1.74") - depends_on("python@2.7,3.3:3.9", type=("build", "run"), when="@1.69") depends_on("python@2.6:2.7,3.3:3.9", type=("build", "run"), when="@1.63:1.68") + depends_on("python@2.7,3.3:3.9", type=("build", "run"), when="@1.69") + depends_on("python@2.7,3.4:3.9", type=("build", "run"), when="@1.70:1.74") + depends_on("python@2.7,3.5:3.9", type=("build", "run"), when="@1.75:1.76") + depends_on("python@3.6:", type=("build", "run"), when="@1.77:") depends_on("py-numpy", type=("build", "run")) # https://github.com/biopython/biopython/issues/4676 depends_on("py-numpy@:1", when="@:1.83", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_chai_lab/package.py b/repos/spack_repo/builtin/packages/py_chai_lab/package.py deleted file mode 100644 index cca39935fc2..00000000000 --- a/repos/spack_repo/builtin/packages/py_chai_lab/package.py +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyChaiLab(PythonPackage): - """Chai Discovery tools for AI + protein research.""" - - homepage = "https://www.chaidiscovery.com/" - git = "https://github.com/chaidiscovery/chai-lab.git" - pypi = "chai_lab/chai_lab-0.6.1.tar.gz" - - maintainers("LydDeb") - - license("Apache-2.0", checked_by="LydDeb") - - version("0.6.1", sha256="a4ef9737bbb9abfa1dbbd5e059b899fb3b48d6b916f4bf104f5325e1f224e238") - - # pyproject.toml - depends_on("python@3.10:", type=("build", "run")) - depends_on("py-hatchling@1.20:", type="build") - depends_on("py-hatch-requirements-txt", type="build") - # requirements.in - # The dependence named "typer-slime" appears in the requirement.in file, but the PyPI page - # for this package specifies not to install it. - # Indeed, it does nothing more than depend on "typer". - depends_on("py-typer@0.12", type=("build", "run")) - depends_on("py-matplotlib", type=("build", "run")) - depends_on("py-tqdm@4.66:4", type=("build", "run")) - depends_on("py-typing-extensions", type=("build", "run")) - depends_on("py-gemmi@0.6.3:0.6", type=("build", "run")) - depends_on("rdkit@2024_9_5:2024_9+python", type=("build", "run")) - depends_on("py-biopython@1.83:", type=("build", "run")) - depends_on("py-antipickle@0.2.0", type=("build", "run")) - depends_on("py-tmtools@0.0.3:", type=("build", "run")) - depends_on("py-modelcif@1.0:", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-pandas+parquet", type=("build", "run")) - depends_on("py-pandera", type=("build", "run")) - depends_on("py-numba@0.59:", type=("build", "run")) - depends_on("py-einops@0.8", type=("build", "run")) - depends_on("py-jaxtyping@0.2.25:", type=("build", "run")) - depends_on("py-beartype@0.18:", type=("build", "run")) - depends_on("py-torch@:2.6,2.3.1:", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_gemmi/package.py b/repos/spack_repo/builtin/packages/py_gemmi/package.py deleted file mode 100644 index a59b66e7efb..00000000000 --- a/repos/spack_repo/builtin/packages/py_gemmi/package.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyGemmi(PythonPackage): - """Library for structural biology.""" - - homepage = "https://github.com/project-gemmi/gemmi" - pypi = "gemmi/gemmi-0.7.1.tar.gz" - - maintainers("LydDeb") - - license("MPL-2.0", checked_by="LydDeb") - - version("0.7.1", sha256="73bb4a2c574ef7586efdf0161aae22bb75c0301af5e9cc22252877e707facdd2") - version("0.6.7", sha256="5c0809329ba8a9711fdb1655d13c14e226828933e33e8816091a09d3f0ce35ce") - - depends_on("c", type="build") - depends_on("cxx", type="build") - depends_on("cmake@3.15:3.22", type="build") - - depends_on("python@3.8:3.10", type=("build", "run"), when="@0.7.1:") - depends_on("python@3.7:", type=("build", "run"), when="@0.6.7") - depends_on("py-scikit-build-core@0.11.1:0.11", type=("build", "run"), when="@0.7.1:") - depends_on("py-scikit-build-core@0.10.5:0.10", type=("build", "run"), when="@0.6.7") - depends_on("py-nanobind@2.4:", type=("build", "run"), when="@0.7.1:") - depends_on("py-pybind11@2.6.2:", type=("build", "run"), when="@0.6.7:0.6") - depends_on("py-pybind11-stubgen@2.5.1:2.5", type=("build", "run"), when="@0.6.7") - depends_on("py-typing-extensions@4.0:", type=("build", "run"), when="@0.7.1") - depends_on("py-numpy", type=("build", "run"), when="@0.6.7") diff --git a/repos/spack_repo/builtin/packages/py_gevent/package.py b/repos/spack_repo/builtin/packages/py_gevent/package.py index 1b75b2661a7..d41a7cba0d1 100644 --- a/repos/spack_repo/builtin/packages/py_gevent/package.py +++ b/repos/spack_repo/builtin/packages/py_gevent/package.py @@ -53,9 +53,6 @@ class PyGevent(PythonPackage): depends_on("py-zope-event", when="@20.5.1:", type=("build", "run")) depends_on("py-zope-interface", when="@20.5.1:", type=("build", "run")) - # https://github.com/pypa/distutils/pull/335 - depends_on("py-setuptools@:80", type=("build", "run")) - # https://github.com/gevent/gevent/issues/2076 conflicts("^py-cython@3.1:", when="@:24.10.3") # https://github.com/gevent/gevent/issues/1599 diff --git a/repos/spack_repo/builtin/packages/py_ihm/package.py b/repos/spack_repo/builtin/packages/py_ihm/package.py deleted file mode 100644 index 63f89008b3c..00000000000 --- a/repos/spack_repo/builtin/packages/py_ihm/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyIhm(PythonPackage): - """Package for handling IHM mmCIF and BinaryCIF files.""" - - homepage = "https://github.com/ihmwg/python-ihm" - git = "https://github.com/ihmwg/python-ihm.git" - pypi = "ihm/ihm-2.7.tar.gz" - - maintainers("LydDeb") - - license("MIT", checked_by="LydDeb") - - version("2.9", sha256="2efc460217c66b4d359c1eb7509ffa417568c2e59e04c0e2609995db99fc937f") - version("2.7", sha256="a3b9eba5545de1e07a15d110e9e6b70369807798d8f2c45908323db2b6fde82c") - - depends_on("c", type="build") - - depends_on("py-setuptools@42:", type="build") - depends_on("py-msgpack", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_llvmlite/package.py b/repos/spack_repo/builtin/packages/py_llvmlite/package.py index a7c26e39c73..edee58db435 100644 --- a/repos/spack_repo/builtin/packages/py_llvmlite/package.py +++ b/repos/spack_repo/builtin/packages/py_llvmlite/package.py @@ -43,9 +43,6 @@ class PyLlvmlite(PythonPackage): depends_on("binutils", when="platform=linux") depends_on("py-setuptools") - # https://github.com/numba/llvmlite/pull/1400 - depends_on("py-setuptools@:80", when="@:0.46") - # Based on PyPI wheel availability with default_args(type=("build", "run")): depends_on("python@3.10:3.14", when="@0.46:") diff --git a/repos/spack_repo/builtin/packages/py_lxml/package.py b/repos/spack_repo/builtin/packages/py_lxml/package.py index ddfd54baea5..9bdd4ed946d 100644 --- a/repos/spack_repo/builtin/packages/py_lxml/package.py +++ b/repos/spack_repo/builtin/packages/py_lxml/package.py @@ -17,7 +17,6 @@ class PyLxml(PythonPackage): license("BSD-3-Clause") - version("6.0.2", sha256="cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62") version("6.0.1", sha256="2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690") version("5.3.0", sha256="4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f") version("5.2.2", sha256="bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87") @@ -45,19 +44,11 @@ class PyLxml(PythonPackage): depends_on("python@3.8:", type=("build", "run"), when="@6:") depends_on("py-setuptools", type="build") - depends_on("libxml2@2.14.6:", type=("build", "link", "run"), when="@6.0.2:") - depends_on("libxml2@2.14.5:", type=("build", "link", "run"), when="@6.0.1:") - depends_on("libxml2@2.12.9:", type=("build", "link", "run"), when="@5.3:") - depends_on("libxml2@2.12.6:", type=("build", "link", "run"), when="@5.2.2:") depends_on("libxml2@2.9.2:", type=("build", "link", "run")) - depends_on("libxslt@1.1.43:", type=("build", "link", "run"), when="@6.0.1:") - depends_on("libxslt@1.1.42:", type=("build", "link", "run"), when="@5.3:") - depends_on("libxslt@1.1.39:", type=("build", "link", "run"), when="@5.2.2:") depends_on("libxslt@1.1.27:", type=("build", "link", "run")) depends_on("py-html5lib", when="+html5", type=("build", "run")) depends_on("py-beautifulsoup4", when="+htmlsoup", type=("build", "run")) depends_on("py-cssselect@0.7:", when="+cssselect", type=("build", "run")) - depends_on("py-cython@3.1.4:", type="build", when="@6.0.2:") depends_on("py-cython@3.1.2:", type="build", when="@6:") depends_on("py-cython@3.0.11:", type="build", when="@5.3:") depends_on("py-cython@3.0.10:", type="build", when="@5.2:") diff --git a/repos/spack_repo/builtin/packages/py_matplotlib/package.py b/repos/spack_repo/builtin/packages/py_matplotlib/package.py index b3074a70871..99ade6cb6b1 100644 --- a/repos/spack_repo/builtin/packages/py_matplotlib/package.py +++ b/repos/spack_repo/builtin/packages/py_matplotlib/package.py @@ -144,11 +144,6 @@ class PyMatplotlib(PythonPackage): depends_on("c", type="build") depends_on("cxx", type="build") - # This is required for the gcc lto wrapper which calls gmake - # Without this the spack installer doesn't know what to pass - # when building with the gnu jobserver - depends_on("gmake", type="build", when="%gcc") - # https://matplotlib.org/stable/install/dependencies.html # Runtime dependencies # Mandatory dependencies diff --git a/repos/spack_repo/builtin/packages/py_metatomic_torch/package.py b/repos/spack_repo/builtin/packages/py_metatomic_torch/package.py index c9e959ceb53..45bd1d1b10b 100644 --- a/repos/spack_repo/builtin/packages/py_metatomic_torch/package.py +++ b/repos/spack_repo/builtin/packages/py_metatomic_torch/package.py @@ -7,8 +7,6 @@ from spack.package import * VERSIONS = { - "0.1.10": "a221154d789d7c03ba2e06da9653301fb1954f92d9c2608e8c19fd33dde84d2d", - # 0.1.9 is skipped because it is partially broken "0.1.8": "8bb19a487d112ca6fe73a75fd28440e35b29f1d599a36fc41dc0f05fca783353", "0.1.7": "bd8cc1638e5e2bb14f9db57c634bb9794b6530796041a698cb8b47d7ad67c9ab", "0.1.6": "cb1a966bd69e13234b02289f984705ecdbf5eb3cbcb050c1e103741adc708d50", @@ -38,7 +36,6 @@ class PyMetatomicTorch(PythonPackage): # python/metatomic_torch/setup.py depends_on("py-torch@2.1:", type=("build", "run")) depends_on("py-vesin", type=("build", "run")) - depends_on("py-vesin@0.5.1:", type=("build", "run"), when="@0.1.10:") depends_on("py-metatensor-torch@0.8.0:0.8", type=("build", "run"), when="@0.1.4:") depends_on("py-metatensor-torch@0.7.0:0.7", type=("build", "run"), when="@0.1.3") depends_on("py-metatensor-operations@0.4.0:0.4", type=("build", "run"), when="@0.1.6:") diff --git a/repos/spack_repo/builtin/packages/py_modelcif/package.py b/repos/spack_repo/builtin/packages/py_modelcif/package.py deleted file mode 100644 index 7a3c210b4cd..00000000000 --- a/repos/spack_repo/builtin/packages/py_modelcif/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyModelcif(PythonPackage): - """Package for handling ModelCIF mmCIF and BinaryCIF files.""" - - homepage = "https://github.com/ihmwg/python-modelcif" - git = "https://github.com/ihmwg/python-modelcif.git" - pypi = "modelcif/modelcif-1.4.tar.gz" - - maintainers("LydDeb") - - license("MIT", checked_by="LydDeb") - - version("1.6", sha256="b1bf0751f0e2d1ea6da7a0a8a92efd2754428ae50bc3bfbff8e015183e978b19") - version("1.4", sha256="fca5c1da5eb25fff3c9cd61b618fa247569f8e90cbb64774740601155d4add6e") - - depends_on("py-setuptools", type="build") - depends_on("py-ihm@2.6:", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_pandera/package.py b/repos/spack_repo/builtin/packages/py_pandera/package.py deleted file mode 100644 index 12836950e7a..00000000000 --- a/repos/spack_repo/builtin/packages/py_pandera/package.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyPandera(PythonPackage): - """ - A light-weight and flexible data validation and testing tool for statistical data objects. - """ - - homepage = "https://www.union.ai/pandera" - git = "https://github.com/unionai-oss/pandera.git" - pypi = "pandera/pandera-0.24.0.tar.gz" - - maintainers("LydDeb") - - license("MIT", checked_by="LydDeb") - - version("0.29.0", sha256="06bc4fc1e4ff02534dd44482a9bc704fb2e58fe3fbb11be906aa714f7f5ec801") - version("0.24.0", sha256="154231780643bc73b121bd976b0ada9dcebb3e065c622954fd099dc299cf44bd") - - depends_on("python@3.10:", type=("build", "run"), when="@0.29.0:") - depends_on("python@3.9:", type=("build", "run")) - depends_on("py-setuptools@61.0:", type="build") - depends_on("py-setuptools-scm", type="build") - depends_on("py-packaging@20.0:", type=("build", "run")) - depends_on("py-pydantic", type=("build", "run")) - depends_on("py-typeguard", type=("build", "run")) - depends_on("py-typing-extensions", type=("build", "run")) - depends_on("py-typing-inspect@0.6.0:", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_petsc4py/package.py b/repos/spack_repo/builtin/packages/py_petsc4py/package.py index 5ee002b7df6..4aa1217d727 100644 --- a/repos/spack_repo/builtin/packages/py_petsc4py/package.py +++ b/repos/spack_repo/builtin/packages/py_petsc4py/package.py @@ -109,9 +109,6 @@ class PyPetsc4py(PythonPackage): depends_on("py-numpy", type=("build", "run")) depends_on("py-mpi4py", when="+mpi", type=("build", "run")) - # https://gitlab.com/petsc/petsc/-/merge_requests/9016 - depends_on("py-setuptools@:80", when="@:3.24.4", type="build") - depends_on("petsc+mpi", when="+mpi") depends_on("petsc~mpi", when="~mpi") depends_on("petsc@main", when="@main") diff --git a/repos/spack_repo/builtin/packages/py_protobuf/package.py b/repos/spack_repo/builtin/packages/py_protobuf/package.py index 6b48ff82072..218cafb3268 100644 --- a/repos/spack_repo/builtin/packages/py_protobuf/package.py +++ b/repos/spack_repo/builtin/packages/py_protobuf/package.py @@ -75,9 +75,6 @@ class PyProtobuf(PythonPackage): depends_on("py-setuptools", type=("build", "run")) depends_on("py-six@1.9:", when="@3.0:3.17", type=("build", "run")) - # https://github.com/protocolbuffers/protobuf/pull/22447 - depends_on("py-setuptools@:81", when="@:6.31", type=("build", "run")) - # https://protobuf.dev/support/version-support/#python for ver in range(30, 33): depends_on(f"protobuf@{ver}", when=f"@6.{ver}") diff --git a/repos/spack_repo/builtin/packages/py_psutil/package.py b/repos/spack_repo/builtin/packages/py_psutil/package.py index 66b1e4623ee..d2502bb7f14 100644 --- a/repos/spack_repo/builtin/packages/py_psutil/package.py +++ b/repos/spack_repo/builtin/packages/py_psutil/package.py @@ -17,7 +17,6 @@ class PyPsutil(PythonPackage): license("BSD-3-Clause") - version("7.2.2", sha256="0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372") version("7.1.0", sha256="655708b3c069387c8b77b072fc429a57d0e214221d01c0a772df7dfedcb3bcd2") version("6.1.1", sha256="cf8496728c18f2d0b45198f06895be52f36611711746b7f30c464b422b50e2f5") version("5.9.5", sha256="5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c") diff --git a/repos/spack_repo/builtin/packages/py_setuptools/package.py b/repos/spack_repo/builtin/packages/py_setuptools/package.py index d8f6d4f013c..b7fcc0e9c5b 100644 --- a/repos/spack_repo/builtin/packages/py_setuptools/package.py +++ b/repos/spack_repo/builtin/packages/py_setuptools/package.py @@ -24,7 +24,6 @@ class PySetuptools(Package, PythonExtension): # Requires railroad skip_modules = ["setuptools._vendor", "pkg_resources._vendor"] - version("82.0.0", sha256="70b18734b607bd1da571d097d236cfcfacaf01de45717d59e6e04b96877532e0") version("80.9.0", sha256="062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922") version("79.0.1", sha256="e147c0549f27767ba362f9da434eab9c5dc0045d5304feb602a0af001089fc51") version("78.1.1", sha256="c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561") diff --git a/repos/spack_repo/builtin/packages/py_setuptools_scm/package.py b/repos/spack_repo/builtin/packages/py_setuptools_scm/package.py index eb34a507350..df86e0da378 100644 --- a/repos/spack_repo/builtin/packages/py_setuptools_scm/package.py +++ b/repos/spack_repo/builtin/packages/py_setuptools_scm/package.py @@ -48,9 +48,6 @@ class PySetuptoolsScm(PythonPackage): depends_on("py-setuptools@42:", when="@5:") depends_on("py-setuptools@34.4:") - # use of vendored pkg_resources - depends_on("py-setuptools@:80", when="@:6") - depends_on("py-tomli@1:2.0.2", when="@8.2.0: ^python@:3.10") depends_on("py-tomli@1:", when="@7.1.0:8.1.0 ^python@:3.10") depends_on("py-tomli@1:", when="@7.0.0:7.0.5") diff --git a/repos/spack_repo/builtin/packages/py_textx/package.py b/repos/spack_repo/builtin/packages/py_textx/package.py index 09d1c98961f..88a89940b0c 100644 --- a/repos/spack_repo/builtin/packages/py_textx/package.py +++ b/repos/spack_repo/builtin/packages/py_textx/package.py @@ -15,17 +15,10 @@ class PyTextx(PythonPackage): license("MIT") - version("4.3.0", sha256="0facac8029ad124ef21e5838dd8eb67f10129efcee96ea3548f5fd62428a9880") - version("4.2.3", sha256="5c503fe335b24bc113c21cf20bfec9a174680cf95bb651dea8f90c27d305d4c8") - version("4.2.2", sha256="62a84bfe6b956c3f3d221d34bd9c133268db0af16e35197a48932b17e9413ede") - version("4.2.1", sha256="5dbeed35de960ef32364523fcda25472db6fa32e3377e0e71aee03ef12519c31") - version("4.2.0", sha256="953fdd495195a26ca7af6fb1eeadd7ecf927f0a9d3821716f782c957c5b0e2ab") - version("4.1.0", sha256="37b4f0c455452e27cc0f13d40777b5d20549eaa871311b26e2ed83c019456692") version("4.0.1", sha256="84aff5c95fd2c947402fcbe83eeeddc23aabcfed3464ab84184ef193c52d831a") depends_on("c", type="build") depends_on("py-flit-core@3.8:3", type="build") - depends_on("python@3.8:3.12", type=("build", "run"), when="@:4.0.1") - depends_on("python@3.8:", type=("build", "run"), when="@4.1.0:") + depends_on("python@3.8:3.12", type=("build", "run")) depends_on("py-arpeggio@2:", type=("build", "run")) depends_on("py-importlib-metadata", when="^python@:3.9", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_tmtools/package.py b/repos/spack_repo/builtin/packages/py_tmtools/package.py deleted file mode 100644 index 65338de19b6..00000000000 --- a/repos/spack_repo/builtin/packages/py_tmtools/package.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyTmtools(PythonPackage): - """Python bindings around the TM-align code for structural alignment of proteins.""" - - homepage = "https://github.com/jvkersch/tmtools" - git = "https://github.com/jvkersch/tmtools.git" - pypi = "tmtools/tmtools-0.2.0.tar.gz" - - maintainers("LydDeb") - - license("GPL-3.0-only", checked_by="LydDeb") - - version("0.2.0", sha256="e2d6422f5af91ee41753fb2e9776140785eb818ec83d7aef8a8b2f296f05e72c") - - depends_on("cxx", type="build") - depends_on("py-setuptools@42:", type="build") - depends_on("py-pybind11@2.10.4:2.10", type="build") - depends_on("py-numpy", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.5.patch b/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.5.patch index 2e7a80bcbe8..2c35aafac2f 100644 --- a/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.5.patch +++ b/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.5.patch @@ -25,10 +25,10 @@ index 9be7f37..39d0f24 100644 endif() diff --git a/cmake/public/LoadHIP.cmake b/cmake/public/LoadHIP.cmake -index 1c0d3a2..e0de4b1 100644 +index 1c0d3a2..83f9f9d 100644 --- a/cmake/public/LoadHIP.cmake +++ b/cmake/public/LoadHIP.cmake -@@ -167,6 +167,10 @@ if(HIP_FOUND) +@@ -167,6 +167,11 @@ if(HIP_FOUND) find_package_and_print_version(hipsolver REQUIRED) find_package_and_print_version(hiprtc REQUIRED) @@ -36,6 +36,7 @@ index 1c0d3a2..e0de4b1 100644 + list(APPEND ROCM_INCLUDE ${rocprim_INCLUDE_DIR}) + list(APPEND ROCM_INCLUDE ${hipcub_INCLUDE_DIR}) + list(APPEND ROCM_INCLUDE ${rocRAND_INCLUDE_DIR}) ++ list(APPEND ROCM_INCLUDE $ENV{AOTRITON_INSTALLED_PREFIX}/include) find_library(PYTORCH_HIP_LIBRARIES amdhip64 HINTS ${ROCM_PATH}/lib) # TODO: miopen_LIBRARIES should return fullpath to the library file, diff --git a/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.7.patch b/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.7.patch index 4392e00d76a..173aabc12aa 100644 --- a/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.7.patch +++ b/repos/spack_repo/builtin/packages/py_torch/PR152569-Update-spack-includes-2.7.patch @@ -1,5 +1,5 @@ diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index d2d23b7..620a89f 100644 +index d2d23b7ab65..620a89f65cb 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -1379,13 +1379,6 @@ if(USE_ROCM) @@ -26,7 +26,7 @@ index d2d23b7..620a89f 100644 endif() diff --git a/cmake/public/LoadHIP.cmake b/cmake/public/LoadHIP.cmake -index 58c74dd..d3e1ad4 100644 +index 58c74ddda35..54f96871372 100644 --- a/cmake/public/LoadHIP.cmake +++ b/cmake/public/LoadHIP.cmake @@ -26,12 +26,6 @@ else() @@ -78,7 +78,15 @@ index 58c74dd..d3e1ad4 100644 find_package_and_print_version(amd_comgr REQUIRED) find_package_and_print_version(rocrand REQUIRED) find_package_and_print_version(hiprand REQUIRED) -@@ -171,7 +168,11 @@ if(HIP_FOUND) +@@ -157,6 +154,7 @@ if(HIP_FOUND) + find_package_and_print_version(hipcub REQUIRED) + find_package_and_print_version(rocthrust REQUIRED) + find_package_and_print_version(hipsolver REQUIRED) ++ list(APPEND ROCM_INCLUDE_DIRS $ENV{AOTRITON_INSTALLED_PREFIX}/include) + # workaround cmake 4 build issue + if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0") + message(WARNING "Work around hiprtc cmake failure for cmake >= 4") +@@ -171,7 +169,11 @@ if(HIP_FOUND) if(UNIX) find_package_and_print_version(rccl) find_package_and_print_version(hsa-runtime64 REQUIRED) diff --git a/repos/spack_repo/builtin/packages/py_torch/package.py b/repos/spack_repo/builtin/packages/py_torch/package.py index 844a73f0e9e..d360242270a 100644 --- a/repos/spack_repo/builtin/packages/py_torch/package.py +++ b/repos/spack_repo/builtin/packages/py_torch/package.py @@ -123,6 +123,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): conflicts("+gloo+rocm") conflicts("+rocm", when="@2.3", msg="Rocm doesn't support py-torch 2.3 release") conflicts("+rocm", when="@2.4", msg="Rocm doesn't support py-torch 2.4 release") + conflicts("+rocm", when="@2.8", msg="Rocm doesn't support py-torch 2.8 release") conflicts("+tensorpipe", when="+rocm ^hip@:5.1", msg="TensorPipe not supported until ROCm 5.2") conflicts("+breakpad", when="target=ppc64:") conflicts("+breakpad", when="target=ppc64le:") @@ -305,7 +306,8 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("valgrind", when="+valgrind") with when("+rocm"): depends_on("hsa-rocr-dev") - depends_on("hip") + depends_on("hip@7.0:", when="@2.9:") + depends_on("hip@:6.4", when="@:2.7") depends_on("rccl", when="+nccl") depends_on("rocprim") depends_on("hipcub") @@ -320,11 +322,15 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("rocfft") depends_on("rocblas") depends_on("miopen-hip") + depends_on("composable-kernel") + depends_on("hipblaslt") + # Ensure hipblaslt version for 2.9+ + depends_on("hipblaslt@7.0:", when="@2.9:") depends_on("rocminfo") - depends_on("aotriton@0.8.1b", when="@2.5:2.6") - depends_on("aotriton@0.9.1b", when="@2.7:") - depends_on("composable-kernel@:6.3.2", when="@2.5") - depends_on("composable-kernel@6.3.2:", when="@2.6:") + depends_on("hipsparselt@7.0:", when="@2.9:") + depends_on("aotriton@0.8b", when="@2.5:2.6") + depends_on("aotriton@0.9.2b", when="@2.7") + depends_on("aotriton@0.10b", when="@2.8:") depends_on("mpi", when="+mpi") depends_on("ucc", when="+ucc") depends_on("ucx", when="+ucc") @@ -568,6 +574,14 @@ def patch(self): "torch_global_deps PROPERTIES LINKER_LANGUAGE CXX", "caffe2/CMakeLists.txt", ) + if self.spec.satisfies("@2.5:+rocm"): + filter_file( + "find_library(ROCM_ROCTX_LIB roctx64 HINTS ${ROCM_PATH}/lib)", + "find_library(ROCM_ROCTX_LIB roctx64 HINTS ${ROCM_PATH}/lib)\n" + "set(ROCTRACER_INCLUDE_DIR $ENV{ROCTRACER_INCLUDE_DIR})", + "cmake/public/LoadHIP.cmake", + string=True, + ) if self.spec.satisfies("@2.1:2.7+rocm"): filter_file( "${ROCM_INCLUDE_DIRS}/rocm-core/rocm_version.h", diff --git a/repos/spack_repo/builtin/packages/py_trame_client/package.py b/repos/spack_repo/builtin/packages/py_trame_client/package.py index 6411a404035..40d5cd40fe7 100644 --- a/repos/spack_repo/builtin/packages/py_trame_client/package.py +++ b/repos/spack_repo/builtin/packages/py_trame_client/package.py @@ -11,20 +11,12 @@ class PyTrameClient(PythonPackage): """Internal client side implementation of trame""" homepage = "https://github.com/Kitware/trame-client" - pypi = "trame-client/trame_client-3.11.2.tar.gz" + pypi = "trame-client/trame-client-2.17.1.tar.gz" maintainers("johnwparent") license("Apache-2.0", checked_by="johnwparent") - version("3.11.3", sha256="ea75073c04c871a96ad51634ff7fc0b36242f62aab7ddfaac55e961c9ea46f90") - version("3.11.2", sha256="98b3f09d0fbdb09cd29eac61c945a76dcad4a08cfb4843abce5a148fd6fc7316") version("2.17.1", sha256="0841e569d0792c7fc218a502663c814ad69e318d2885cec82a7fe1d07fdf0bf4") - depends_on("python@3.9:", type=("build", "run"), when="@3.11.2:") depends_on("py-setuptools@42:", type="build") - depends_on("py-trame-common@0.2:", type=("build", "run"), when="@3.11.2") - - def url_for_version(self, version): - sep = "_" if version >= Version("3.5.1") else "-" - return f"https://files.pythonhosted.org/packages/source/t/trame{sep}client/trame{sep}client-{version}.tar.gz" diff --git a/repos/spack_repo/builtin/packages/py_trame_common/package.py b/repos/spack_repo/builtin/packages/py_trame_common/package.py deleted file mode 100644 index 5219395b364..00000000000 --- a/repos/spack_repo/builtin/packages/py_trame_common/package.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyTrameCommon(PythonPackage): - """Dependency less classes and functions for trame.""" - - homepage = "https://github.com/Kitware/trame-common" - pypi = "trame_common/trame_common-1.1.0.tar.gz" - - maintainers("LydDeb") - - license("Apache-2.0", checked_by="LydDeb") - - version("1.1.1", sha256="6254970b75700510c58265e90fd38ba852b99c0e71293d24eed54819902bb01c") - version("1.1.0", sha256="86280a72453571d91843f6a0cd8d0dbf283ddade6230915ccd244835d6bfa245") - - depends_on("python@3.9:", type=("build", "run")) - depends_on("py-hatchling", type="build") diff --git a/repos/spack_repo/builtin/packages/py_trame_vtk/package.py b/repos/spack_repo/builtin/packages/py_trame_vtk/package.py deleted file mode 100644 index e50d483d74b..00000000000 --- a/repos/spack_repo/builtin/packages/py_trame_vtk/package.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack_repo.builtin.build_systems.python import PythonPackage - -from spack.package import * - - -class PyTrameVtk(PythonPackage): - """ - trame-vtk extend trame widgets with components that can interface with VTK and/or ParaView. - """ - - homepage = "https://kitware.github.io/trame/" - pypi = "trame-vtk/trame_vtk-2.10.0.tar.gz" - - maintainers("LydDeb") - - license("BSD License") - - version("2.11.1", sha256="db1f316ba69c29b9292775c3f73567604aa366742c06030d8507d5bd56424492") - version("2.10.0", sha256="0e4cabd78c1e8b67da857ba5c3a404a2195cb3e849a252bae51575291bef01ad") - - depends_on("python@3.9:", type=("build", "run")) - depends_on("py-hatchling", type="build") - depends_on("py-setuptools@42:", type="build") - depends_on("py-trame-client@3.4:3", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_typer/package.py b/repos/spack_repo/builtin/packages/py_typer/package.py index 1caf0e76236..a93b629ca26 100644 --- a/repos/spack_repo/builtin/packages/py_typer/package.py +++ b/repos/spack_repo/builtin/packages/py_typer/package.py @@ -16,12 +16,11 @@ class PyTyper(PythonPackage): license("MIT", checked_by="lgarrison") version("0.15.1", sha256="a0588c0a7fa68a1978a069818657778f86abe6ff5ea6abf472f940a08bfe4f0a") - version("0.12.5", sha256="f592f089bedcc8ec1b974125d64851029c3b1af145f04aca64d69410f0c9b722") version("0.9.0", sha256="50922fd79aea2f4751a8e0408ff10d2662bd0c8bbfa84755a699f3bada2978b2") version("0.7.0", sha256="ff797846578a9f2a201b53442aedeb543319466870fbe1c701eab66dd7681165") version("0.5.0", sha256="4c285a5585c94d32c305444af934f0078b6a8ba91464f3f85807c91cd499d195") - with when("@0.12.5:"): + with when("@0.15.1:"): depends_on("python@3.7:", type=("build", "run")) depends_on("py-pdm-backend", type="build") depends_on("py-click@8:", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_tzlocal/package.py b/repos/spack_repo/builtin/packages/py_tzlocal/package.py index 6385138a09b..fe27e2e58e5 100644 --- a/repos/spack_repo/builtin/packages/py_tzlocal/package.py +++ b/repos/spack_repo/builtin/packages/py_tzlocal/package.py @@ -15,13 +15,10 @@ class PyTzlocal(PythonPackage): license("MIT") - version("5.3.1", sha256="cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd") version("2.1", sha256="643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44") version("2.0.0", sha256="949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590") version("1.3", sha256="d160c2ce4f8b1831dabfe766bd844cf9012f766539cf84139c2faac5201882ce") - depends_on("python@3.9:", when="@5.3.1:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-setuptools@64:", when="@5.3.1:", type="build") - depends_on("py-pytz", when="@:2.1", type=("build", "run")) + depends_on("py-pytz", type=("build", "run")) diff --git a/repos/spack_repo/builtin/packages/py_vesin/package.py b/repos/spack_repo/builtin/packages/py_vesin/package.py index cd15bd985ea..bb6adc78d3a 100644 --- a/repos/spack_repo/builtin/packages/py_vesin/package.py +++ b/repos/spack_repo/builtin/packages/py_vesin/package.py @@ -18,7 +18,6 @@ class PyVesin(PythonPackage): maintainers("HaoZeke", "Luthaf", "RMeli") license("BSD-3-Clause", checked_by="HaoZeke") - version("0.5.1", sha256="86afd7641319b21187155a8d9585bc134e79536897f28c62b69476627c1020ae") version("0.5.0", sha256="432322e51b214d6e13b056677424f54b250fb181bd726afb9b2d5b1b6fdbdb84") version("0.4.2", sha256="46bcfdc4d56490d43a6d8c5882b900b5cf49cff68b6ffb78d442ff85d0104d4f") version("0.3.7", sha256="52c11ac0ba775c228f06779877cf8641854edab7ea59036093ef5e8447379de0") diff --git a/repos/spack_repo/builtin/packages/qt_base/package.py b/repos/spack_repo/builtin/packages/qt_base/package.py index 975650f1d93..e43523181b8 100644 --- a/repos/spack_repo/builtin/packages/qt_base/package.py +++ b/repos/spack_repo/builtin/packages/qt_base/package.py @@ -39,8 +39,6 @@ def get_list_url(qualname): # Default dependencies for all qt-* components generator("ninja") depends_on("cmake@3.16:", type="build") - depends_on("cmake@3.19:", when="@6.8.1:", type="build") - depends_on("cmake@3.22:", when="@6.9.0:", type="build") depends_on("pkgconfig", type="build", when="platform=linux") depends_on("python", type="build") diff --git a/repos/spack_repo/builtin/packages/rdkit/package.py b/repos/spack_repo/builtin/packages/rdkit/package.py index 9b739652cdd..95f91800ae0 100644 --- a/repos/spack_repo/builtin/packages/rdkit/package.py +++ b/repos/spack_repo/builtin/packages/rdkit/package.py @@ -19,8 +19,6 @@ class Rdkit(CMakePackage): license("BSD-3-Clause") - version("2024_09_6", sha256="337075aadd51760fe920442c73972c2fef2561645785fac246615fcb03914062") - version("2024_09_5", sha256="ee55cf72d211c880b8f63e18fca6d9abce2b060987b7d2ce61d2d3b9527003c2") version("2024_03_3", sha256="52f79c6bf1d446cdb5c86a35de655d96bad0c52a5f4ecbe15f08eaf334e6f76a") version("2023_03_1", sha256="db346afbd0ba52c843926a2a62f8a38c7b774ffab37eaf382d789a824f21996c") version("2022_09_5", sha256="2efe7ce3b527df529ed3e355e2aaaf14623e51876be460fa4ad2b7f7ad54c9b1") @@ -84,10 +82,6 @@ class Rdkit(CMakePackage): conflicts("+xyz2mol", when="~yaehmop", msg="XY2MOL requires YAeHMOP") - depends_on( - "boost@1.53.0: +python +serialization +iostreams +system +numpy +program_options", - when="@2024_09_5:", - ) depends_on("boost@1.53.0: +python +serialization +iostreams +system") depends_on("sqlite") depends_on("freetype", when="@2020_09_1: +freetype") diff --git a/repos/spack_repo/builtin/packages/root/package.py b/repos/spack_repo/builtin/packages/root/package.py index 3f2749c7b56..475ced89d63 100644 --- a/repos/spack_repo/builtin/packages/root/package.py +++ b/repos/spack_repo/builtin/packages/root/package.py @@ -56,7 +56,6 @@ class Root(CMakePackage): # Supported STS release series # 6.38 (through 2026-06-30) - version("6.38.02", sha256="77d34d2bca0ea720acfd43798bcb5d09a28584013b4d0a2910823c867d4bfa42") version("6.38.00", sha256="a4429422c460f832cde514a580dd202b1d3c96e8919c24363c3d42f8cf5accdc") # 6.34 (through 2025-06-30) diff --git a/repos/spack_repo/builtin/packages/vecmem/package.py b/repos/spack_repo/builtin/packages/vecmem/package.py index aa579b79306..4fcb23a4ce2 100644 --- a/repos/spack_repo/builtin/packages/vecmem/package.py +++ b/repos/spack_repo/builtin/packages/vecmem/package.py @@ -19,7 +19,6 @@ class Vecmem(CMakePackage, CudaPackage): license("MPL-2.0-no-copyleft-exception") - version("1.23.0", sha256="eee612fe5276d5852ccbfad1feda4b4f00391791479e08934d70cd437f376df9") version("1.22.0", sha256="478ae60f5a64650cadb955f7fd4bb3c0b02658dd6821077a0724e58bb745cc66") version("1.21.0", sha256="a6e30da7dcb9a792eb0f2c0ceb821f52cf867c9745a65468b2ce6f026b23a49d") version("1.20.0", sha256="73c817b2a1a0961e357a2ca204ad610c8892b2697a6af2b1d794d0760a1009bf") diff --git a/repos/spack_repo/builtin/packages/verilator/package.py b/repos/spack_repo/builtin/packages/verilator/package.py index 6ce2d3c1763..3bf3fa30cd6 100644 --- a/repos/spack_repo/builtin/packages/verilator/package.py +++ b/repos/spack_repo/builtin/packages/verilator/package.py @@ -43,7 +43,6 @@ class Verilator(AutotoolsPackage): version("master", branch="master") - version("5.046", sha256="002bc6d92b203eb8b4612e1d198d8108517d4ec9859e131ef328015352fe6d0c") version("5.044", sha256="ded2a4a96e3b836ddc9fd5d01127999d981adee4d19133ff819b7129897d801a") version("5.042", sha256="bec14f17de724851b110b698f3bd25e22effaaced7265b26d2bc13075dbfb4bf") version("5.040", sha256="56c7c46314adfad06dd093b77823bfd9b49ebef72342549f790718199c3e8223") diff --git a/repos/spack_repo/builtin/packages/xz/package.py b/repos/spack_repo/builtin/packages/xz/package.py index a0bb681f044..f40331d192b 100644 --- a/repos/spack_repo/builtin/packages/xz/package.py +++ b/repos/spack_repo/builtin/packages/xz/package.py @@ -29,7 +29,6 @@ class Xz(MSBuildPackage, AutotoolsPackage, SourceforgePackage): license("GPL-2.0-or-later AND Public-Domain AND LGPL-2.1-or-later", checked_by="tgamblin") - version("5.8.2", sha256="60345d7c0b9c8d7ffa469e96898c300def3669f5047fc76219b819340839f3d8") version("5.6.3", sha256="a95a49147b2dbb5487517acc0adcd77f9c2032cf00664eeae352405357d14a6c") version("5.6.2", sha256="e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171") # ALERT: don't add XZ 5.6.0 or 5.6.1, https://nvd.nist.gov/vuln/detail/CVE-2024-3094 @@ -47,7 +46,7 @@ class Xz(MSBuildPackage, AutotoolsPackage, SourceforgePackage): version("5.2.1", sha256="679148f497e0bff2c1adce42dee5a23f746e71321c33ebb0f641a302e30c2a80") version("5.2.0", sha256="f7357d7455a1670229b3cca021da71dd5d13b789db62743c20624bdffc9cc4a5") - variant("pic", default=False, description="Compile with position independent code") + variant("pic", default=False, description="Compile with position independent code.") variant( "libs", @@ -57,7 +56,7 @@ class Xz(MSBuildPackage, AutotoolsPackage, SourceforgePackage): description="Build shared libs, static libs or both", ) - depends_on("c", type="build") + depends_on("c", type="build") # generated # xz-5.2.7/src/liblzma/common/common.h:56 uses attribute __symver__ instead of # __asm__(.symver) for newer GCC releases. diff --git a/repos/spack_repo/builtin/packages/zlib_ng/package.py b/repos/spack_repo/builtin/packages/zlib_ng/package.py index 0d8af9a147c..021b711eb28 100644 --- a/repos/spack_repo/builtin/packages/zlib_ng/package.py +++ b/repos/spack_repo/builtin/packages/zlib_ng/package.py @@ -22,7 +22,6 @@ class ZlibNg(AutotoolsPackage, CMakePackage): license("Zlib") - version("2.3.3", sha256="f9c65aa9c852eb8255b636fd9f07ce1c406f061ec19a2e7d508b318ca0c907d1") version("2.3.2", sha256="6a0561b50b8f5f6434a6a9e667a67026f2b2064a1ffa959c6b2dae320161c2a8") version("2.2.5", sha256="5b3b022489f3ced82384f06db1e13ba148cbce38c7941e424d6cb414416acd18") version("2.2.4", sha256="a73343c3093e5cdc50d9377997c3815b878fd110bf6511c2c7759f2afb90f5a3") diff --git a/stacks/developer-tools-darwin/spack.yaml b/stacks/developer-tools-darwin/spack.yaml index b206e8dfc0d..e07ac6245ce 100644 --- a/stacks/developer-tools-darwin/spack.yaml +++ b/stacks/developer-tools-darwin/spack.yaml @@ -5,8 +5,6 @@ spack: packages: all: - variants: - - build_type=MinSizeRel require: - target=aarch64 concretizer: @@ -14,83 +12,58 @@ spack: reuse: false specs: # editors - - emacs+json~native+treesitter # TODO +native not supported until gcc builds on darwin - - nano - # - neovim + #- neovim~no_luajit # build fails: https://github.com/spack/spack/pull/48453#issuecomment-2624788262 - py-pynvim - - # runtimes and language compilers + - emacs+json~native+treesitter # TODO native not supported until gcc builds on darwin + # - tree-sitter is a dep, should also have cli but no package + - nano # just in case + # tags and scope search helpers + - universal-ctags # only maintained ctags, works better with c++ + - direnv + # runtimes and compilers + - python + - llvm+link_llvm_dylib+lld~lldb~polly+python build_type=MinSizeRel # for clangd, clang-format + - node-js # for editor plugins etc., pyright language server + - npm - cmake - - go - libtool - - llvm+link_llvm_dylib+lld~lldb~polly+python - - node-js - - npm - - python - - rust+dev - + - go # to build fzf, gh, hub + - rust+dev # fd, ripgrep, hyperfine, exa, rust-analyzer + # styling and lints + - astyle + # - cppcheck # need to resolve build error in ci context + - uncrustify + - py-fprettify + - py-fortran-language-server + - py-python-lsp-server # cli dev tools - - bfs - - ccache - # - difftastic # TODO investigate linker error here - - eza + - ripgrep + - gh - fd - - flex + - bfs - fzf - - gh - - git - - htop + - tree + - jq + - py-yq - hub + - ncdu + - eza + - lsd - hyperfine - - jq + - htop + - tmux + - ccache + # ensure we can use a jobserver build and do this fast + - gmake + - ninja # should be @kitware, can't be because of meson requirement - libtree - - lsd - - mergiraf - - ncdu - - py-yq - - ripgrep - sed - - tmux - - tree - which - - zoxide - - # styling and lints - - aspell - - astyle - # - cppcheck # TODO: investigate why this is not reproducible outside of runner - - py-black - - py-codespell - - py-flake8 - - py-fortran-language-server - - py-fprettify - - py-mypy - - py-python-lsp-ruff - - py-python-lsp-server - - py-ruff - - typos - - uncrustify - - gopls - - goimports - - # docs tools + - flex - graphviz - doxygen - - # shell integration tools - - direnv - - # container tools - - lima - - podman - - # tags and scope search helpers - - universal-ctags - - # ensure we can use a jobserver build and do this fast - - gmake - - ninja - meson + - lima ci: pipeline-gen: diff --git a/stacks/ml-linux-aarch64-cpu/spack.yaml b/stacks/ml-linux-aarch64-cpu/spack.yaml new file mode 100644 index 00000000000..fb3d31bd9aa --- /dev/null +++ b/stacks/ml-linux-aarch64-cpu/spack.yaml @@ -0,0 +1,82 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + + packages: + all: + target: ["aarch64"] + require: + - target=aarch64 + - ~cuda + - ~rocm + mpi: + require: openmpi + python: + require: "@3.13: target=aarch64" + py-jaxlib: + require: "target=aarch64 %c,cxx=clang" + py-tensorflow: + require: + - any_of: ["@:2.18 %c,cxx=gcc", "@2.19: %c,cxx=clang"] + - target=aarch64 + py-torch: + require: "target=aarch64 %c,cxx=gcc" + + specs: + # Hugging Face + - py-transformers + + # JAX + - py-jax + - py-jaxlib + + # Keras + - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch + + # PyTorch + - py-botorch + - py-gpytorch + - py-kornia + - py-lightning + - py-pytorch-lightning + - py-segmentation-models-pytorch + - py-timm + - py-torch + - py-torch-geometric + - py-torch-nvidia-apex + - py-torchaudio + - py-torchdata + - py-torchgeo + - py-torchmetrics + - py-torchvision + - py-vector-quantize-pytorch + + # scikit-learn + - py-scikit-learn + + # TensorBoard + - py-tensorboard + - py-tensorboardx + + # TensorFlow + - py-tensorflow + - py-tensorflow-datasets + - py-tensorflow-metadata + - py-tensorflow-probability + + # XGBoost + - py-xgboost + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + entrypoint: [''] + + cdash: + build-group: Machine Learning diff --git a/stacks/ml-linux-aarch64-cuda/spack.yaml b/stacks/ml-linux-aarch64-cuda/spack.yaml new file mode 100644 index 00000000000..e36acf82c24 --- /dev/null +++ b/stacks/ml-linux-aarch64-cuda/spack.yaml @@ -0,0 +1,94 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + packages: + all: + target: ["aarch64"] + require: + - target=aarch64 + - ~rocm + - +cuda + - cuda_arch=80 + llvm: + # https://github.com/spack/spack/issues/27999 + require: + - ~cuda + - target=aarch64 + mpi: + require: openmpi + python: + require: "@3.13: target=aarch64" + py-jaxlib: + require: "target=aarch64 %c,cxx=clang" + py-tensorflow: + require: + - any_of: ["@:2.18 %c,cxx=gcc", "@2.19: %c,cxx=clang"] + - target=aarch64 + py-torch: + require: + - target=aarch64 + - ~rocm + - +cuda + - cuda_arch=80 + - ~flash_attention + - "%c,cxx=gcc" + + specs: + # Hugging Face + - py-transformers + + # JAX + - py-jax + - py-jaxlib + + # Keras + - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch + + # PyTorch + - py-botorch + - py-gpytorch + - py-kornia + - py-lightning + - py-pytorch-lightning + - py-segmentation-models-pytorch + - py-timm + - py-torch + - py-torch-geometric + - py-torch-nvidia-apex + - py-torchaudio + - py-torchdata + - py-torchgeo + - py-torchmetrics + - py-torchvision + - py-vector-quantize-pytorch + + # scikit-learn + - py-scikit-learn + + # TensorBoard + - py-tensorboard + - py-tensorboardx + + # TensorFlow + - py-tensorflow + - py-tensorflow-datasets + - py-tensorflow-metadata + - py-tensorflow-probability + + # XGBoost + # xgboost requires older cuda, which doesn't support newer GCC + # - py-xgboost + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + entrypoint: [''] + + cdash: + build-group: Machine Learning diff --git a/stacks/ml-linux-aarch64/spack.yaml b/stacks/ml-linux-aarch64/spack.yaml deleted file mode 100644 index 38909e3b691..00000000000 --- a/stacks/ml-linux-aarch64/spack.yaml +++ /dev/null @@ -1,123 +0,0 @@ -spack: - view: false - - include: - - ../../.ci/gitlab/ - - packages: - all: - target: ["aarch64"] - require: - - target=aarch64 - mpi: - require: openmpi - python: - require: - - "@3.13: target=aarch64" - py-jaxlib: - require: - - "target=aarch64 %c,cxx=clang" - py-tensorflow: - require: - - "@2.19: target=aarch64 %c,cxx=clang" - py-torch: - require: - - "target=aarch64 %c,cxx=gcc" - - definitions: - - hugging_face_specs: - - py-transformers - - jax_specs: - - py-jax - - py-jaxlib - - keras_specs: - - py-keras backend=tensorflow - - py-keras backend=jax - - py-keras backend=torch - - torch_specs: - - py-botorch - - py-gpytorch - - py-kornia - - py-lightning - - py-pytorch-lightning - - py-segmentation-models-pytorch - - py-timm - - py-torch - - py-torch-geometric - - py-torch-nvidia-apex - - py-torchaudio - - py-torchdata - - py-torchgeo - - py-torchmetrics - - py-torchvision - - py-vector-quantize-pytorch - - scikit_learn_specs: - - py-scikit-learn - - tensorboard_specs: - - py-tensorboard - - py-tensorboardx - - tensorflow_specs: - - py-tensorflow - - py-tensorflow-datasets - - py-tensorflow-metadata - - py-tensorflow-probability - - xgboost_specs: - - py-xgboost - - specs: - - group: ml-linux-aarch64-cpu - specs: - - $hugging_face_specs - - $jax_specs - - $keras_specs - - $torch_specs - - $scikit_learn_specs - - $tensorboard_specs - - $tensorflow_specs - - $xgboost_specs - override: - packages: - all: - require: - - ~cuda - - ~rocm - - - group: ml-linux-aarch64-cuda - specs: - - $hugging_face_specs - - $jax_specs - - $keras_specs - - $torch_specs - - $scikit_learn_specs - - $tensorboard_specs - - $tensorflow_specs - # xgboost requires older cuda, which doesn't support newer GCC - # - $xgboost_specs - override: - packages: - all: - require: - - ~rocm - - +cuda - - cuda_arch=80 - llvm: - # https://github.com/spack/spack/issues/27999 - require: - - ~cuda - - target=aarch64 - py-torch: - require: - - ~rocm - - +cuda - - cuda_arch=80 - - ~flash_attention - - ci: - pipeline-gen: - - build-job: - image: - name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 - entrypoint: [''] - - cdash: - build-group: Machine Learning diff --git a/stacks/ml-linux-x86_64-cpu/spack.yaml b/stacks/ml-linux-x86_64-cpu/spack.yaml new file mode 100644 index 00000000000..6f78aed3e82 --- /dev/null +++ b/stacks/ml-linux-x86_64-cpu/spack.yaml @@ -0,0 +1,79 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + packages: + all: + target: ["x86_64_v3"] + require: + - target=x86_64_v3 + - ~cuda + - ~rocm + mpi: + require: openmpi + python: + require: "@3.13: target=x86_64_v3" + py-jaxlib: + require: "target=x86_64_v3 %c,cxx=clang" + py-tensorflow: + require: "target=x86_64_v3 %c,cxx=clang" + py-torch: + require: "target=x86_64_v3 %c,cxx=gcc" + + specs: + # Hugging Face + - py-transformers + + # JAX + - py-jax + - py-jaxlib + + # Keras + - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch + + # PyTorch + - py-botorch + - py-gpytorch + - py-kornia + - py-lightning + - py-pytorch-lightning + - py-segmentation-models-pytorch + - py-timm + - py-torch + - py-torch-geometric + - py-torch-nvidia-apex + - py-torchaudio + - py-torchdata + - py-torchgeo + - py-torchmetrics + - py-torchvision + - py-vector-quantize-pytorch + + # scikit-learn + - py-scikit-learn + + # TensorBoard + - py-tensorboard + - py-tensorboardx + + # TensorFlow + - py-tensorflow + - py-tensorflow-datasets + - py-tensorflow-metadata + - py-tensorflow-probability + + # XGBoost + - py-xgboost + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + entrypoint: [''] + + cdash: + build-group: Machine Learning diff --git a/stacks/ml-linux-x86_64-cuda/spack.yaml b/stacks/ml-linux-x86_64-cuda/spack.yaml new file mode 100644 index 00000000000..76ae08681ab --- /dev/null +++ b/stacks/ml-linux-x86_64-cuda/spack.yaml @@ -0,0 +1,92 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + packages: + all: + target: ["x86_64_v3"] + require: + - target=x86_64_v3 + - ~rocm + - +cuda + - cuda_arch=80 + llvm: + # https://github.com/spack/spack/issues/27999 + require: + - ~cuda + - target=x86_64_v3 + mpi: + require: openmpi + python: + require: "@3.13: target=x86_64_v3" + py-jaxlib: + require: "target=x86_64_v3 %c,cxx=clang" + py-tensorflow: + require: "target=x86_64_v3 %c,cxx=clang" + py-torch: + require: + - target=x86_64_v3 + - ~rocm + - +cuda + - cuda_arch=80 + - ~flash_attention + - "%c,cxx=gcc" + + specs: + # Hugging Face + - py-transformers + + # JAX + - py-jax + - py-jaxlib + + # Keras + - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch + + # PyTorch + - py-botorch + - py-gpytorch + - py-kornia + - py-lightning + - py-pytorch-lightning + - py-segmentation-models-pytorch + - py-timm + - py-torch + - py-torch-geometric + - py-torch-nvidia-apex + - py-torchaudio + - py-torchdata + - py-torchgeo + - py-torchmetrics + - py-torchvision + - py-vector-quantize-pytorch + + # scikit-learn + - py-scikit-learn + + # TensorBoard + - py-tensorboard + - py-tensorboardx + + # TensorFlow + - py-tensorflow + - py-tensorflow-datasets + - py-tensorflow-metadata + - py-tensorflow-probability + + # XGBoost + # xgboost requires older cuda, which doesn't support newer GCC + # - py-xgboost + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + entrypoint: [''] + + cdash: + build-group: Machine Learning diff --git a/stacks/ml-linux-x86_64-rocm/spack.yaml b/stacks/ml-linux-x86_64-rocm/spack.yaml new file mode 100644 index 00000000000..d4770306ddc --- /dev/null +++ b/stacks/ml-linux-x86_64-rocm/spack.yaml @@ -0,0 +1,93 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + packages: + all: + target: ["x86_64_v3"] + require: + - target=x86_64_v3 + - ~cuda + - +rocm + - amdgpu_target=gfx90a + eigen: + require: ~rocm target=x86_64_v3 + gl: + require: "osmesa" + mpi: + require: openmpi + python: + require: "@3.13: target=x86_64_v3" + py-jaxlib: + require: "target=x86_64_v3 %c,cxx=clang" + py-tensorflow: + require: "target=x86_64_v3 %c,cxx=clang" + py-torch: + require: + - target=x86_64_v3 + - ~cuda + - +rocm + - ~distributed + - amdgpu_target=gfx90a + - ~flash_attention + - "%c,cxx=gcc" + + specs: + # Hugging Face + - py-transformers + + # JAX + - py-jax + - py-jaxlib + + # Keras + - py-keras backend=tensorflow + # - py-keras backend=jax + # - py-keras backend=torch + + # PyTorch + # Does not yet support Spack-installed ROCm + # - py-botorch + # - py-gpytorch + # - py-kornia + # - py-lightning + # - py-pytorch-lightning + # - py-segmentation-models-pytorch + # - py-timm + - py-torch + # - py-torch-geometric + # - py-torch-nvidia-apex + # - py-torchaudio + # - py-torchdata + # - py-torchgeo + # - py-torchmetrics + # - py-torchvision + # - py-vector-quantize-pytorch + + # scikit-learn + - py-scikit-learn + + # TensorBoard + - py-tensorboard + - py-tensorboardx + + # TensorFlow + - py-tensorflow + - py-tensorflow-datasets + - py-tensorflow-metadata + - py-tensorflow-probability + + # XGBoost + # Does not yet support Spack-installed ROCm + # - py-xgboost + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 + entrypoint: [''] + + cdash: + build-group: Machine Learning diff --git a/stacks/ml-linux-x86_64/spack.yaml b/stacks/ml-linux-x86_64/spack.yaml deleted file mode 100644 index 6e66582f3e5..00000000000 --- a/stacks/ml-linux-x86_64/spack.yaml +++ /dev/null @@ -1,155 +0,0 @@ -spack: - view: false - - include: - - ../../.ci/gitlab/ - packages: - all: - target: ["x86_64_v3"] - require: - - target=x86_64_v3 - mpi: - require: openmpi - python: - require: "@3.13: target=x86_64_v3" - py-jaxlib: - require: "target=x86_64_v3 %c,cxx=clang" - py-tensorflow: - require: "target=x86_64_v3 %c,cxx=clang" - - definitions: - - hugging_face_specs: - - py-transformers - - jax_specs: - - py-jax - - py-jaxlib - - keras_specs: - - py-keras backend=tensorflow - - py-keras backend=jax - - py-keras backend=torch - - torch_specs: - - py-botorch - - py-gpytorch - - py-kornia - - py-lightning - - py-pytorch-lightning - - py-segmentation-models-pytorch - - py-timm - - py-torch - - py-torch-geometric - - py-torch-nvidia-apex - - py-torchaudio - - py-torchdata - - py-torchgeo - - py-torchmetrics - - py-torchvision - - py-vector-quantize-pytorch - - scikit_learn_specs: - - py-scikit-learn - - tensorboard_specs: - - py-tensorboard - - py-tensorboardx - - tensorflow_specs: - - py-tensorflow - - py-tensorflow-datasets - - py-tensorflow-metadata - - py-tensorflow-probability - - xgboost_specs: - - py-xgboost - specs: - - group: ml-linux-x86_64-cpu - specs: - - $hugging_face_specs - - $jax_specs - - $keras_specs - - $torch_specs - - $scikit_learn_specs - - $tensorboard_specs - - $tensorflow_specs - - $xgboost_specs - override: - packages: - all: - require: - - ~cuda - - ~rocm - py-torch: - require: "target=x86_64_v3 %c,cxx=gcc" - - - group: ml-linux-x86_64-cuda - specs: - - $hugging_face_specs - - $jax_specs - - $keras_specs - - $torch_specs - - $scikit_learn_specs - - $tensorboard_specs - - $tensorflow_specs - # xgboost requires older cuda, which doesn't support newer GCC - # - $xgboost_specs - override: - packages: - all: - require: - - ~rocm - - +cuda - - cuda_arch=80 - llvm: - # https://github.com/spack/spack/issues/27999 - require: - - ~cuda - - target=x86_64_v3 - py-torch: - require: - - target=x86_64_v3 - - ~rocm - - +cuda - - cuda_arch=80 - - ~flash_attention - - "%c,cxx=gcc" - - - group: ml-linux-x86_64-rocm - specs: - - $hugging_face_specs - - $jax_specs - - matrix: - - [$keras_specs] - exclude: - - py-keras backend=torch - # Does not yet support Spack-installed ROCm - # - $torch_specs - - $scikit_learn_specs - - $tensorboard_specs - - $tensorflow_specs - # Does not yet support Spack-installed ROCm - # - $xgboost_specs - override: - packages: - all: - require: - - ~cuda - - +rocm - - amdgpu_target=gfx90a - eigen: - require: - - ~rocm target=x86_64_v3 - gl: - require: "osmesa" - py-torch: - require: - - target=x86_64_v3 - - ~cuda - - +rocm - - amdgpu_target=gfx90a - - ~flash_attention - - "%c,cxx=gcc" - - ci: - pipeline-gen: - - build-job: - image: - name: ghcr.io/spack/ubuntu-24.04:v2025-09-15 - entrypoint: [''] - - cdash: - build-group: Machine Learning diff --git a/stacks/radiuss-cuda/spack.yaml b/stacks/radiuss-cuda/spack.yaml new file mode 100644 index 00000000000..66aaccb1500 --- /dev/null +++ b/stacks/radiuss-cuda/spack.yaml @@ -0,0 +1,49 @@ +spack: + view: false + + include: + - ../../.ci/gitlab/ + + packages: + all: + variants: +mpi cuda_arch=70 + require: + - target=x86_64_v3 + blas: + require: + - openblas + mkl: + require: + - intel-oneapi-mkl + mpi: + require: + - one_of: + - openmpi + - mpich + + specs: + - ascent + - blt + - caliper + - caliper +cuda + - camp + - camp +cuda + - chai + - chai +cuda +raja + - mfem + - mfem +superlu-dist+petsc+sundials + - mfem +cuda ^hypre+cuda + - raja + - raja +cuda + - umpire + - umpire +cuda + + ci: + pipeline-gen: + - build-job: + image: + name: ghcr.io/spack/ubuntu-24.04:v2024-09-05-v2 + entrypoint: [''] + + cdash: + build-group: RADIUSS CUDA Packages diff --git a/stacks/radiuss/spack.yaml b/stacks/radiuss/spack.yaml index f793bbd9e6c..8cb43f9ae5b 100644 --- a/stacks/radiuss/spack.yaml +++ b/stacks/radiuss/spack.yaml @@ -9,75 +9,43 @@ spack: target: [ "x86_64_v3" ] require: - target=x86_64_v3 + - ~cuda + - ~rocm mpi: - require: - - openmpi + require: openmpi concretizer: unify: false reuse: false specs: - - group: radiuss-cpu - specs: - - ascent - - axom - - blt - - caliper - - care - - chai - - conduit - - flux-core - - hypre - - lbann - # - lvarray@develop ~tests #concretization fails for some reason - - mfem - - py-hatchet - - py-maestrowf - - py-merlin - - py-shroud - # - quandary # package needs to specify a version - - raja - - raja-perf - - samrai - - scr - - sundials - - umpire - # - visit # ^mesa-glu@9.0.0 - - xbraid - - zfp - override: - packages: - all: - require: - - ~cuda - - ~rocm - - - group: radiuss-cuda - specs: - - ascent - - blt - - caliper - - caliper +cuda - - camp - - camp +cuda - - chai - - chai +cuda +raja - - mfem - - mfem +superlu-dist+petsc+sundials - - mfem +cuda ^hypre+cuda - - raja - - raja +cuda - - umpire - - umpire +cuda - override: - packages: - all: - variants: +mpi cuda_arch=70 - blas: - require: [openblas] - mkl: - require: [intel-oneapi-mkl] + - ascent # ^conduit@0.6.0 + - axom + - blt + - caliper + - care # ~benchmarks ~examples ~tests + - chai # ~examples + - conduit # ^hdf5+shared + - flux-core + # - flux-sched + - hypre + - lbann + # - lvarray@develop ~tests #concretization fails for some reason + - mfem # does not work with gcc 7 + - py-hatchet + - py-maestrowf + - py-merlin + - py-shroud + # - quandary # package needs to specify a version + - raja # ~examples # ~tests + - raja-perf + - samrai + - scr + - sundials + - umpire # ~openmp + # - visit # ^mesa-glu@9.0.0 + - xbraid + - zfp ci: pipeline-gen: diff --git a/stacks/tutorial/spack.yaml b/stacks/tutorial/spack.yaml index 53167dce4f5..f1663375616 100644 --- a/stacks/tutorial/spack.yaml +++ b/stacks/tutorial/spack.yaml @@ -3,71 +3,52 @@ spack: include: - ../../.ci/gitlab/ - packages: all: - require: - - target=x86_64_v3 + require: target=x86_64_v3 tbb: require: intel-tbb - - specs: - - group: compiler - specs: - - gcc@12 ~binutils - - - group: "gcc@11 specs" - specs: - - zlib-ng@2.2.4 - - zlib-ng@2.0.7 - - zlib-ng@2.0.7 cflags=-O3 - - tcl ^zlib-ng@2.2.4 - - tcl ^zlib-ng@2.0.7 cflags=-O3 - - hdf5+mpi^openmpi - - hdf5~mpi - - hdf5+hl+mpi ^mpich - - trilinos ^openmpi - - trilinos +hdf5 ^hdf5+hl+mpi ^mpich - - mpileaks - - lmod@8.7.18 - - environment-modules - - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran - - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp - - vim - override: - packages: - c: - prefer: [gcc@11] - cxx: - prefer: [gcc@11] - fortran: - prefer: [gcc@11] - - - group: scalapacks - needs: [compiler] - specs: + definitions: + - gcc_system_packages: + - matrix: + - - zlib-ng + - zlib-ng@2.0.7 + - zlib-ng@2.0.7 cflags=-O3 + - tcl + - tcl ^zlib-ng@2.0.7 cflags=-O3 + - hdf5 + - hdf5~mpi + - hdf5+hl+mpi ^mpich + - trilinos + - trilinos +hdf5 ^hdf5+hl+mpi ^mpich + - gcc@12.3 ~binutils # todo: enable ~binutils once unify: true is used + - mpileaks + - lmod@8.7.18 + - environment-modules + - macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran + - julia@1.9 ^llvm ~clang ~gold ~lldb ~lua ~polly compiler-rt=none libcxx=none libunwind=none targets=x86 ^openblas threads=openmp + - vim + - ['%gcc@11'] + - gcc_old_packages: + - zlib-ng%gcc@10 + - clang_packages: + - matrix: + - [zlib-ng, tcl ^zlib-ng@2.0.7] + - ['%clang@14'] + - gcc_spack_built_packages: - matrix: - [netlib-scalapack] - [^mpich, ^openmpi] - [^openblas, ^netlib-lapack] + - ['%gcc@12'] - matrix: - [py-scipy ^openblas, armadillo ^openblas, netlib-lapack, openmpi, mpich, elpa ^mpich] - override: - packages: - c: - prefer: [gcc@12] - cxx: - prefer: [gcc@12] - fortran: - prefer: [gcc@12] - # Miscellaneous specs use the default group - - zlib-ng@2.2.4%gcc@10 - - matrix: - - [ zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7 ] - - [ '%clang@14' ] - - concretizer: - unify: false + - ['%gcc@12'] + specs: + - $gcc_system_packages + - $gcc_old_packages + - $clang_packages + - $gcc_spack_built_packages ci: pipeline-gen: @@ -75,6 +56,5 @@ spack: image: name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30 entrypoint: [''] - cdash: build-group: Spack Tutorial