summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/anaconda2/package.py158
-rw-r--r--var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch16
-rw-r--r--var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch16
-rw-r--r--var/spack/repos/builtin/packages/bazel/build-0.29.1.patch61
-rw-r--r--var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch24
-rw-r--r--var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch24
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.13.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.16.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.21.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.3.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.4.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.6.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/compile-0.9.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch11
-rw-r--r--var/spack/repos/builtin/packages/bazel/package.py417
-rw-r--r--var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch22
-rw-r--r--var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch24
-rw-r--r--var/spack/repos/builtin/packages/catalyst/package.py208
-rw-r--r--var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch487
-rw-r--r--var/spack/repos/builtin/packages/gaudi/package.py18
-rw-r--r--var/spack/repos/builtin/packages/hercules/package.py25
-rw-r--r--var/spack/repos/builtin/packages/libpeas/package.py109
-rw-r--r--var/spack/repos/builtin/packages/mxnet/package.py2
-rw-r--r--var/spack/repos/builtin/packages/node-js/package.py5
-rw-r--r--var/spack/repos/builtin/packages/of-catalyst/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-automl-core/package.py16
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py28
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py25
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-dataprep/package.py12
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py18
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-pipeline/package.py16
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-sdk/package.py24
-rw-r--r--var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py20
-rw-r--r--var/spack/repos/builtin/packages/py-cnvkit/package.py27
-rw-r--r--var/spack/repos/builtin/packages/py-cvxopt/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-cython/package.py5
-rw-r--r--var/spack/repos/builtin/packages/py-dask-glm/package.py25
-rw-r--r--var/spack/repos/builtin/packages/py-inference-schema/package.py34
-rw-r--r--var/spack/repos/builtin/packages/py-itk/package.py37
-rw-r--r--var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py44
-rw-r--r--var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py27
-rw-r--r--var/spack/repos/builtin/packages/py-jupyterlab/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-labours/package.py34
-rw-r--r--var/spack/repos/builtin/packages/py-llvmlite/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-maestrowf/package.py14
-rw-r--r--var/spack/repos/builtin/packages/py-merlin/package.py24
-rw-r--r--var/spack/repos/builtin/packages/py-meson-python/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-nibetaseries/package.py16
-rw-r--r--var/spack/repos/builtin/packages/py-numba/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch347
-rw-r--r--var/spack/repos/builtin/packages/py-numpy/check_executables4.patch16
-rw-r--r--var/spack/repos/builtin/packages/py-numpy/package.py27
-rw-r--r--var/spack/repos/builtin/packages/py-pandas/package.py15
-rw-r--r--var/spack/repos/builtin/packages/py-pillow/package.py8
-rw-r--r--var/spack/repos/builtin/packages/py-psycopg2/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-pycairo/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-pygit2/package.py5
-rw-r--r--var/spack/repos/builtin/packages/py-pyqt4/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-pyqt5/package.py15
-rw-r--r--var/spack/repos/builtin/packages/py-pyrosar/package.py27
-rw-r--r--var/spack/repos/builtin/packages/py-pyscf/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-pyspark/package.py9
-rw-r--r--var/spack/repos/builtin/packages/py-qiskit-terra/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-quantities/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-rasterio/package.py5
-rw-r--r--var/spack/repos/builtin/packages/py-scikit-learn/package.py15
-rw-r--r--var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py22
-rw-r--r--var/spack/repos/builtin/packages/py-scipy/package.py13
-rw-r--r--var/spack/repos/builtin/packages/py-shared-memory38/package.py22
-rw-r--r--var/spack/repos/builtin/packages/py-tap-py/package.py20
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch76
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch12
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch14
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch14
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch14
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch14
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch57
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch18
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/package.py294
-rw-r--r--var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch53
-rw-r--r--var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch76
-rw-r--r--var/spack/repos/builtin/packages/py-torch/package.py55
-rw-r--r--var/spack/repos/builtin/packages/py-torchvision/package.py12
-rw-r--r--var/spack/repos/builtin/packages/py-tuiview/package.py11
-rw-r--r--var/spack/repos/builtin/packages/py-x21/package.py20
87 files changed, 100 insertions, 3424 deletions
diff --git a/var/spack/repos/builtin/packages/anaconda2/package.py b/var/spack/repos/builtin/packages/anaconda2/package.py
deleted file mode 100644
index 765a90505b..0000000000
--- a/var/spack/repos/builtin/packages/anaconda2/package.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from os.path import split
-
-from spack.package import *
-from spack.util.environment import EnvironmentModifications
-
-
-class Anaconda2(Package):
- """Anaconda is a free and open-source distribution of the Python and
- R programming languages for scientific computing, that aims to
- simplify package management and deployment. Package versions are
- managed by the package management system conda.
- """
-
- homepage = "https://www.anaconda.com"
- url = "https://repo.anaconda.com/archive/Anaconda2-2019.10-Linux-x86_64.sh"
-
- maintainers("ajkotobi")
-
- version(
- "2019.10",
- sha256="8b2e7dea2da7d8cc18e822e8ec1804052102f4eefb94c1b3d0e586e126e8cd2f",
- expand=False,
- deprecated=True,
- )
- version(
- "2019.07",
- sha256="189e16e7adf9ba4b7b7d06ecdc10ce4ad4153e5e3505b9331f3d142243e18e97",
- expand=False,
- deprecated=True,
- )
- version(
- "2019.03",
- sha256="cedfee5b5a3f62fcdac0a1d2d12396d0f232d2213d24d6dc893df5d8e64b8773",
- expand=False,
- deprecated=True,
- )
- version(
- "2018.12",
- sha256="1821d4b623ed449e0acb6df3ecbabd3944cffa98f96a5234b7a102a7c0853dc6",
- expand=False,
- deprecated=True,
- )
- version(
- "5.3.1",
- sha256="f0650ad2f9ca4ae3f3162d7204a32950bc794f37f322eb47b5ad9412454f998c",
- expand=False,
- deprecated=True,
- )
- version(
- "5.3.0",
- sha256="50eeaab24bfa2472bc6485fe8f0e612ed67e561eda1ff9fbf07b62c96443c1be",
- expand=False,
- deprecated=True,
- )
- version(
- "5.2.0",
- sha256="cb0d7a08b0e2cec4372033d3269979b4e72e2353ffd1444f57cb38bc9621219f",
- expand=False,
- deprecated=True,
- )
- version(
- "5.1.0",
- sha256="5f26ee92860d1dffdcd20910ff2cf75572c39d2892d365f4e867a611cca2af5b",
- expand=False,
- deprecated=True,
- )
- version(
- "5.0.1",
- sha256="23c676510bc87c95184ecaeb327c0b2c88007278e0d698622e2dd8fb14d9faa4",
- expand=False,
- deprecated=True,
- )
- version(
- "5.0.0.1",
- sha256="18730808d863a5c194ab3f59dd395c1a63cbd769c9bfb1df65efe61ee62fc6d6",
- expand=False,
- deprecated=True,
- )
- version(
- "5.0.0",
- sha256="58a7117f89c40275114bf7e824a613a963da2b0fe63f2ec3c1175fea785b468e",
- expand=False,
- deprecated=True,
- )
- version(
- "4.4.0",
- sha256="2d30b91ed4d215b6b4a15162a3389e9057b15445a0c02da71bd7bd272e7b824e",
- expand=False,
- deprecated=True,
- )
- version(
- "4.3.1",
- sha256="e9b8f2645df6b1527ba56d61343162e0794acc3ee8dde2a6bba353719e2d878d",
- expand=False,
- deprecated=True,
- )
- version(
- "4.3.0",
- sha256="7c52e6e99aabb24a49880130615a48e685da444c3c14eb48d6a65f3313bf745c",
- expand=False,
- deprecated=True,
- )
- version(
- "4.2.0",
- sha256="beee286d24fb37dd6555281bba39b3deb5804baec509a9dc5c69185098cf661a",
- expand=False,
- deprecated=True,
- )
- version(
- "4.1.1",
- sha256="9413b1d3ca9498ba6f53913df9c43d685dd973440ff10b7fe0c45b1cbdcb582e",
- expand=False,
- deprecated=True,
- )
- version(
- "4.1.0",
- sha256="3b7e504ca0132fb555d1f10e174cae07007f1bc6898cad0f7d416a68aca01f45",
- expand=False,
- deprecated=True,
- )
- version(
- "4.0.0",
- sha256="ae312143952ca00e061a656c2080e0e4fd3532721282ba8e2978177cad71a5f0",
- expand=False,
- deprecated=True,
- )
- version(
- "2.5.0",
- sha256="e10abf459cde4a838bd6fc5ca03023c3401b81ad470627acde5a298d56715321",
- expand=False,
- deprecated=True,
- )
- version(
- "2.4.1",
- sha256="2de682c96edf8cca2852071a84ff860025fbe8c502218e1995acd5ab47e8c9ac",
- expand=False,
- deprecated=True,
- )
- version(
- "2.4.0",
- sha256="49d19834da06b1b82b6fa85bc647d2e78fa5957d0cbae3ccd6c695a541befa6b",
- expand=False,
- deprecated=True,
- )
-
- def install(self, spec, prefix):
- dir, anaconda_script = split(self.stage.archive_file)
- bash = which("bash")
- bash(anaconda_script, "-b", "-f", "-p", self.prefix)
-
- def setup_run_environment(self, env):
- filename = self.prefix.etc.join("profile.d").join("conda.sh")
- env.extend(EnvironmentModifications.from_sourcing_file(filename))
diff --git a/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch b/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch
deleted file mode 100644
index e6a974a98a..0000000000
--- a/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
-@@ -150,6 +150,13 @@
- builder.put("PATH", null);
- builder.put("LD_LIBRARY_PATH", null);
- }
-+
-+ Map<String, String> spackEnv = System.getenv();
-+ for (String envName : spackEnv.keySet()) {
-+ if (envName.startsWith("SPACK_")) {
-+ builder.put(envName, spackEnv.get(envName));
-+ }
-+ }
- }
-
- private static PathFragment determineShellExecutable(OS os, PathFragment fromOption) {
diff --git a/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch b/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch
deleted file mode 100644
index b0aebdf359..0000000000
--- a/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-@@ -168,6 +168,13 @@ public class BazelRuleClassProvider {
- env.put("PATH", null);
- }
-
-+ Map<String, String> spackEnv = System.getenv();
-+ for (String envName : spackEnv.keySet()) {
-+ if (envName.startsWith("SPACK_")) {
-+ env.put(envName, spackEnv.get(envName));
-+ }
-+ }
-+
- // Shell environment variables specified via options take precedence over the
- // ones inherited from the fragments. In the long run, these fragments will
- // be replaced by appropriate default rc files anyway.
diff --git a/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch b/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch
deleted file mode 100644
index c3ed9ab254..0000000000
--- a/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9c9d27561780bc56d9f0867e325c7421a94ee1cb Mon Sep 17 00:00:00 2001
-From: Harsh Bhatia <bhatia4@llnl.gov>
-Date: Tue, 15 Dec 2020 15:56:10 -0800
-Subject: [PATCH] https://github.com/bazelbuild/bazel/commit/ab62a6e097590dac5ec946ad7a796ea0e8593ae0
-
----
- src/conditions/BUILD | 6 ++++++
- third_party/BUILD | 8 ++++++--
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/conditions/BUILD b/src/conditions/BUILD
-index 2b28e28057..faa41a439d 100644
---- a/src/conditions/BUILD
-+++ b/src/conditions/BUILD
-@@ -10,6 +10,12 @@ filegroup(
- visibility = ["//src:__pkg__"],
- )
-
-+config_setting(
-+ name = "linux_ppc",
-+ values = {"cpu": "ppc"},
-+ visibility = ["//visibility:public"],
-+)
-+
- config_setting(
- name = "linux_x86_64",
- values = {"cpu": "k8"},
-diff --git a/third_party/BUILD b/third_party/BUILD
-index 159006d741..4fcae54c00 100644
---- a/third_party/BUILD
-+++ b/third_party/BUILD
-@@ -523,12 +523,13 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({
- "//src/conditions:darwin": "*.so *.dll",
- "//src/conditions:darwin_x86_64": "*.so *.dll",
- "//src/conditions:linux_x86_64": "*.jnilib *.dll",
-+ "//src/conditions:linux_ppc": "*.so *.jnilib *.dll",
- # The .so file is an x86 one, so we can just remove it if the CPU is not x86
- "//src/conditions:arm": "*.so *.jnilib *.dll",
- "//src/conditions:linux_aarch64": "*.so *.jnilib *.dll",
- # Play it safe -- better have a big binary than a slow binary
- # zip -d does require an argument. Supply something bogus.
-- "//conditions:default": "*.bogusextension",
-+ "//conditions:default": "",
- })
-
- # Remove native libraries that are for a platform different from the one we are
-@@ -537,7 +538,10 @@ genrule(
- name = "filter_netty_dynamic_libs",
- srcs = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.24.Final.jar"],
- outs = ["netty_tcnative/netty-tcnative-filtered.jar"],
-- cmd = "cp $< $@ && zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES,
-+ cmd = "cp $< $@ && " +
-+ # End successfully if there is nothing to be deleted from the archive
-+ "if [ -n '" + UNNECESSARY_DYNAMIC_LIBRARIES + "' ]; then " +
-+ "zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES + "; fi",
- )
-
- java_import(
---
-2.21.0 (Apple Git-122.2)
-
diff --git a/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch b/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch
deleted file mode 100644
index 79e12269a6..0000000000
--- a/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/cpp/cc_configure.bzl
-+++ b/tools/cpp/cc_configure.bzl
-@@ -173,8 +173,19 @@
- else:
- inc_dirs = result.stderr[index1 + 1:index2].strip()
-
-- return [repository_ctx.path(_cxx_inc_convert(p))
-- for p in inc_dirs.split("\n")]
-+ default_inc_directories = [
-+ repository_ctx.path(_cxx_inc_convert(p))
-+ for p in inc_dirs.split("\n")
-+ ]
-+
-+ env = repository_ctx.os.environ
-+ if "SPACK_INCLUDE_DIRS" in env:
-+ for path in env["SPACK_INCLUDE_DIRS"].split(":"):
-+ default_inc_directories.append(
-+ repository_ctx.path(_cxx_inc_convert(path))
-+ )
-+
-+ return default_inc_directories
-
- def _add_option_if_supported(repository_ctx, cc, option):
- """Checks that `option` is supported by the C compiler."""
diff --git a/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch b/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch
deleted file mode 100644
index 470986bec6..0000000000
--- a/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/cpp/cc_configure.bzl
-+++ b/tools/cpp/cc_configure.bzl
-@@ -200,8 +200,19 @@
- else:
- inc_dirs = result.stderr[index1 + 1:index2].strip()
-
-- return [_escape_string(repository_ctx.path(_cxx_inc_convert(p)))
-- for p in inc_dirs.split("\n")]
-+ default_inc_directories = [
-+ _escape_string(repository_ctx.path(_cxx_inc_convert(p)))
-+ for p in inc_dirs.split("\n")
-+ ]
-+
-+ env = repository_ctx.os.environ
-+ if "SPACK_INCLUDE_DIRS" in env:
-+ for path in env["SPACK_INCLUDE_DIRS"].split(":"):
-+ default_inc_directories.append(
-+ repository_ctx.path(_cxx_inc_convert(path))
-+ )
-+
-+ return default_inc_directories
-
-
- def _add_option_if_supported(repository_ctx, cc, option):
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.13.patch b/var/spack/repos/builtin/packages/bazel/compile-0.13.patch
deleted file mode 100644
index 13c82e7631..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -92,7 +92,7 @@
- log "Building output/bazel"
- # We set host and target platform directly since the defaults in @bazel_tools
- # have not yet been generated.
--bazel_build "src:bazel${EXE_EXT}" \
-+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \
- --host_platform=@bazel_tools//platforms:host_platform \
- --platforms=@bazel_tools//platforms:target_platform \
- || fail "Could not build Bazel"
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.16.patch b/var/spack/repos/builtin/packages/bazel/compile-0.16.patch
deleted file mode 100644
index f61f521a15..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -92,7 +92,7 @@ display "."
- log "Building output/bazel"
- # We set host and target platform directly since the defaults in @bazel_tools
- # have not yet been generated.
--bazel_build "src:bazel_nojdk${EXE_EXT}" \
-+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel_nojdk${EXE_EXT}" \
- --host_platform=@bazel_tools//platforms:host_platform \
- --platforms=@bazel_tools//platforms:target_platform \
- || fail "Could not build Bazel"
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.21.patch b/var/spack/repos/builtin/packages/bazel/compile-0.21.patch
deleted file mode 100644
index d666a0f055..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.21.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -92,7 +92,7 @@ display "."
- log "Building output/bazel"
- # We set host and target platform directly since the defaults in @bazel_tools
- # have not yet been generated.
--bazel_build "src:bazel_nojdk${EXE_EXT}" \
-+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel_nojdk${EXE_EXT}" \
- --action_env=PATH \
- --host_platform=@bazel_tools//platforms:host_platform \
- --platforms=@bazel_tools//platforms:target_platform \
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.3.patch b/var/spack/repos/builtin/packages/bazel/compile-0.3.patch
deleted file mode 100644
index 82db6efb6e..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -99,7 +99,7 @@
- new_step 'Building Bazel with Bazel'
- display "."
- log "Building output/bazel"
-- bazel_build "src:bazel${EXE_EXT}"
-+ CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}"
- cp -f "bazel-bin/src/bazel${EXE_EXT}" "output/bazel${EXE_EXT}"
- chmod 0755 "output/bazel${EXE_EXT}"
- BAZEL="$(pwd)/output/bazel${EXE_EXT}"
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.4.patch b/var/spack/repos/builtin/packages/bazel/compile-0.4.patch
deleted file mode 100644
index 80eab26a88..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -124,7 +124,7 @@
- new_step 'Building Bazel with Bazel'
- display "."
- log "Building output/bazel"
-- bazel_build "src:bazel${EXE_EXT}" \
-+ CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \
- || fail "Could not build Bazel"
- bazel_bin_path="$(get_bazel_bin_path)/src/bazel${EXE_EXT}"
- [ -e "$bazel_bin_path" ] \
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.6.patch b/var/spack/repos/builtin/packages/bazel/compile-0.6.patch
deleted file mode 100644
index 64eb408e5d..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -85,7 +85,7 @@
- log "Building output/bazel"
- # We set host and target platform directly since the defaults in @bazel_tools
- # have not yet been generated.
--bazel_build "src:bazel${EXE_EXT}" \
-+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \
- --experimental_host_platform=//tools/platforms:host_platform \
- --experimental_platforms=//tools/platforms:target_platform \
- || fail "Could not build Bazel"
diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.9.patch b/var/spack/repos/builtin/packages/bazel/compile-0.9.patch
deleted file mode 100644
index 135de3a00f..0000000000
--- a/var/spack/repos/builtin/packages/bazel/compile-0.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -92,7 +92,7 @@
- log "Building output/bazel"
- # We set host and target platform directly since the defaults in @bazel_tools
- # have not yet been generated.
--bazel_build "src:bazel${EXE_EXT}" \
-+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \
- --host_platform=//tools/platforms:host_platform \
- --platforms=//tools/platforms:target_platform \
- || fail "Could not build Bazel"
diff --git a/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch b/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch
deleted file mode 100644
index dd23972d99..0000000000
--- a/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java.orig 2020-06-08 13:42:14.035342560 -0400
-+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java 2020-06-08 13:42:25.149375458 -0400
-@@ -963,7 +963,7 @@
- // are, it's probably due to a non-hermetic #include, & we should stop
- // the build with an error.
- if (execPath.startsWith(execRoot)) {
-- execPathFragment = execPath.relativeTo(execRoot); // funky but tolerable path
-+ // execPathFragment = execPath.relativeTo(execRoot); // funky but tolerable path
- } else {
- problems.add(execPathFragment.getPathString());
- continue;
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py
index 705eef43b9..abecafb08d 100644
--- a/var/spack/repos/builtin/packages/bazel/package.py
+++ b/var/spack/repos/builtin/packages/bazel/package.py
@@ -55,356 +55,6 @@ class Bazel(Package):
version("2.1.0", sha256="3371cd9050989173a3b27364668328653a65653a50a85c320adc53953b4d5f46")
version("2.0.1", sha256="a863ed9e6fc420fbd92e63a12fe1a5b9be1a7a36f11f61f1fdc582c813bbe543")
version("2.0.0", sha256="724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb")
- version(
- "1.2.1",
- sha256="255da49d0f012bc4f2c1d6d3ccdbe578e22fe97b8d124e1629a486fe2a09d3e1",
- deprecated=True,
- )
- version(
- "1.2.0",
- sha256="9cb46b0a18b9166730307a0e82bf4c02281a1cc6da0fb11239e6fe4147bdee6e",
- deprecated=True,
- )
- version(
- "1.1.0",
- sha256="4b66a8c93af7832ed32e7236cf454a05f3aa06d25a8576fc3f83114f142f95ab",
- deprecated=True,
- )
- version(
- "1.0.1",
- sha256="f4d2dfad011ff03a5fae41b9b02cd96cd7297c1205d496603d66516934fbcfee",
- deprecated=True,
- )
- version(
- "1.0.0",
- sha256="c61daf0b69dd95205c695b2f9022d296d052c727062cfd396d54ffb2154f8cac",
- deprecated=True,
- )
- version(
- "0.29.1",
- sha256="872a52cff208676e1169b3e1cae71b1fe572c4109cbd66eab107d8607c378de5",
- deprecated=True,
- )
- version(
- "0.29.0",
- sha256="01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a",
- deprecated=True,
- )
- version(
- "0.28.1",
- sha256="2cea463d611f5255d2f3d41c8de5dcc0961adccb39cf0ac036f07070ba720314",
- deprecated=True,
- )
- version(
- "0.28.0",
- sha256="26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f",
- deprecated=True,
- )
- version(
- "0.27.2",
- sha256="5e1bf2b48e54eb7e518430667d29aef53695d6dd7c718665a52131ab27aadab2",
- deprecated=True,
- )
- version(
- "0.27.1",
- sha256="8051d77da4ec338acd91770f853e4c25f4407115ed86fd35a6de25921673e779",
- deprecated=True,
- )
- version(
- "0.27.0",
- sha256="c3080d3b959ac08502ad5c84a51608c291accb1481baad88a628bbf79b30c67a",
- deprecated=True,
- )
- version(
- "0.26.1",
- sha256="c0e94f8f818759f3f67af798c38683520c540f469cb41aea8f5e5a0e43f11600",
- deprecated=True,
- )
- version(
- "0.26.0",
- sha256="d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2",
- deprecated=True,
- )
- version(
- "0.25.3",
- sha256="23eafd3e439bc71baba9c592b52cb742dabc8640a13b9da1751fec090a2dda99",
- deprecated=True,
- )
- version(
- "0.25.2",
- sha256="7456032199852c043e6c5b3e4c71dd8089c1158f72ec554e6ec1c77007f0ab51",
- deprecated=True,
- )
- version(
- "0.25.1",
- sha256="a52bb31aeb1f821e649d25ef48023cfb54a12887aff875c6349ebcac36c2f056",
- deprecated=True,
- )
- version(
- "0.25.0",
- sha256="f624fe9ca8d51de192655369ac538c420afb7cde16e1ad052554b582fff09287",
- deprecated=True,
- )
- version(
- "0.24.1",
- sha256="56ea1b199003ad832813621744178e42b39e6206d34fbae342562c287da0cd54",
- deprecated=True,
- )
- version(
- "0.24.0",
- sha256="621d2a97899a88850a913eabf9285778331a309fd4658b225b1377f80060fa85",
- deprecated=True,
- )
- version(
- "0.23.2",
- sha256="293a5a7d851e0618eeb5e6958d94a11d45b6a00f2ba9376de61ac2bd5f917439",
- deprecated=True,
- )
- version(
- "0.23.1",
- sha256="dd47199f92452bf67b2c5d60ad4b7143554eaf2c6196ab6e8713449d81a0491d",
- deprecated=True,
- )
- version(
- "0.23.0",
- sha256="2daf9c2c6498836ed4ebae7706abb809748b1350cacd35b9f89452f31ac0acc1",
- deprecated=True,
- )
- version(
- "0.22.0",
- sha256="6860a226c8123770b122189636fb0c156c6e5c9027b5b245ac3b2315b7b55641",
- deprecated=True,
- )
- version(
- "0.21.0",
- sha256="6ccb831e683179e0cfb351cb11ea297b4db48f9eab987601c038aa0f83037db4",
- deprecated=True,
- )
- version(
- "0.20.0",
- sha256="1945afa84fd8858b0a3c68c09915a4bc81065c61df2591387b2985e2297d30bd",
- deprecated=True,
- )
- version(
- "0.19.2",
- sha256="11234cce4f6bdc62c3ac688f41c7b5c178eecb6f7e2c4ba0bcf00ba8565b1d19",
- deprecated=True,
- )
- version(
- "0.19.1",
- sha256="c9405f7b8c79ebc81f9f0e49bb656df4a0da246771d010c2cdd6bb30e2500ac0",
- deprecated=True,
- )
- version(
- "0.19.0",
- sha256="ee6135c5c47306c8421d43ad83aabc4f219cb065376ee37797f2c8ba9a615315",
- deprecated=True,
- )
- version(
- "0.18.1",
- sha256="baed9f28c317000a4ec1ad2571b3939356d22746ca945ac2109148d7abb860d4",
- deprecated=True,
- )
- version(
- "0.18.0",
- sha256="d0e86d2f7881ec8742a9823a986017452d2da0dfe4e989111da787cb89257155",
- deprecated=True,
- )
- version(
- "0.17.2",
- sha256="b6e87acfa0a405bb8b3417c58477b66d5bc27dc0d31ba6fa12bc255b9278d33b",
- deprecated=True,
- )
- version(
- "0.17.1",
- sha256="23e4281c3628cbd746da3f51330109bbf69780bd64461b63b386efae37203f20",
- deprecated=True,
- )
- version(
- "0.16.1",
- sha256="09c66b94356c82c52f212af52a81ac28eb06de1313755a2f23eeef84d167b36c",
- deprecated=True,
- )
- version(
- "0.16.0",
- sha256="c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1",
- deprecated=True,
- )
- version(
- "0.15.2",
- sha256="bf53ec73be3a6d412d85ef612cec6e9c85db45da42001fab0cf1dad44cfc03f1",
- deprecated=True,
- )
- version(
- "0.15.1",
- sha256="c62b351fa4c1ba5aeb34d0a137176f8e8f1d89a32f548a10e96c11df176ffc6c",
- deprecated=True,
- )
- version(
- "0.15.0",
- sha256="c3b716e6625e6b8c323350c95cd3ae0f56aeb00458dddd10544d5bead8a7b602",
- deprecated=True,
- )
- version(
- "0.14.1",
- sha256="d49cdcd82618ae7a7a190e6f0a80d9bf85c1a66b732f994f37732dc14ffb0025",
- deprecated=True,
- )
- version(
- "0.14.0",
- sha256="259627de8b9d415cc80904523facf3d50e6e8e68448ab968eb1c9cb8ca1ef843",
- deprecated=True,
- )
- version(
- "0.13.1",
- sha256="b0269e75b40d87ff87886e5f3432cbf88f70c96f907ab588e6c21b2922d72db0",
- deprecated=True,
- )
- version(
- "0.13.0",
- sha256="82e9035084660b9c683187618a29aa896f8b05b5f16ae4be42a80b5e5b6a7690",
- deprecated=True,
- )
- version(
- "0.12.0",
- sha256="3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754",
- deprecated=True,
- )
- version(
- "0.11.1",
- sha256="e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f",
- deprecated=True,
- )
- version(
- "0.11.0",
- sha256="abfeccc94728cb46be8dbb3507a23ccffbacef9fbda96a977ef4ea8d6ab0d384",
- deprecated=True,
- )
- version(
- "0.10.1",
- sha256="708248f6d92f2f4d6342006c520f22dffa2f8adb0a9dc06a058e3effe7fee667",
- deprecated=True,
- )
- version(
- "0.10.0",
- sha256="47e0798caaac4df499bce5fe554a914abd884a855a27085a4473de1d737d9548",
- deprecated=True,
- )
- version(
- "0.9.0",
- sha256="efb28fed4ffcfaee653e0657f6500fc4cbac61e32104f4208da385676e76312a",
- deprecated=True,
- )
- version(
- "0.8.1",
- sha256="dfd0761e0b7e36c1d74c928ad986500c905be5ebcfbc29914d574af1db7218cf",
- deprecated=True,
- )
- version(
- "0.8.0",
- sha256="aa840321d056abd3c6be10c4a1e98a64f9f73fff9aa89c468dae8c003974a078",
- deprecated=True,
- )
- version(
- "0.7.0",
- sha256="a084a9c5d843e2343bf3f319154a48abe3d35d52feb0ad45dec427a1c4ffc416",
- deprecated=True,
- )
- version(
- "0.6.1",
- sha256="dada1f60a512789747011184b2767d2b44136ef3b036d86947f1896d200d2ba7",
- deprecated=True,
- )
- version(
- "0.6.0",
- sha256="a0e53728a9541ef87934831f3d05f2ccfdc3b8aeffe3e037be2b92b12400598e",
- deprecated=True,
- )
- version(
- "0.5.4",
- sha256="2157b05309614d6af0e4bbc6065987aede590822634a0522161f3af5d647abc9",
- deprecated=True,
- )
- version(
- "0.5.3",
- sha256="76b5c5880a0b15f5b91f7d626c5bc3b76ce7e5d21456963c117ab711bf1c5333",
- deprecated=True,
- )
- version(
- "0.5.2",
- sha256="2418c619bdd44257a170b85b9d2ecb75def29e751b725e27186468ada2e009ea",
- deprecated=True,
- )
- version(
- "0.5.1",
- sha256="85e6a18b111afeea2e475fe991db2a441ec3824211d659bee7b0012c36be9a40",
- deprecated=True,
- )
- version(
- "0.5.0",
- sha256="ebba7330a8715e96a6d6dc0aa085125d529d0740d788f0544c6169d892e4f861",
- deprecated=True,
- )
- version(
- "0.4.5",
- sha256="2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b",
- deprecated=True,
- )
- version(
- "0.4.4",
- sha256="d52a21dda271ae645711ce99c70cf44c5d3a809138e656bbff00998827548ebb",
- deprecated=True,
- )
- version(
- "0.4.3",
- sha256="cbd2ab580181c17317cf18b2bf825bcded2d97cab01cd5b5fe4f4d520b64f90f",
- deprecated=True,
- )
- version(
- "0.4.2",
- sha256="8e6f41252abadcdb2cc7a07f910ec4b45fb12c46f0a578672c6a186c7efcdb36",
- deprecated=True,
- )
- version(
- "0.4.1",
- sha256="008c648d3c46ece063ae8b5008480d8ae6d359d35967356685d1c09da07e1064",
- deprecated=True,
- )
- version(
- "0.4.0",
- sha256="6474714eee72ba2d4e271ed00ce8c05d67a9d15327bc03962b821b2af2c5ca36",
- deprecated=True,
- )
- version(
- "0.3.2",
- sha256="ca5caf7b2b48c7639f45d815b32e76d69650f3199eb8caa541d402722e3f6c10",
- deprecated=True,
- )
- version(
- "0.3.1",
- sha256="218d0e28b4d1ee34585f2ac6b18d169c81404d93958815e73e60cc0368efcbb7",
- deprecated=True,
- )
- version(
- "0.3.0",
- sha256="357fd8bdf86034b93902616f0844bd52e9304cccca22971ab7007588bf9d5fb3",
- deprecated=True,
- )
- version(
- "0.2.0",
- sha256="e9ba2740d9727ae6d0f9b1ac0c5df331814fd03518fe4b511396ed10780d5272",
- deprecated=True,
- )
- version(
- "0.1.4",
- sha256="f3c395f5cd78cfef96f4008fe842f327bc8b03b77f46999387bc0ad223b5d970",
- deprecated=True,
- )
- version(
- "0.1.1",
- sha256="c6ae19610b936a0aa940b44a3626d6e660fc457a8187d295cdf0b21169453d20",
- deprecated=True,
- )
variant(
"nodepfail",
@@ -418,39 +68,24 @@ class Bazel(Package):
depends_on("java@11", when="@5.3:", type=("build", "run"))
depends_on("java@8,11", when="@3.3:5.2", type=("build", "run"))
depends_on("java@8", when="@0.6:3.2", type=("build", "run"))
- depends_on("java@7:8", when="@:0.5", type=("build", "run"))
depends_on("python+pythoncmd", type=("build", "run"))
depends_on("zip", when="platform=linux", type=("build", "run"))
# Pass Spack environment variables to the build
- patch("bazelruleclassprovider-0.25.patch", when="@0.25:")
- patch("bazelruleclassprovider-0.14.patch", when="@0.14:0.24")
- patch("bazelconfiguration-0.3.patch", when="@:0.13")
+ patch("bazelruleclassprovider-0.25.patch")
# Inject include paths
patch("unix_cc_configure-3.0.patch", when="@3:")
- patch("unix_cc_configure-0.15.patch", when="@0.15:2")
- patch("unix_cc_configure-0.10.patch", when="@0.10:0.14")
- patch("unix_cc_configure-0.5.3.patch", when="@0.5.3:0.9")
- patch("cc_configure-0.5.0.patch", when="@0.5.0:0.5.2")
- patch("cc_configure-0.3.0.patch", when="@0.3:0.4")
+ patch("unix_cc_configure-0.15.patch", when="@:2")
# Set CC and CXX
- patch("compile-0.29.patch", when="@0.29:")
- patch("compile-0.21.patch", when="@0.21:0.28")
- patch("compile-0.16.patch", when="@0.16:0.20")
- patch("compile-0.13.patch", when="@0.13:0.15")
- patch("compile-0.9.patch", when="@0.9:0.12")
- patch("compile-0.6.patch", when="@0.6:0.8")
- patch("compile-0.4.patch", when="@0.4:0.5")
- patch("compile-0.3.patch", when="@0.2:0.3")
+ patch("compile-0.29.patch")
# Disable dependency search
- patch("cppcompileaction-0.3.2.patch", when="@0.3.2:+nodepfail")
- patch("cppcompileaction-0.3.0.patch", when="@0.3.0:0.3.1+nodepfail")
+ patch("cppcompileaction-0.3.2.patch", when="+nodepfail")
# https://github.com/bazelbuild/bazel/issues/17956
- patch("apple-clang-14.0.3.patch", when="@0.3:5.4.0,6.0:6.1")
+ patch("apple-clang-14.0.3.patch", when="@:5.4.0,6.0:6.1")
# https://github.com/bazelbuild/bazel/issues/17958
patch(
@@ -459,39 +94,27 @@ class Bazel(Package):
when="@5.0:5.4.0,6.0",
)
- # Fix build on power9 (2x commits)
- # https://github.com/bazelbuild/bazel/commit/5cff4f1edf8b95bf0612791632255852332f72b5
- # https://github.com/bazelbuild/bazel/commit/ab62a6e097590dac5ec946ad7a796ea0e8593ae0
- patch("build-0.29.1.patch", when="@0.29.1")
-
# Fix build with Fujitsu compiler
- patch("blaze_util_posix-0.29.1.patch", when="@0.29.1:%fj")
+ patch("blaze_util_posix-0.29.1.patch", when="%fj")
patch("unix_cc_configure_fj-5.2.patch", when="@5.2:%fj")
patch("unix_cc_configure_fj-5.0.patch", when="@5.0:5.1%fj")
- patch("unix_cc_configure_fj-0.29.1.patch", when="@0.29.1:4%fj")
- patch("bazelruleclassprovider_fj-0.25.patch", when="@0.25:%fj")
- conflicts(
- "%fj",
- when="@:0.24.1",
- msg="Fujitsu Compiler cannot build 0.24.1 or less, " "please use a newer release.",
- )
+ patch("unix_cc_configure_fj-0.29.1.patch", when="@:4%fj")
+ patch("bazelruleclassprovider_fj-0.25.patch", when="%fj")
# https://blog.bazel.build/2021/05/21/bazel-4-1.html
conflicts("platform=darwin target=aarch64:", when="@:4.0")
- # patches for compiling various older bazels which had ICWYU
- # violations revealed by (but not unique to) GCC 11 header changes.
- # these are derived from
+ # Patches for compiling various older bazels which had ICWYU violations revealed by
+ # (but not unique to) GCC 11 header changes. These are derived from
# https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/29084/
- patch("gcc11_1.patch", when="@0.3.2:4")
- patch("gcc11_2.patch", when="@0.3.2:4")
- patch("gcc11_3.patch", when="@0.3:4")
+ patch("gcc11_1.patch", when="@:4")
+ patch("gcc11_2.patch", when="@:4")
+ patch("gcc11_3.patch", when="@:4")
patch("gcc11_4.patch", when="@4.1:4")
- # bazel-4.0.0 does not compile with gcc-11
- # newer versions of grpc and abseil dependencies are needed but are not in
- # bazel-4.0.0
- conflicts("@:0.2,4.0.0", when="%gcc@11:")
+ # Bazel-4.0.0 does not compile with gcc-11
+ # Newer versions of grpc and abseil dependencies are needed but are not in bazel-4.0.0
+ conflicts("@4.0.0", when="%gcc@11:")
executables = ["^bazel$"]
@@ -501,14 +124,6 @@ class Bazel(Package):
match = re.search(r"Build label: ([\d.]+)", output)
return match.group(1) if match else None
- def url_for_version(self, version):
- if version >= Version("0.4.1"):
- url = "https://github.com/bazelbuild/bazel/releases/download/{0}/bazel-{0}-dist.zip"
- else:
- url = "https://github.com/bazelbuild/bazel/archive/{0}.tar.gz"
-
- return url.format(version)
-
def setup_build_environment(self, env):
# fix the broken linking (on power9)
# https://github.com/bazelbuild/bazel/issues/10327
diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch
deleted file mode 100644
index bdd24e1152..0000000000
--- a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tools/cpp/unix_cc_configure.bzl
-+++ b/tools/cpp/unix_cc_configure.bzl
-@@ -147,9 +147,18 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc, additional_flags = []):
- else:
- inc_dirs = result.stderr[index1 + 1:index2].strip()
-
-- return [_prepare_include_path(repository_ctx, _cxx_inc_convert(p))
-- for p in inc_dirs.split("\n")]
-+ default_inc_directories = [
-+ _prepare_include_path(repository_ctx, _cxx_inc_convert(p))
-+ for p in inc_dirs.split("\n")
-+ ]
-+
-+ env = repository_ctx.os.environ
-+ if "SPACK_INCLUDE_DIRS" in env:
-+ for path in env["SPACK_INCLUDE_DIRS"].split(":"):
-+ default_inc_directories.append(path)
-+
-+ return default_inc_directories
-
-
- def _is_option_supported(repository_ctx, cc, option):
diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch
deleted file mode 100644
index 79b583ba84..0000000000
--- a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tools/cpp/unix_cc_configure.bzl
-+++ b/tools/cpp/unix_cc_configure.bzl
-@@ -117,9 +117,19 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc):
- else:
- inc_dirs = result.stderr[index1 + 1:index2].strip()
-
-- return [escape_string(repository_ctx.path(_cxx_inc_convert(p)))
-- for p in inc_dirs.split("\n")]
-+ default_inc_directories = [
-+ escape_string(repository_ctx.path(_cxx_inc_convert(p)))
-+ for p in inc_dirs.split("\n")
-+ ]
-
-+ env = repository_ctx.os.environ
-+ if "SPACK_INCLUDE_DIRS" in env:
-+ for path in env["SPACK_INCLUDE_DIRS"].split(":"):
-+ default_inc_directories.append(
-+ repository_ctx.path(_cxx_inc_convert(path))
-+ )
-+
-+ return default_inc_directories
-
- def _add_option_if_supported(repository_ctx, cc, option):
- """Checks that `option` is supported by the C compiler. Doesn't %-escape the option."""
diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py
deleted file mode 100644
index a513f2ee13..0000000000
--- a/var/spack/repos/builtin/packages/catalyst/package.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-import os
-import subprocess
-import sys
-
-import llnl.util.tty as tty
-
-from spack.package import *
-
-
-class Catalyst(CMakePackage):
- """Catalyst is an in situ library, with an adaptable application
- programming interface (API), that orchestrates the alliance
- between simulation and analysis and/or visualization tasks. For
- versions 5.7 and greater use the paraview package.
-
- """
-
- homepage = "http://www.paraview.org"
- url = "https://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz"
-
- maintainers("danlipsa")
-
- version("5.6.0", sha256="5b49cb96ab78eee0427e25200530ac892f9a3da7725109ce1790f8010cb5b377")
-
- variant("python", default=False, description="Enable Python support")
- variant("essentials", default=False, description="Enable Essentials support")
- variant("extras", default=False, description="Enable Extras support. Implies Essentials.")
- variant(
- "rendering",
- default=True,
- description="Enable Rendering support. Implies Extras and Essentials.",
- )
- variant("osmesa", default=True, description="Use offscreen rendering")
- conflicts("+osmesa", when="~rendering")
-
- extends("python", when="+python")
- # VTK < 8.2.1 can't handle Python 3.8
- # This affects Paraview <= 5.7 (VTK 8.2.0)
- # https://gitlab.kitware.com/vtk/vtk/-/issues/17670
- depends_on("python@3:3.7", when="@:5.7 +python", type=("build", "run"))
- depends_on("python@3:", when="@5.8:+python", type=("build", "run"))
-
- depends_on("git", type="build")
- depends_on("mpi")
-
- depends_on("py-numpy", when="+python", type=("build", "run"))
- depends_on("py-mpi4py", when="+python", type=("build", "run"))
-
- depends_on("gl@3.2:", when="+rendering")
- depends_on("osmesa", when="+osmesa")
- depends_on("glx", when="~osmesa")
- depends_on("cmake@3.3:", type="build")
-
- @property
- def paraview_subdir(self):
- """The paraview subdirectory name as paraview-major.minor"""
- return "paraview-{0}".format(self.spec.version.up_to(2))
-
- @property
- def editions(self):
- """Transcribe spack variants into names of Catalyst Editions"""
- selected = ["Base"] # Always required
-
- if "+python" in self.spec:
- selected.append("Enable-Python")
-
- if "+essentials" in self.spec:
- selected.append("Essentials")
-
- if "+extras" in self.spec:
- selected.append("Essentials")
- selected.append("Extras")
-
- if "+rendering" in self.spec:
- selected.append("Essentials")
- selected.append("Extras")
- selected.append("Rendering-Base")
-
- return selected
-
- def do_stage(self, mirror_only=False):
- """Unpacks and expands the fetched tarball.
- Then, generate the catalyst source files."""
- super().do_stage(mirror_only)
-
- # extract the catalyst part
- catalyst_script = os.path.join(self.stage.source_path, "Catalyst", "catalyze.py")
- editions_dir = os.path.join(self.stage.source_path, "Catalyst", "Editions")
- catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir)
-
- python_path = os.path.realpath(
- self.spec["python"].command.path if "+python" in self.spec else sys.executable
- )
-
- command = [
- python_path,
- catalyst_script,
- "-r",
- self.stage.source_path,
- "-o",
- catalyst_source_dir,
- ]
-
- for edition in self.editions:
- command.extend(["-i", os.path.join(editions_dir, edition)])
-
- if not os.path.isdir(catalyst_source_dir):
- os.mkdir(catalyst_source_dir)
- subprocess.check_call(command)
- tty.msg("Generated catalyst source in %s" % self.stage.source_path)
- else:
- tty.msg("Already generated %s in %s" % (self.name, self.stage.source_path))
-
- def setup_run_environment(self, env):
- # paraview 5.5 and later
- # - cmake under lib/cmake/paraview-5.5
- # - libs under lib
- # - python bits under lib/python2.8/site-packages
- if os.path.isdir(self.prefix.lib64):
- lib_dir = self.prefix.lib64
- else:
- lib_dir = self.prefix.lib
-
- env.set("ParaView_DIR", self.prefix)
- env.prepend_path("LIBRARY_PATH", lib_dir)
- env.prepend_path("LD_LIBRARY_PATH", lib_dir)
-
- if "+python" in self.spec:
- python_version = self.spec["python"].version.up_to(2)
- env.prepend_path(
- "PYTHONPATH",
- join_path(lib_dir, "python{0}".format(python_version), "site-packages"),
- )
-
- def setup_dependent_build_environment(self, env, dependent_spec):
- env.set("ParaView_DIR", self.prefix)
-
- @property
- def root_cmakelists_dir(self):
- """The relative path to the directory containing CMakeLists.txt
-
- This path is relative to the root of the extracted tarball,
- not to the ``build_directory``. Defaults to the current directory.
-
- :return: directory containing CMakeLists.txt
- """
- return os.path.join(self.stage.source_path, "Catalyst-v" + str(self.version))
-
- @property
- def build_directory(self):
- """Returns the directory to use when building the package
-
- :return: directory where to build the package
- """
- return join_path(os.path.abspath(self.root_cmakelists_dir), "spack-build")
-
- def cmake_args(self):
- """Populate cmake arguments for Catalyst."""
- spec = self.spec
-
- def variant_bool(feature, on="ON", off="OFF"):
- """Ternary for spec variant to ON/OFF string"""
- if feature in spec:
- return on
- return off
-
- def nvariant_bool(feature):
- """Negated ternary for spec variant to OFF/ON string"""
- return variant_bool(feature, on="OFF", off="ON")
-
- cmake_args = [
- "-DPARAVIEW_GIT_DESCRIBE=v%s" % str(self.version),
- "-DVTK_USE_SYSTEM_EXPAT:BOOL=ON",
- "-DVTK_USE_X:BOOL=%s" % nvariant_bool("+osmesa"),
- "-DVTK_USE_OFFSCREEN:BOOL=%s" % variant_bool("+osmesa"),
- "-DVTK_OPENGL_HAS_OSMESA:BOOL=%s" % variant_bool("+osmesa"),
- ]
- if "+python" in spec:
- cmake_args.extend(
- [
- "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON",
- "-DPYTHON_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path,
- "-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON",
- ]
- )
- else:
- cmake_args.append("-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF")
-
- if spec.platform == "linux" and spec.target.family == "aarch64":
- cmake_args.append("-DCMAKE_CXX_FLAGS=-DPNG_ARM_NEON_OPT=0")
- cmake_args.append("-DCMAKE_C_FLAGS=-DPNG_ARM_NEON_OPT=0")
-
- return cmake_args
-
- def cmake(self, spec, prefix):
- """Runs ``cmake`` in the build directory through the cmake.sh script"""
- cmake_script_path = os.path.join(os.path.abspath(self.root_cmakelists_dir), "cmake.sh")
- with working_dir(self.build_directory, create=True):
- subprocess.check_call(
- [cmake_script_path, os.path.abspath(self.root_cmakelists_dir)]
- + self.cmake_args()
- + self.std_cmake_args
- )
diff --git a/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch b/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch
deleted file mode 100644
index fa610722af..0000000000
--- a/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-# The catalyst changes (the working directory for output) are slated for
-# paraview-5.6.
-# They are API-compatible with paraview-5.5 but not ABI compatible.
-#
-# https://gitlab.kitware.com/paraview/paraview/merge_requests/2433
-# https://gitlab.kitware.com/paraview/paraview/merge_requests/2436
-#
---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.cxx.orig 2018-04-06 22:03:33.000000000 +0200
-+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.cxx 2018-05-11 12:02:26.894772713 +0200
-@@ -38,6 +38,7 @@
- #include "vtkStringArray.h"
-
- #include <list>
-+#include <vtksys/SystemTools.hxx>
-
- struct vtkCPProcessorInternals
- {
-@@ -47,12 +48,13 @@
- };
-
- vtkStandardNewMacro(vtkCPProcessor);
--vtkMultiProcessController* vtkCPProcessor::Controller = NULL;
-+vtkMultiProcessController* vtkCPProcessor::Controller = nullptr;
- //----------------------------------------------------------------------------
- vtkCPProcessor::vtkCPProcessor()
- {
- this->Internal = new vtkCPProcessorInternals;
-- this->InitializationHelper = NULL;
-+ this->InitializationHelper = nullptr;
-+ this->WorkingDirectory = nullptr;
- }
-
- //----------------------------------------------------------------------------
-@@ -61,14 +63,15 @@
- if (this->Internal)
- {
- delete this->Internal;
-- this->Internal = NULL;
-+ this->Internal = nullptr;
- }
-
- if (this->InitializationHelper)
- {
- this->InitializationHelper->Delete();
-- this->InitializationHelper = NULL;
-+ this->InitializationHelper = nullptr;
- }
-+ this->SetWorkingDirectory(nullptr);
- }
-
- //----------------------------------------------------------------------------
-@@ -95,7 +98,7 @@
- {
- if (which < 0 || which >= this->GetNumberOfPipelines())
- {
-- return NULL;
-+ return nullptr;
- }
- int counter = 0;
- vtkCPProcessorInternals::PipelineListIterator iter = this->Internal->Pipelines.begin();
-@@ -108,7 +111,7 @@
- counter++;
- iter++;
- }
-- return NULL;
-+ return nullptr;
- }
-
- //----------------------------------------------------------------------------
-@@ -130,17 +133,41 @@
- }
-
- //----------------------------------------------------------------------------
--int vtkCPProcessor::Initialize()
-+int vtkCPProcessor::Initialize(const char* workingDirectory)
- {
-- if (this->InitializationHelper == NULL)
-+ if (this->InitializationHelper == nullptr)
- {
- this->InitializationHelper = this->NewInitializationHelper();
- }
-+ // make sure the directory exists here so that we only do it once
-+ if (workingDirectory)
-+ {
-+ vtkMultiProcessController* controller = vtkMultiProcessController::GetGlobalController();
-+ int success = 1;
-+ if (controller == nullptr || controller->GetLocalProcessId() == 0)
-+ {
-+ success = vtksys::SystemTools::MakeDirectory(workingDirectory) == true ? 1 : 0;
-+ if (success == 0)
-+ {
-+ vtkWarningMacro("Could not make "
-+ << workingDirectory << " directory. "
-+ << "Results will be generated in current working directory instead.");
-+ }
-+ }
-+ if (controller)
-+ {
-+ controller->Broadcast(&success, 1, 0);
-+ }
-+ if (success)
-+ {
-+ this->SetWorkingDirectory(workingDirectory);
-+ }
-+ }
- return 1;
- }
-
- //----------------------------------------------------------------------------
--int vtkCPProcessor::Initialize(vtkMPICommunicatorOpaqueComm& comm)
-+int vtkCPProcessor::Initialize(vtkMPICommunicatorOpaqueComm& comm, const char* workingDirectory)
- {
- #ifdef PARAVIEW_USE_MPI
- if (vtkCPProcessor::Controller)
-@@ -148,7 +175,7 @@
- vtkErrorMacro("Can only initialize with a communicator once per process.");
- return 0;
- }
-- if (this->InitializationHelper == NULL)
-+ if (this->InitializationHelper == nullptr)
- {
- vtkMPICommunicator* communicator = vtkMPICommunicator::New();
- communicator->InitializeExternal(&comm);
-@@ -157,12 +184,12 @@
- this->Controller = controller;
- this->Controller->SetGlobalController(controller);
- communicator->Delete();
-- return this->Initialize();
-+ return this->Initialize(workingDirectory);
- }
- return 1;
- #else
- static_cast<void>(&comm); // get rid of variable not used warning
-- return this->Initialize();
-+ return this->Initialize(workingDirectory);
- #endif
- }
-
-@@ -225,6 +252,13 @@
- input->GetFieldData()->AddArray(catalystChannel);
- }
- }
-+
-+ std::string originalWorkingDirectory;
-+ if (this->WorkingDirectory)
-+ {
-+ originalWorkingDirectory = vtksys::SystemTools::GetCurrentWorkingDirectory();
-+ vtksys::SystemTools::ChangeDirectory(this->WorkingDirectory);
-+ }
- for (vtkCPProcessorInternals::PipelineListIterator iter = this->Internal->Pipelines.begin();
- iter != this->Internal->Pipelines.end(); iter++)
- {
-@@ -248,6 +282,10 @@
- }
- }
- }
-+ if (originalWorkingDirectory.empty() == false)
-+ {
-+ vtksys::SystemTools::ChangeDirectory(originalWorkingDirectory);
-+ }
- // we want to reset everything here to make sure that new information
- // is properly passed in the next time.
- dataDescription->ResetAll();
-@@ -259,7 +297,7 @@
- {
- if (this->Controller)
- {
-- this->Controller->SetGlobalController(NULL);
-+ this->Controller->SetGlobalController(nullptr);
- this->Controller->Finalize(1);
- this->Controller->Delete();
- }
---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.h.orig 2018-04-06 22:03:33.000000000 +0200
-+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.h 2018-05-11 12:02:26.894772713 +0200
-@@ -76,14 +76,16 @@
- virtual void RemoveAllPipelines();
-
- /// Initialize the co-processor. Returns 1 if successful and 0
-- /// otherwise.
- /// otherwise. If Catalyst is built with MPI then Initialize()
- /// can also be called with a specific MPI communicator if
- /// MPI_COMM_WORLD isn't the proper one. Catalyst is initialized
-- /// to use MPI_COMM_WORLD by default.
-- virtual int Initialize();
-+ /// to use MPI_COMM_WORLD by default. Both methods have an optional
-+ /// workingDirectory argument which will set *WorkingDirectory* so
-+ /// that files will be put relative to this directory.
-+ virtual int Initialize(const char* workingDirectory = nullptr);
- #ifndef __WRAP__
-- virtual int Initialize(vtkMPICommunicatorOpaqueComm& comm);
-+ virtual int Initialize(
-+ vtkMPICommunicatorOpaqueComm& comm, const char* workingDirectory = nullptr);
- #endif
-
- /// The Catalyst input field data string array name. This array will
-@@ -111,6 +113,13 @@
- /// implementation an opportunity to clean up, before it is destroyed.
- virtual int Finalize();
-
-+ /// Get the current working directory for outputting Catalyst files.
-+ /// If not set then Catalyst output files will be relative to the
-+ /// current working directory. This will not affect where Catalyst
-+ /// looks for Python scripts. *WorkingDirectory* gets set through
-+ /// the *Initialize()* methods.
-+ vtkGetStringMacro(WorkingDirectory);
-+
- protected:
- vtkCPProcessor();
- virtual ~vtkCPProcessor();
-@@ -118,6 +127,11 @@
- /// Create a new instance of the InitializationHelper.
- virtual vtkObject* NewInitializationHelper();
-
-+ /// Set the current working directory for outputting Catalyst files.
-+ /// This is a protected method since simulation code adaptors should
-+ /// set this through the *Initialize()* methods.
-+ vtkSetStringMacro(WorkingDirectory);
-+
- private:
- vtkCPProcessor(const vtkCPProcessor&) = delete;
- void operator=(const vtkCPProcessor&) = delete;
-@@ -125,6 +139,7 @@
- vtkCPProcessorInternals* Internal;
- vtkObject* InitializationHelper;
- static vtkMultiProcessController* Controller;
-+ char* WorkingDirectory;
- };
-
- #endif
---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPXMLPWriterPipeline.cxx.orig 2018-04-06 22:03:33.000000000 +0200
-+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPXMLPWriterPipeline.cxx 2018-05-11 12:02:26.894772713 +0200
-@@ -31,6 +31,7 @@
- #include <vtkSmartPointer.h>
- #include <vtkUnstructuredGrid.h>
-
-+#include <algorithm>
- #include <sstream>
- #include <string>
-
-@@ -174,7 +175,7 @@
-
- for (unsigned int i = 0; i < dataDescription->GetNumberOfInputDescriptions(); i++)
- {
-- const char* inputName = dataDescription->GetInputDescriptionName(i);
-+ std::string inputName = dataDescription->GetInputDescriptionName(i);
- vtkCPInputDataDescription* idd = dataDescription->GetInputDescription(i);
- vtkDataObject* grid = idd->GetGrid();
- if (grid == nullptr)
-@@ -206,6 +207,8 @@
- vtkSMStringVectorProperty* fileName =
- vtkSMStringVectorProperty::SafeDownCast(writer->GetProperty("FileName"));
-
-+ // If we have a / in the channel name we take it out of the filename we're going to write to
-+ inputName.erase(std::remove(inputName.begin(), inputName.end(), '/'), inputName.end());
- std::ostringstream o;
- if (this->Path.empty() == false)
- {
---- Catalyst-v5.5.0/Wrapping/Python/paraview/coprocessing.py.orig 2018-04-06 22:03:33.000000000 +0200
-+++ Catalyst-v5.5.0/Wrapping/Python/paraview/coprocessing.py 2018-05-11 12:02:27.038772408 +0200
-@@ -11,22 +11,12 @@
- from paraview.vtk.vtkPVVTKExtensionsCore import *
- import math
-
--# -----------------------------------------------------------------------------
--def IsInModulo(timestep, frequencyArray):
-- """
-- Return True if the given timestep is in one of the provided frequency.
-- This can be interpreted as follow::
--
-- isFM = IsInModulo(timestep, [2,3,7])
--
-- is similar to::
-+# If the user created a filename in a location that doesn't exist by default we'll
-+# make the directory for them. This can be changed though by setting createDirectoriesIfNeeded
-+# to False.
-+createDirectoriesIfNeeded = True
-
-- isFM = (timestep % 2 == 0) or (timestep % 3 == 0) or (timestep % 7 == 0)
-- """
-- for frequency in frequencyArray:
-- if frequency > 0 and (timestep % frequency == 0):
-- return True
-- return False
-+# -----------------------------------------------------------------------------
-
- class CoProcessor(object):
- """Base class for co-processing Pipelines.
-@@ -68,6 +58,9 @@
- self.__CinemaTracks = {}
- self.__InitialFrequencies = {}
- self.__PrintEnsightFormatString = False
-+ self.__TimeStepToStartOutputAt=0
-+ self.__ForceOutputAtFirstCall=False
-+ self.__FirstTimeStepIndex = None
-
- def SetPrintEnsightFormatString(self, enable):
- """If outputting ExodusII files with the purpose of reading them into
-@@ -87,6 +80,17 @@
- "Incorrect argument type: %s, must be a dict" % type(frequencies))
- self.__InitialFrequencies = frequencies
-
-+ def SetInitialOutputOptions(self, timeStepToStartOutputAt, forceOutputAtFirstCall):
-+ """Set the frequencies at which the pipeline needs to be updated.
-+ Typically, this is called by the subclass once it has determined what
-+ timesteps co-processing will be needed to be done.
-+ frequencies is a map, with key->string name of for the simulation
-+ input, and value is a list of frequencies.
-+ """
-+
-+ self.__TimeStepToStartOutputAt=timeStepToStartOutputAt
-+ self.__ForceOutputAtFirstCall=forceOutputAtFirstCall
-+
- def EnableLiveVisualization(self, enable, frequency = 1):
- """Call this method to enable live-visualization. When enabled,
- DoLiveVisualization() will communicate with ParaView server if possible
-@@ -115,7 +119,7 @@
- # if this is a time step to do live then all of the inputs
- # must be made available. note that we want the pipeline built
- # before we do the actual first live connection.
-- if self.__EnableLiveVisualization and timestep % self.__LiveVisualizationFrequency == 0 \
-+ if self.__EnableLiveVisualization and self.NeedToOutput(timestep, self.__LiveVisualizationFrequency) \
- and self.__LiveVisualizationLink:
- if self.__LiveVisualizationLink.Initialize(servermanager.ActiveConnection.Session.GetSessionProxyManager()):
- num_inputs = datadescription.GetNumberOfInputDescriptions()
-@@ -132,13 +136,13 @@
- # hasn't been set up yet). If we don't have live enabled
- # we know that the output frequencies aren't changed and can
- # just use the initial frequencies.
-- if self.__InitialFrequencies or not self.__EnableLiveVisualization:
-+ if self.__ForceOutputAtFirstCall or self.__InitialFrequencies or not self.__EnableLiveVisualization:
- num_inputs = datadescription.GetNumberOfInputDescriptions()
- for cc in range(num_inputs):
- input_name = datadescription.GetInputDescriptionName(cc)
-
- freqs = self.__InitialFrequencies.get(input_name, [])
-- if self.__EnableLiveVisualization or ( self and IsInModulo(timestep, freqs) ):
-+ if self.__EnableLiveVisualization or ( self and self.IsInModulo(timestep, freqs) ):
- datadescription.GetInputDescription(cc).AllFieldsOn()
- datadescription.GetInputDescription(cc).GenerateMeshOn()
- else:
-@@ -149,15 +153,14 @@
- for writer in self.__WritersList:
- frequency = writer.parameters.GetProperty(
- "WriteFrequency").GetElement(0)
-- if (timestep % frequency) == 0 or \
-- datadescription.GetForceOutput() == True:
-+ if self.NeedToOutput(timestep, frequency) or datadescription.GetForceOutput() == True:
- writerinputs = cpstate.locate_simulation_inputs(writer)
- for writerinput in writerinputs:
- datadescription.GetInputDescriptionByName(writerinput).AllFieldsOn()
- datadescription.GetInputDescriptionByName(writerinput).GenerateMeshOn()
-
- for view in self.__ViewsList:
-- if (view.cpFrequency and timestep % view.cpFrequency == 0) or \
-+ if (view.cpFrequency and self.NeedToOutput(timestep, view.cpFrequency)) or \
- datadescription.GetForceOutput() == True:
- viewinputs = cpstate.locate_simulation_inputs_for_view(view)
- for viewinput in viewinputs:
-@@ -192,8 +195,7 @@
- for writer in self.__WritersList:
- frequency = writer.parameters.GetProperty(
- "WriteFrequency").GetElement(0)
-- if (timestep % frequency) == 0 or \
-- datadescription.GetForceOutput() == True:
-+ if self.NeedToOutput(timestep, frequency) or datadescription.GetForceOutput() == True:
- fileName = writer.parameters.GetProperty("FileName").GetElement(0)
- paddingamount = writer.parameters.GetProperty("PaddingAmount").GetElement(0)
- helperName = writer.GetXMLName()
-@@ -203,6 +205,23 @@
- else:
- ts = str(timestep).rjust(paddingamount, '0')
- writer.FileName = fileName.replace("%t", ts)
-+ if '/' in writer.FileName and createDirectoriesIfNeeded:
-+ oktowrite = [1.]
-+ import vtk
-+ comm = vtk.vtkMultiProcessController.GetGlobalController()
-+ if comm.GetLocalProcessId() == 0:
-+ import os
-+ newDir = writer.FileName[0:writer.FileName.rfind('/')]
-+ try:
-+ os.makedirs(newDir)
-+ except OSError:
-+ if not os.path.isdir(newDir):
-+ print ("ERROR: Cannot make directory for", writer.FileName, ". No data will be written.")
-+ oktowrite[0] = 0.
-+ comm.Broadcast(oktowrite, 1, 0)
-+ if oktowrite[0] == 0:
-+ # we can't make the directory so no reason to update the pipeline
-+ return
- writer.UpdatePipeline(datadescription.GetTime())
-
- def WriteImages(self, datadescription, rescale_lookuptable=False,
-@@ -240,7 +259,7 @@
-
- cinema_dirs = []
- for view in self.__ViewsList:
-- if (view.cpFrequency and timestep % view.cpFrequency == 0) or \
-+ if (view.cpFrequency and self.NeedToOutput(timestep, view.cpFrequency)) or \
- datadescription.GetForceOutput() == True:
- fname = view.cpFileName
- ts = str(timestep).rjust(padding_amount, '0')
-@@ -267,6 +286,24 @@
- if dirname:
- cinema_dirs.append(dirname)
- else:
-+ if '/' in fname and createDirectoriesIfNeeded:
-+ oktowrite = [1.]
-+ import vtk
-+ comm = vtk.vtkMultiProcessController.GetGlobalController()
-+ if comm.GetLocalProcessId() == 0:
-+ import os
-+ newDir = fname[0:fname.rfind('/')]
-+ try:
-+ os.makedirs(newDir)
-+ except OSError:
-+ if not os.path.isdir(newDir):
-+ print ("ERROR: Cannot make directory for", fname, ". No image will be output.")
-+ oktowrite[0] = 0.
-+ comm.Broadcast(oktowrite, 1, 0)
-+ if oktowrite[0] == 0:
-+ # we can't make the directory so no reason to update the pipeline
-+ return
-+
- if image_quality is None and fname.endswith('png'):
- # for png quality = 0 means no compression. compression can be a potentially
- # very costly serial operation on process 0
-@@ -307,7 +344,7 @@
-
-
- timeStep = datadescription.GetTimeStep()
-- if self.__EnableLiveVisualization and timeStep % self.__LiveVisualizationFrequency == 0:
-+ if self.__EnableLiveVisualization and self.NeedToOutput(timeStep, self.__LiveVisualizationFrequency):
- if not self.__LiveVisualizationLink.Initialize(servermanager.ActiveConnection.Session.GetSessionProxyManager()):
- return
-
-@@ -412,7 +449,7 @@
- """
- controller = servermanager.ParaViewPipelineController()
- # assume that a client only proxy with the same name as a writer
-- # is available in "insitu_writer_paramters"
-+ # is available in "insitu_writer_parameters"
-
- # Since coprocessor sometimes pass writer as a custom object and not
- # a proxy, we need to handle that. Just creating any arbitrary writer
-@@ -666,3 +703,42 @@
- #restore what we showed
- pv_introspect.restore_visibility(pxystate)
- return os.path.basename(vfname)
-+
-+ def IsInModulo(self, timestep, frequencies):
-+ """
-+ Return True if the given timestep is in one of the provided frequency.
-+ This can be interpreted as follow::
-+
-+ isFM = IsInModulo(timestep-timeStepToStartOutputAt, [2,3,7])
-+
-+ is similar to::
-+
-+ isFM = (timestep-timeStepToStartOutputAt % 2 == 0) or (timestep-timeStepToStartOutputAt % 3 == 0) or (timestep-timeStepToStartOutputAt % 7 == 0)
-+
-+ The timeStepToStartOutputAt is the first timestep that will potentially be output.
-+ """
-+ if timestep < self.__TimeStepToStartOutputAt and not self.__ForceOutputAtFirstCall:
-+ return False
-+ for frequency in frequencies:
-+ if frequency > 0 and self.NeedToOutput(timestep, frequency):
-+ return True
-+
-+ return False
-+
-+
-+ def NeedToOutput(self, timestep, frequency):
-+ """
-+ Return True if we need to output based on the input timestep and frequency. Checks based
-+ __FirstTimeStepIndex, __FirstTimeStepIndex, __ForceOutputAtFirstCall and __TimeStepToStartOutputAt
-+ member variables.
-+ """
-+ if self.__FirstTimeStepIndex == None:
-+ self.__FirstTimeStepIndex = timestep
-+
-+ if self.__ForceOutputAtFirstCall and self.__FirstTimeStepIndex == timestep:
-+ return True
-+
-+ if self.__TimeStepToStartOutputAt <= timestep and (timestep-self.__TimeStepToStartOutputAt) % frequency == 0:
-+ return True
-+
-+ return False
diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py
index 12a095c301..9265d2c296 100644
--- a/var/spack/repos/builtin/packages/gaudi/package.py
+++ b/var/spack/repos/builtin/packages/gaudi/package.py
@@ -35,11 +35,6 @@ class Gaudi(CMakePackage):
version("36.1", sha256="9f718c832313676249e5c3ac76ba4346978ee2328f8cdcb29176498b080402e9")
version("36.0", sha256="8a0458cef5b616532f9db7cca9fa0e892e602b64c9e93dc0cc6d972e03034830")
version("35.0", sha256="c01b822f9592a7bf875b9997cbeb3c94dea97cb13d523c12649dbbf5d69b5fa6")
- version("34.0", sha256="28fc4abb5a6b08da5a6b1300451c7e8487f918b055939877219d454abf7668ae")
- version("33.2", sha256="26aaf9c4ff237a60ec79af9bd18ad249fc91c16e297ba77e28e4a256123db6e5")
- version("33.1", sha256="7eb6b2af64aeb965228d4b6ea66c7f9f57f832f93d5b8ad55c9105235af5b042")
- version("33.0", sha256="76a967c41f579acc432593d498875dd4dc1f8afd5061e692741a355a9cf233c8")
- version("32.2", sha256="e9ef3eb57fd9ac7b9d5647e278a84b2e6263f29f0b14dbe1321667d44d969d2e")
maintainers("drbenmorgan", "vvolkl", "jmcarcell")
@@ -72,17 +67,15 @@ class Gaudi(CMakePackage):
depends_on("clhep")
depends_on("cmake", type="build")
depends_on("cppgsl")
- depends_on("fmt", when="@33.2:")
+ depends_on("fmt")
depends_on("fmt@:8", when="@:36.9")
depends_on("intel-tbb@:2020.3", when="@:37.0")
depends_on("tbb", when="@37.1:")
depends_on("uuid")
- depends_on("nlohmann-json", when="@35.0:")
+ depends_on("nlohmann-json")
depends_on("python", type=("build", "run"))
- depends_on("python@:3.7", when="@32.2:34", type=("build", "run"))
depends_on("py-networkx", type=("build", "run"))
depends_on("py-six", type=("build", "run"))
- depends_on("py-xenv@1:", when="@:34.9", type=("build", "run"))
depends_on("range-v3")
depends_on("root +python +root7 +ssl +tbb +threads")
depends_on("zlib-api")
@@ -99,13 +92,9 @@ class Gaudi(CMakePackage):
depends_on("doxygen +graphviz", when="+docs")
depends_on("gperftools", when="+gperftools")
depends_on("gdb")
- depends_on("gsl", when="@:31 +examples")
- depends_on("heppdt", when="@:34 +examples")
depends_on("heppdt", when="+heppdt")
depends_on("jemalloc", when="+jemalloc")
- depends_on("libpng", when="@:34 +examples")
depends_on("libunwind", when="+unwind")
- depends_on("relax", when="@:34 +examples")
depends_on("xerces-c", when="+xercesc")
# NOTE: pocl cannot be added as a minimal OpenCL implementation because
# ROOT does not like being exposed to LLVM symbols.
@@ -131,9 +120,6 @@ class Gaudi(CMakePackage):
# todo:
self.define("GAUDI_USE_INTELAMPLIFIER", False),
]
- # this is not really used in spack builds, but needs to be set
- if self.spec.version < Version("34"):
- args.append("-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt")
return args
def setup_run_environment(self, env):
diff --git a/var/spack/repos/builtin/packages/hercules/package.py b/var/spack/repos/builtin/packages/hercules/package.py
deleted file mode 100644
index 6410b5552d..0000000000
--- a/var/spack/repos/builtin/packages/hercules/package.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-
-
-class Hercules(MakefilePackage):
- """Hercules is an amazingly fast and highly customizable Git
- repository analysis engine written in Go."""
-
- homepage = "https://github.com/src-d/hercules"
- url = "https://github.com/src-d/hercules/archive/v10.7.2.tar.gz"
-
- version("10.7.2", sha256="4654dcfb1eee5af1610fd05677c6734c2ca1161535fcc14d3933d6debda4bc34")
-
- depends_on("protobuf", type="build")
- depends_on("go@1.11:", type="build")
- depends_on("py-labours", type="run")
-
- def install(self, spec, prefix):
- mkdirp(prefix.bin)
- install("hercules", prefix.bin)
diff --git a/var/spack/repos/builtin/packages/libpeas/package.py b/var/spack/repos/builtin/packages/libpeas/package.py
deleted file mode 100644
index 70f4dde772..0000000000
--- a/var/spack/repos/builtin/packages/libpeas/package.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-import os
-
-from spack.package import *
-
-
-class Libpeas(AutotoolsPackage):
- """libpeas is a gobject-based plugins engine, and is targeted at
- giving every application the chance to assume its own
- extensibility."""
-
- homepage = "http://developer.gnome.org/libpeas/stable"
- url = "https://download.gnome.org/sources/libpeas/1.22/libpeas-1.22.0.tar.xz"
-
- version("1.22.0", sha256="5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962")
-
- depends_on("m4", type="build")
- depends_on("autoconf", type="build")
- depends_on("automake", type="build")
- depends_on("libtool", type="build")
- depends_on("gettext", type="build")
- depends_on("pkgconfig", type="build")
- depends_on("atk")
- depends_on("intltool@0.40.0:")
- depends_on("xmlto", type="build")
- depends_on("perl", type="build")
- depends_on("perl-xml-parser", type="build")
- depends_on("glib@2.10:")
- depends_on("gobject-introspection")
- depends_on("libffi")
- depends_on("gtkplus")
- depends_on("gdk-pixbuf")
- depends_on("pango")
- depends_on("gnome-common")
- depends_on("py-pygobject@3:", type="build")
- depends_on("python@3:3.7.9", type="build")
-
- def url_for_version(self, version):
- url = "https://download.gnome.org/sources/libpeas/"
- url += "{0}/libpeas-{1}.tar.xz"
- return url.format(version.up_to(2), version)
-
- def setup_dependent_build_environment(self, env, dependent_spec):
- env.prepend_path("XDG_DATA_DIRS", self.prefix.share)
-
- def setup_dependent_run_environment(self, env, dependent_spec):
- env.prepend_path("XDG_DATA_DIRS", self.prefix.share)
-
- def setup_build_environment(self, env):
- # Let
- #
- # python = self.spec['python']
- # prefix = python.prefix
- # pyversion = python.version.up_to(2)
- # python_lib_path = os.path.join(prefix, 'Frameworks',
- # 'Python.framework', 'Versions',
- # pyversion)
- #
- # self.spec['python'].libs.ld_flags returns (on macOS)
- # '-L{0} -lPython'.format(python_lib_path)
- #
- # e.g., for python@3.7.4 on macOS via Homebrew, python_lib_path is
- # /usr/local/opt/python/Frameworks/Python.framework/Versions/3.7
- #
- # This directory is correct for many purposes, but libpeas uses the
- # link flag '-lpython{0}m'.format(pyversion) and does not use an
- # appropriate -L flag to locate this library, so the correct -L flag
- # must be appended to LDFLAGS. Furthermore, this library is not found
- # in python_lib_path. However, pkg-config returns the correct
- # directory, so pkg-config is used to generate the correct paths for
- # LDFLAGS.
- pkg_config = which("pkg-config")
- python_prefix = self.spec["python"].prefix.lib.pkgconfig
- python_pc_file = os.path.join(python_prefix, "python3.pc")
- python_ldflags = pkg_config("--libs", python_pc_file, output=str)
-
- env.append_path("LDFLAGS", python_ldflags)
- env.prepend_path("XDG_DATA_DIRS", self.prefix.share)
-
- def setup_run_environment(self, env):
- env.prepend_path("XDG_DATA_DIRS", self.prefix.share)
-
- def autoreconf(self, spec, prefix):
- autoreconf_args = ["-ivf"]
- aclocal_pkg_list = [
- "pkgconfig",
- "gettext",
- "intltool",
- "glib",
- "gobject-introspection",
- "gnome-common",
- "gtkplus",
- ]
- aclocal_path = os.path.join("share", "aclocal")
-
- for pkg in aclocal_pkg_list:
- autoreconf_args += ["-I", os.path.join(spec[pkg].prefix, aclocal_path)]
-
- autoreconf = which("autoreconf")
- autoreconf(*autoreconf_args)
-
- def configure_args(self):
- args = ["--disable-silent-rules", "--enable-gtk", "--enable-python3", "--disable-python2"]
- return args
diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py
index d8639dca2a..59f7c3debf 100644
--- a/var/spack/repos/builtin/packages/mxnet/package.py
+++ b/var/spack/repos/builtin/packages/mxnet/package.py
@@ -57,9 +57,7 @@ class Mxnet(CMakePackage, CudaPackage, PythonExtension):
depends_on("py-cython", when="+python", type="build")
depends_on("py-numpy@1.17:", when="@2.0.0:+python", type=("build", "run"))
depends_on("py-numpy@1.16.1:1", when="@1.6:1.8.0+python", type=("build", "run"))
- depends_on("py-numpy@1.8.2:1.15.0", when="@1.3.0+python", type=("build", "run"))
depends_on("py-requests@2.20.0:2", when="@1.6:+python", type=("build", "run"))
- depends_on("py-requests@2.18.4:2.18", when="@1.3.0+python", type=("build", "run"))
depends_on("py-graphviz@0.8.1:0.8", when="+python", type=("build", "run"))
conflicts("+cudnn", when="~cuda")
diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py
index 160913b33a..96cf11c3e5 100644
--- a/var/spack/repos/builtin/packages/node-js/package.py
+++ b/var/spack/repos/builtin/packages/node-js/package.py
@@ -37,10 +37,6 @@ class NodeJs(Package):
version("14.15.1", sha256="a1120472bf55aea745287693a6651e16973e1008c9d6107df350126adf9716fe")
version("14.13.0", sha256="8538b2e76aa06ee0e6eb1c118426c3c5ca53b2e49d66591738eacf76e89edd61")
version("14.10.0", sha256="7e0d7a1aa23697415e3588a1ca4f1c47496e6c88b9cf37c66be90353d3e4ac3e")
- version("12.18.4", sha256="a802d87e579e46fc52771ed6f2667048320caca867be3276f4c4f1bbb41389c3")
- version("12.18.3", sha256="6ea85f80e01b007cc9b566b8836513bc5102667d833bad4c1092be60fa60c2d4")
- version("12.16.0", sha256="ae2dfe74485d821d4fef7cf1802acd2322cd994c853a2327c4306952f4453441")
- version("12.14.0", sha256="5c1939867228f3845c808ef84a89c8ee93cc35f857bf7587ecee1b5a6d9da67b")
variant("debug", default=False, description="Include debugger support")
variant("doc", default=False, description="Compile with documentation")
@@ -66,7 +62,6 @@ class NodeJs(Package):
depends_on("python@2.7,3.5:3.8", when="@15", type="build")
depends_on("python@2.7,3.6:3.10", when="@14.18.2:14", type="build")
depends_on("python@2.7,3.5:3.8", when="@13.1:14.18.1", type="build")
- depends_on("python@2.7,3.5:3.7", when="@12:13.0", type="build")
depends_on("libtool", type="build", when=sys.platform != "darwin")
depends_on("pkgconfig", type="build")
# depends_on('bash-completion', when="+bash-completion")
diff --git a/var/spack/repos/builtin/packages/of-catalyst/package.py b/var/spack/repos/builtin/packages/of-catalyst/package.py
index 3bfca4e7d3..9ba2095aa5 100644
--- a/var/spack/repos/builtin/packages/of-catalyst/package.py
+++ b/var/spack/repos/builtin/packages/of-catalyst/package.py
@@ -32,7 +32,6 @@ class OfCatalyst(CMakePackage):
depends_on("openfoam@1806", when="@1806", type=("build", "link", "run"))
depends_on("openfoam@develop", when="@develop", type=("build", "link", "run"))
- depends_on("catalyst@5.5:", when="~full")
depends_on("paraview@5.5:+osmesa~qt", when="+full")
root_cmakelists_dir = "src/catalyst"
diff --git a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py
index dbe58f4d97..ba115b357e 100644
--- a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py
@@ -19,24 +19,8 @@ class PyAzuremlAutomlCore(PythonPackage):
sha256="1fa4a900856b15e1ec9a6bb949946ed0c873a5a54da3db592f03dbb46a117ceb",
expand=False,
)
- version(
- "1.11.0",
- sha256="da1b9cef9aabbfaee69a19d5e15f5a911eefbd126546738343a78c032860b5a5",
- expand=False,
- )
- version(
- "1.8.0",
- sha256="58ce54b01570996cda860c0c80693b8db19324785a356573f105afeaa31cae6c",
- expand=False,
- )
depends_on("python@3.5:3", type=("build", "run"))
depends_on("py-azureml-dataset-runtime@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-telemetry@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
-
- depends_on("py-azureml-dataset-runtime@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-telemetry@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
-
- depends_on("py-azureml-dataprep@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-telemetry@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py
index 7cdf40b438..6ece471de3 100644
--- a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py
@@ -27,19 +27,6 @@ class PyAzuremlDataprepNative(PythonPackage):
preferred=True,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp38-cp38-macosx_10_9_x86_64.whl",
)
- version(
- "30.0.0-py3.7",
- sha256="1fb47c48edf795aaa1b3e589a4d580fc61d639c0bb26519271736c72155d008e",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-macosx_10_9_x86_64.whl",
- )
-
- version(
- "14.2.1-py3.7",
- sha256="0711ea6465a555d4ed052b7ecf3ed580d711ca7499a12be4c9736d5555ab2786",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-14.2.1-cp37-cp37m-macosx_10_9_x86_64.whl",
- )
elif sys.platform.startswith("linux"):
version(
"30.0.0-py3.9",
@@ -54,21 +41,6 @@ class PyAzuremlDataprepNative(PythonPackage):
preferred=True,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp38-cp38-manylinux1_x86_64.whl",
)
- version(
- "30.0.0-py3.7",
- sha256="897063c21d7b1b8cb070f8992e78291c402559434e9d4a5bb85b595a5c676fe6",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-manylinux1_x86_64.whl",
- )
-
- version(
- "14.2.1-py3.7",
- sha256="0817ec5c378a9bcd1af8edda511ca9d02bdc7087e6f8802c459c9b8f3fde4ade",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-14.2.1-cp37-cp37m-manylinux1_x86_64.whl",
- )
depends_on("python@3.9.0:3.9", when="@30.0.0-py3.9", type=("build", "run"))
depends_on("python@3.8.0:3.8", when="@30.0.0-py3.8", type=("build", "run"))
- depends_on("python@3.7.0:3.7", when="@30.0.0-py3.7", type=("build", "run"))
- depends_on("python@3.7.0:3.7", when="@14.2.1-py3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py
index 2b4c29c3f7..00f4dd6128 100644
--- a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py
@@ -30,12 +30,6 @@ class PyAzuremlDataprepRslex(PythonPackage):
preferred=True,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp38-cp38-macosx_10_9_x86_64.whl",
)
- version(
- "1.9.0-py3.7",
- sha256="9993b369fb9d94d885611859ee957582304c1d8953fc8b48567b786bbfd8062b",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl",
- )
version(
"1.8.0-py3.9",
@@ -49,12 +43,6 @@ class PyAzuremlDataprepRslex(PythonPackage):
expand=False,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp38-cp38-macosx_10_9_x86_64.whl",
)
- version(
- "1.8.0-py3.7",
- sha256="8e9feb3187f11fb86f525bc88bf6a6171d7e7d6e2860411a5b82d1f3ecaa8ae8",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-macosx_10_9_x86_64.whl",
- )
elif sys.platform.startswith("linux"):
version(
"1.9.0-py3.9",
@@ -69,12 +57,6 @@ class PyAzuremlDataprepRslex(PythonPackage):
preferred=True,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp38-cp38-manylinux1_x86_64.whl",
)
- version(
- "1.9.0-py3.7",
- sha256="d7b6e15401b88cec2915b0bd6298ae7f54584d01ee14e4a24ffb950b7578bceb",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-manylinux1_x86_64.whl",
- )
version(
"1.8.0-py3.9",
@@ -88,16 +70,9 @@ class PyAzuremlDataprepRslex(PythonPackage):
expand=False,
url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp38-cp38-manylinux1_x86_64.whl",
)
- version(
- "1.8.0-py3.7",
- sha256="0588c6e503635aa6d4c64f7bbb3a3be52679f24ac89e2c8d4e96fd991d7006a2",
- expand=False,
- url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-manylinux1_x86_64.whl",
- )
depends_on("python@3.9.0:3.9", when="@1.9.0-py3.9,1.8.0-py3.9", type=("build", "run"))
depends_on("python@3.8.0:3.8", when="@1.9.0-py3.8,1.8.0-py3.8", type=("build", "run"))
- depends_on("python@3.7.0:3.7", when="@1.9.0-py3.7,1.8.0-py3.7", type=("build", "run"))
for t in set(
[str(x.family) for x in archspec.cpu.TARGETS.values() if str(x.family) != "x86_64"]
diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py
index 0a675f8cd0..5893c3cdcc 100644
--- a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py
@@ -23,26 +23,14 @@ class PyAzuremlDataprep(PythonPackage):
sha256="a36f807112ff1e64d21265b8e7f40154c93e3bead539e2a74c9d74200fd77c86",
expand=False,
)
- version(
- "2.0.2",
- sha256="9b9e97d9ed29c0641d3ceb37745ff078143bd235c53df528f847ec0684c52f79",
- expand=False,
- )
- version(
- "1.8.2",
- sha256="e53f3206f0bd4af8d5e7de3a94c2c6e662902b86e94a7b9d930e36329fe5820f",
- expand=False,
- )
variant("fuse", default=False, description="Build with FUSE support")
depends_on("python@3:", type=("build", "run"))
depends_on("py-dotnetcore2@2.1.14:2", type=("build", "run"))
depends_on("py-azureml-dataprep-native@30.0.0:30", when="@2.10.0:", type=("build", "run"))
- depends_on("py-azureml-dataprep-native@14.2.1:14", when="@:2.0.2", type=("build", "run"))
depends_on("py-azureml-dataprep-rslex@1.9.0:1.9", when="@2.11.0:", type=("build", "run"))
depends_on("py-azureml-dataprep-rslex@1.8.0:1.8", when="@2.10.1", type=("build", "run"))
depends_on("py-cloudpickle@1.1.0:1", type=("build", "run"))
depends_on("py-azure-identity@1.2.0:1.4", when="@2.10.0:", type=("build", "run"))
- depends_on("py-azure-identity@1.2.0:1.2", when="@:2.0.2", type=("build", "run"))
depends_on("py-fusepy@3.0.1:3", when="+fuse", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py
index 5fa8ec7708..a110897eda 100644
--- a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py
@@ -19,18 +19,11 @@ class PyAzuremlDatasetRuntime(PythonPackage):
sha256="96ca73d03ffedc0dd336d9383d2e17cf74548a89fc7ca4c201c599817c97bbc6",
expand=False,
)
- version(
- "1.11.0.post1",
- sha256="65c20f276399a7d406c4850af7a6f149472d301931fd1da6a60bad59d43fa47b",
- expand=False,
- )
variant("fuse", default=False, description="Build with FUSE support")
depends_on("python@3.0:3", type=("build", "run"))
depends_on("py-azureml-dataprep@2.10.0:2.10", when="@1.23.0", type=("build", "run"))
- depends_on("py-azureml-dataprep@2.0.1:2.0", when="@1.11.0.post1", type=("build", "run"))
depends_on("py-pyarrow@0.17.0:1", when="@1.23.0", type=("build", "run"))
- depends_on("py-pyarrow@0.17.0:0", when="@1.11.0.post1", type=("build", "run"))
depends_on("py-numpy@:1.19.2,1.19.4:", when="@1.23.0:", type=("build", "run"))
depends_on("py-fusepy@3.0.1:3", when="+fuse", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py
index 2cfc6277c8..ff2c735df8 100644
--- a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py
@@ -18,27 +18,9 @@ class PyAzuremlPipelineSteps(PythonPackage):
sha256="72154c2f75624a1e7500b8e2239ae1354eeedf66d2cabb11e213b7eb80aedddb",
expand=False,
)
- version(
- "1.11.0",
- sha256="674317d9c74ec4cb05e443f50de1732e14dc4519cbe2743a44f8db0bc5e71214",
- expand=False,
- )
- version(
- "1.8.0",
- sha256="3310674207ed457a26fb978e7168e400306c695f7f854f354dee9d5c7c81304c",
- expand=False,
- )
depends_on("python@3:", type=("build", "run"))
depends_on("py-azureml-train-core@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-train-automl-client@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-pipeline-core@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
-
- depends_on("py-azureml-train-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-train-automl-client@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-pipeline-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
-
- depends_on("py-azureml-train-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-train-automl-client@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-pipeline-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py
index 0f17a9e9bc..15c2032300 100644
--- a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py
@@ -21,24 +21,8 @@ class PyAzuremlPipeline(PythonPackage):
sha256="ed0fae96771840d3ffd63d63df1b1eed2f50c3b8dbe7b672a4f1ba6e66d0a392",
expand=False,
)
- version(
- "1.11.0",
- sha256="8233c66b4120e86b9a9346608ca53bf48d5b9f0558300314034426dd0d7897d6",
- expand=False,
- )
- version(
- "1.8.0",
- sha256="43ce39789d9a255f147311e40274b5f2571c7ef3b52e218f248724ccb377a02c",
- expand=False,
- )
depends_on("python@3:", type=("build", "run"))
depends_on("py-azureml-pipeline-core@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-pipeline-steps@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
-
- depends_on("py-azureml-pipeline-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-pipeline-steps@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
-
- depends_on("py-azureml-pipeline-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-pipeline-steps@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py
index 4bc5be67b4..d665d7e072 100644
--- a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py
@@ -20,16 +20,6 @@ class PyAzuremlSdk(PythonPackage):
sha256="b9520f426831acb99fafa1ecd154b6bfd4f73fbf71e918d819f9db4a75438ab9",
expand=False,
)
- version(
- "1.11.0",
- sha256="d8c9d24ea90457214d798b0d922489863dad518adde3638e08ef62de28fb183a",
- expand=False,
- )
- version(
- "1.8.0",
- sha256="61107db1403ce2c1a12064eb0fa31a1d075debbf32dd17cb93b7639b615b7839",
- expand=False,
- )
# https://github.com/Azure/MachineLearningNotebooks/issues/1285
depends_on("python@3.5:3.8", type=("build", "run"))
@@ -41,17 +31,3 @@ class PyAzuremlSdk(PythonPackage):
depends_on("py-azureml-train@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-train-automl-client@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-pipeline@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
-
- depends_on("py-azureml-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on(
- "py-azureml-dataset-runtime@1.11.0:1.11 +fuse", when="@1.11.0", type=("build", "run")
- )
- depends_on("py-azureml-train@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-train-automl-client@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-pipeline@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
-
- depends_on("py-azureml-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-train@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-train-automl-client@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-pipeline@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-dataprep@1.8.0:1.8 +fuse", when="@1.8.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py
index 0493fd87c7..aff6614528 100644
--- a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py
+++ b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py
@@ -20,16 +20,6 @@ class PyAzuremlTrainAutomlClient(PythonPackage):
sha256="ac5f1ce9b04b4e61e2e28e0fa8d2d8e47937a546f624d1cd3aa6bc4f9110ecbe",
expand=False,
)
- version(
- "1.11.0",
- sha256="3184df60a46917e92140a299aecb54591b19df490a3f4f571ff1f92c5e70a715",
- expand=False,
- )
- version(
- "1.8.0",
- sha256="562300095db6c4dea7b052e255c53dd95c4c3d0589a828b545497fe1ca7e9677",
- expand=False,
- )
depends_on("python@3.5:3", type=("build", "run"))
@@ -37,13 +27,3 @@ class PyAzuremlTrainAutomlClient(PythonPackage):
depends_on("py-azureml-core@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-dataset-runtime@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
depends_on("py-azureml-telemetry@1.23.0:1.23", when="@1.23.0", type=("build", "run"))
-
- depends_on("py-azureml-automl-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-core@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-dataset-runtime@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
- depends_on("py-azureml-telemetry@1.11.0:1.11", when="@1.11.0", type=("build", "run"))
-
- depends_on("py-azureml-dataprep@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-automl-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-core@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
- depends_on("py-azureml-telemetry@1.8.0:1.8", when="@1.8.0", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py
deleted file mode 100644
index 2d5a23a34d..0000000000
--- a/var/spack/repos/builtin/packages/py-cnvkit/package.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class PyCnvkit(PythonPackage):
- """Copy number variation toolkit for high-throughput sequencing."""
-
- homepage = "https://github.com/etal/cnvkit"
- pypi = "CNVkit/CNVkit-0.9.6.tar.gz"
-
- version("0.9.6", sha256="be889c98a5cf0a994330b8c31c0a65151fb0095fe4e75a1e04118da2516248c2")
-
- depends_on("py-setuptools", type="build")
- depends_on("py-biopython@1.62:", type=("build", "run"))
- depends_on("py-future@0.15.2:", type=("build", "run"))
- depends_on("py-pomegranate@0.9.0:", type=("build", "run"))
- depends_on("py-matplotlib@1.3.1:", type=("build", "run"))
- depends_on("py-numpy@1.9:", type=("build", "run"))
- depends_on("py-pandas@0.20.1:0.24", type=("build", "run"))
- depends_on("py-pyfaidx@0.4.7:", type=("build", "run"))
- depends_on("py-pysam@0.10.0:", type=("build", "run"))
- depends_on("py-reportlab@3.0:", type=("build", "run"))
- depends_on("py-scipy@0.15.0:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py
index 6a244606c7..4210438b7a 100644
--- a/var/spack/repos/builtin/packages/py-cvxopt/package.py
+++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py
@@ -14,7 +14,6 @@ class PyCvxopt(PythonPackage):
pypi = "cvxopt/cvxopt-1.1.9.tar.gz"
version("1.2.5", sha256="94ec8c36bd6628a11de9014346692daeeef99b3b7bae28cef30c7490bbcb2d72")
- version("1.1.9", sha256="8f157e7397158812cabd340b68546f1baa55a486ed0aad8bc26877593dc2983d")
variant(
"gsl",
@@ -41,7 +40,6 @@ class PyCvxopt(PythonPackage):
# Required dependencies
depends_on("python@2.7:", type=("build", "link", "run"))
- depends_on("python@2.7:3.7", type=("build", "link", "run"), when="@:1.1.9")
depends_on("py-setuptools", type="build")
depends_on("blas")
depends_on("lapack")
diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py
index d0426c4039..c41899c88a 100644
--- a/var/spack/repos/builtin/packages/py-cython/package.py
+++ b/var/spack/repos/builtin/packages/py-cython/package.py
@@ -15,11 +15,6 @@ class PyCython(PythonPackage):
version("3.0.4", sha256="2e379b491ee985d31e5faaf050f79f4a8f59f482835906efe4477b33b4fbe9ff")
version("3.0.0", sha256="350b18f9673e63101dbbfcf774ee2f57c20ac4636d255741d76ca79016b1bd82")
- version(
- "3.0.0a9",
- sha256="23931c45877432097cef9de2db2dc66322cbc4fc3ebbb42c476bb2c768cecff0",
- deprecated=True,
- )
version("0.29.36", sha256="41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f")
version("0.29.35", sha256="6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527")
version("0.29.34", sha256="1909688f5d7b521a60c396d20bba9e47a1b2d2784bfb085401e1e1e7d29a29a8")
diff --git a/var/spack/repos/builtin/packages/py-dask-glm/package.py b/var/spack/repos/builtin/packages/py-dask-glm/package.py
index cfc3de80a1..40cbd16436 100644
--- a/var/spack/repos/builtin/packages/py-dask-glm/package.py
+++ b/var/spack/repos/builtin/packages/py-dask-glm/package.py
@@ -15,33 +15,10 @@ class PyDaskGlm(PythonPackage):
version("0.2.0", sha256="58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5")
- variant("docs", default=False, description="Build HTML documentation")
-
depends_on("py-setuptools", type="build")
depends_on("py-setuptools-scm", type="build")
depends_on("py-cloudpickle@0.2.2:", type=("build", "run"))
depends_on("py-dask+array", type=("build", "run"))
depends_on("py-multipledispatch@0.4.9:", type=("build", "run"))
depends_on("py-scipy@0.18.1:", type=("build", "run"))
- depends_on("py-scikit-learn@0.18:", type=("build", "run"), when="~docs")
- depends_on("py-scikit-learn@0.18:0.21", type=("build", "run"), when="+docs")
- depends_on("py-jupyter", type="build", when="+docs")
- depends_on("py-nbsphinx", type="build", when="+docs")
- depends_on("py-notebook", type="build", when="+docs")
- depends_on("py-numpydoc", type="build", when="+docs")
- depends_on("py-sphinx", type="build", when="+docs")
- depends_on("py-sphinx-rtd-theme", type="build", when="+docs")
- depends_on("pandoc", type="build", when="+docs")
- depends_on("py-pip", type="build", when="+docs")
- depends_on("py-s3fs", type="build", when="+docs")
- depends_on("py-matplotlib", type="build", when="+docs")
- depends_on("llvm@:10.0.1~flang", type="build", when="+docs")
- depends_on("cairo+X+ft+fc+pdf+gobject", type="build", when="+docs")
- depends_on("harfbuzz+graphite2", type="build", when="+docs")
-
- @run_after("install")
- def install_docs(self):
- if "+docs" in self.spec:
- with working_dir("docs"):
- make("html")
- install_tree("docs", self.prefix.docs)
+ depends_on("py-scikit-learn@0.18:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-inference-schema/package.py b/var/spack/repos/builtin/packages/py-inference-schema/package.py
deleted file mode 100644
index 6bc247642e..0000000000
--- a/var/spack/repos/builtin/packages/py-inference-schema/package.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-
-
-class PyInferenceSchema(PythonPackage):
- """This package is intended to provide a uniform schema for common machine
- learning applications, as well as a set of decorators that can be used to
- aid in web based ML prediction applications."""
-
- homepage = "https://pypi.org/project/inference-schema/"
- url = "https://pypi.io/packages/py3/i/inference-schema/inference_schema-1.0.2-py3-none-any.whl"
-
- version(
- "1.0.2",
- sha256="fd379becbd12dcf9f7a1ad5c03b163d501ef1dcc4fb85204735c84b1d139f478",
- expand=False,
- )
-
- variant("numpy", default=False, description="Enable numpy support")
- variant("pandas", default=False, description="Enable pandas support")
- variant("pyspark", default=False, description="Enable pyspark support")
-
- depends_on("python@3:", type=("build", "run"))
- depends_on("py-python-dateutil@2.5.3:", type=("build", "run"))
- depends_on("py-pytz@2017.2:", type=("build", "run"))
- depends_on("py-wrapt@1.11.1", type=("build", "run"))
- depends_on("py-numpy@1.13.0:", when="+numpy", type=("build", "run"))
- depends_on("py-pandas@0.20.2:", when="+pandas", type=("build", "run"))
- depends_on("py-pyspark@2.3.2", when="+pyspark", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-itk/package.py b/var/spack/repos/builtin/packages/py-itk/package.py
index e9a0f8a712..4f28d14dc4 100644
--- a/var/spack/repos/builtin/packages/py-itk/package.py
+++ b/var/spack/repos/builtin/packages/py-itk/package.py
@@ -18,12 +18,6 @@ class PyItk(PythonPackage):
if sys.platform == "darwin":
# version 5.1.1
version(
- "5.1.1-cp37",
- url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp37-cp37m-macosx_10_9_x86_64.whl",
- sha256="f112515483a073fae96d5cfce4eb9f95cbf57a145bbd196b2369a3194e27febf",
- expand=False,
- )
- version(
"5.1.1-cp38",
url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp38-cp38-macosx_10_9_x86_64.whl",
sha256="94b09ab9dd59ceaecc456ede2b719a44b8f0d54d92409eede372c6004395ae7b",
@@ -32,12 +26,6 @@ class PyItk(PythonPackage):
# version 5.1.2
version(
- "5.1.2-cp37",
- url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-macosx_10_9_x86_64.whl",
- sha256="0b494485d05306240eaa5ab1a5e00895fcce8fe684c632c02a2373f36d123902",
- expand=False,
- )
- version(
"5.1.2-cp38",
url="https://pypi.io/packages/cp38/i/itk/itk-5.1.2-cp38-cp38-macosx_10_9_x86_64.whl",
sha256="e8dec75b4452bd2ee65beb4901b245fc3a2a2ccc46dfa008ae0b5b757718d458",
@@ -52,12 +40,6 @@ class PyItk(PythonPackage):
# version 5.3.0
version(
- "5.3.0-cp37",
- url="https://pypi.io/packages/cp37/i/itk/itk-5.3.0-cp37-cp37m-macosx_10_9_x86_64.whl",
- sha256="493e28a3c9f38502f82613fa6ab9855fb19bff671095c287100a441830a921d0",
- expand=False,
- )
- version(
"5.3.0-cp38",
url="https://pypi.io/packages/cp38/i/itk/itk-5.3.0-cp38-cp38-macosx_10_9_x86_64.whl",
sha256="1fbcde6f6612b13d2934722707fd7194b1d5900a655efa191dfc130bbb94df09",
@@ -84,12 +66,6 @@ class PyItk(PythonPackage):
elif sys.platform.startswith("linux"):
# version 5.1.1
version(
- "5.1.1-cp37",
- url="https://pypi.io/packages/cp37/i/itk/itk-5.1.1-cp37-cp37m-manylinux1_x86_64.whl",
- sha256="7c313d2e3a3e37b8e78d0b2d70be2d478c87fde6f27912c714c855a05584b8ee",
- expand=False,
- )
- version(
"5.1.1-cp38",
url="https://pypi.io/packages/cp38/i/itk/itk-5.1.1-cp38-cp38-manylinux1_x86_64.whl",
sha256="14cd6c3a25f0d69f45eda74b006eceeaf8e2b2fcbe7c343e49683edf97e0fb14",
@@ -98,12 +74,6 @@ class PyItk(PythonPackage):
# version 5.1.2
version(
- "5.1.2-cp37",
- url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-manylinux1_x86_64.whl",
- sha256="064d9cfdd9547ae3ed850c35b989e0141c4bd434672bc2dd124248aab7bdf09a",
- expand=False,
- )
- version(
"5.1.2-cp38",
url="https://pypi.io/packages/cp38/i/itk/itk-5.1.2-cp38-cp38-manylinux1_x86_64.whl",
sha256="fe9225ac353116f4000c0a3440bf151200beb4a65deec5b2e626edda5b498f16",
@@ -118,12 +88,6 @@ class PyItk(PythonPackage):
# version 5.3.0
version(
- "5.3.0-cp37",
- url="https://pypi.io/packages/cp37/i/itk/itk-5.3.0-cp37-cp37m-manylinux_2_28_x86_64.whl",
- sha256="265c8b28469164a45fd9d94c211b2ed017acc7cda7a9e74bbb20b38c49c1af61",
- expand=False,
- )
- version(
"5.3.0-cp38",
url="https://pypi.io/packages/cp38/i/itk/itk-5.3.0-cp38-cp38-manylinux_2_28_x86_64.whl",
sha256="d83dc2b0f5d673226ef6eacac012d1da6dd36c6126f2b3cffc7ed62231c29bf2",
@@ -148,7 +112,6 @@ class PyItk(PythonPackage):
expand=False,
)
- depends_on("python@3.7.0:3.7", when="@5.1.1-cp37,5.1.2-cp37,5.3.0-cp37", type=("build", "run"))
depends_on("python@3.8.0:3.8", when="@5.1.1-cp38,5.1.2-cp38,5.3.0-cp38", type=("build", "run"))
depends_on("python@3.9.0:3.9", when="@5.1.2-cp39,5.3.0-cp39", type=("build", "run"))
depends_on("python@3.10.0:3.10", when="@5.3.0-cp310", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py
deleted file mode 100644
index b15cfe8752..0000000000
--- a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class PyJupyterPackaging11(PythonPackage):
- """Jupyter Packaging Utilities, version 11."""
-
- # TODO: This package only exists because different packages in the Jupyter ecosystem
- # require different versions of jupyter_packaging. Once the concretizer is capable
- # of concretizing build dependencies separately, this package should be removed.
-
- homepage = "https://github.com/jupyter/jupyter-packaging"
- pypi = "jupyter_packaging/jupyter_packaging-0.11.1.tar.gz"
-
- version(
- "0.12.3",
- sha256="9d9b2b63b97ffd67a8bc5391c32a421bc415b264a32c99e4d8d8dd31daae9cf4",
- deprecated=True,
- )
- version(
- "0.12.0",
- sha256="b27455d60adc93a7baa2e0b8f386be81b932bb4e3c0116046df9ed230cd3faac",
- deprecated=True,
- )
- version(
- "0.11.1",
- sha256="6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec",
- deprecated=True,
- )
-
- depends_on("python@3.7:", type=("build", "run"))
- depends_on("py-packaging", type=("build", "run"))
- depends_on("py-tomlkit", type=("build", "run"))
- depends_on("py-hatchling@0.25:", when="@0.12.3:", type="build")
- depends_on("py-setuptools@60.2:", when="@0.12:", type=("build", "run"))
- depends_on("py-setuptools@46.4:", type=("build", "run"))
- # https://github.com/jupyter/jupyter-packaging/issues/130
- depends_on("py-setuptools@:60", when="@:0.11", type=("build", "run"))
- depends_on("py-wheel", type=("build", "run"))
- depends_on("py-deprecation", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py
deleted file mode 100644
index 8f0da9b999..0000000000
--- a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class PyJupyterPackaging7(PythonPackage):
- """Jupyter Packaging Utilities, version 7."""
-
- # TODO: This package only exists because different packages in the Jupyter ecosystem
- # require different versions of jupyter_packaging. Once the concretizer is capable
- # of concretizing build dependencies separately, this package should be removed.
-
- homepage = "https://github.com/jupyter/jupyter-packaging"
- pypi = "jupyter_packaging/jupyter-packaging-0.7.12.tar.gz"
-
- version(
- "0.7.12",
- sha256="b140325771881a7df7b7f2d14997b619063fe75ae756b9025852e4346000bbb8",
- deprecated=True,
- )
-
- depends_on("python@3.6:", type=("build", "run"))
- depends_on("py-packaging", type=("build", "run"))
- depends_on("py-setuptools", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
index daa3eaaa12..07d114b43b 100644
--- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py
+++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py
@@ -24,11 +24,6 @@ class PyJupyterlab(PythonPackage):
version("3.1.14", sha256="13174cb6076dd5da6f1b85725ccfcc9518d8f98e86b8b644fc89b1dfaeda63a9")
version("3.0.18", sha256="0e4bb4b89014607a16658b54f13df2f0af14f3c286109a0e14d5a46cbbe28caf")
version("3.0.16", sha256="7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23")
- version(
- "3.0.14",
- sha256="713a84991dfcca8c0bc260911f1bd54ac25a386a86285713b9555a60f795059b",
- deprecated=True,
- )
version("2.2.7", sha256="a72ffd0d919cba03a5ef8422bc92c3332a957ff97b0490494209c83ad93826da")
version("2.1.0", sha256="8c239aababf5baa0b3d36e375fddeb9fd96f3a9a24a8cda098d6a414f5bbdc81")
@@ -56,7 +51,6 @@ class PyJupyterlab(PythonPackage):
depends_on("py-setuptools", when="@:3", type=("build", "run"))
depends_on("py-jupyter-packaging@0.9:1", when="@3.4.8", type="build")
depends_on("py-jupyter-packaging@0.9:0", when="@3.0.15:3.4.2", type="build")
- depends_on("py-jupyter-packaging@0.7.3:0.7", when="@3.0.0:3.0.14", type=("build", "run"))
depends_on("py-pre-commit", when="@3.4:3.4.3", type="build")
depends_on("py-ipython", when="@3", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-labours/package.py b/var/spack/repos/builtin/packages/py-labours/package.py
deleted file mode 100644
index 3d0fe6eb8e..0000000000
--- a/var/spack/repos/builtin/packages/py-labours/package.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-
-
-class PyLabours(PythonPackage):
- """Python module dependency visualization."""
-
- homepage = "https://github.com/src-d/hercules"
- url = "https://github.com/src-d/hercules/archive/v10.7.2.tar.gz"
-
- version("10.7.2", sha256="4654dcfb1eee5af1610fd05677c6734c2ca1161535fcc14d3933d6debda4bc34")
-
- build_directory = "python"
-
- depends_on("py-setuptools", type=("build", "run"))
- depends_on("py-matplotlib@2.0:3", type=("build", "run"))
- depends_on("py-numpy@1.12.0:1", type=("build", "run"))
- depends_on("py-pandas@0.20.0:0", type=("build", "run"))
- depends_on("py-pyyaml@3.0:5", type=("build", "run"))
- depends_on("py-scipy@0.19.0:1.2.1", type=("build", "run"))
- depends_on("py-protobuf@3.5.0:3", type=("build", "run"))
- depends_on("py-munch@2.0:2", type=("build", "run"))
- depends_on("py-python-dateutil@2.6.0:2", type=("build", "run"))
- depends_on("py-tqdm@4.3:4", type=("build", "run"))
-
- depends_on("py-hdbscan@0.8.0:1", type=("build", "run"))
- depends_on("py-seriate@1.1.2:1", type=("build", "run"))
- depends_on("py-fastdtw@0.3.2:1", type=("build", "run"))
- depends_on("py-lifelines@0.20.0:1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py
index 61c7d7304b..daa75d2a2f 100644
--- a/var/spack/repos/builtin/packages/py-llvmlite/package.py
+++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py
@@ -25,17 +25,12 @@ class PyLlvmlite(PythonPackage):
version("0.34.0", sha256="f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63")
version("0.33.0", sha256="9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596")
version("0.31.0", sha256="22ab2b9d7ec79fab66ac8b3d2133347de86addc2e2df1b3793e523ac84baa3c8")
- version("0.29.0", sha256="3adb0d4c9a17ad3dca82c7e88118babd61eeee0ee985ce31fa43ec27aa98c963")
- version("0.27.1", sha256="48a1c3ae69fd8920cba153bfed8a46ac46474bc706a2100226df4abffe0000ab")
- version("0.26.0", sha256="13e84fe6ebb0667233074b429fd44955f309dead3161ec89d9169145dbad2ebf")
- version("0.25.0", sha256="fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025")
depends_on("py-setuptools", type="build")
depends_on("python@3.8:3.11", when="@0.40:", type=("build", "run"))
depends_on("python@:3.10", when="@0.38:0.39", type=("build", "run"))
depends_on("python@:3.9", when="@0.36:0.37", type=("build", "run"))
depends_on("python@:3.8", when="@0.31:0.35", type=("build", "run"))
- depends_on("python@:3.7", when="@:0.30", type=("build", "run"))
# https://github.com/numba/llvmlite#compatibility
depends_on("llvm@14", when="@0.41:")
@@ -56,8 +51,6 @@ class PyLlvmlite(PythonPackage):
depends_on("llvm@9.0", when="@0.34:0.36 target=aarch64:")
depends_on("llvm@9.0", when="@0.33")
depends_on("llvm@7.0:7.1,8.0", when="@0.29:0.32")
- depends_on("llvm@7.0", when="@0.27:0.28")
- depends_on("llvm@6.0", when="@0.23:0.26")
depends_on("binutils", type="build")
def setup_build_environment(self, env):
diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py
index 1cbcbe7c5a..731ce9a182 100644
--- a/var/spack/repos/builtin/packages/py-maestrowf/package.py
+++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py
@@ -33,20 +33,6 @@ class PyMaestrowf(PythonPackage):
version("1.1.0", sha256="1bfec546831f2ef577d7823bb50dcd12622644dad0d3d761998eafd0905b6977")
version("1.0.1", sha256="dd42ffeac1f0492a576c630b37e5d3593273e59664407f2ebf78d49322d37146")
- version(
- "1.1.9dev1",
- tag="1.1.9dev1",
- commit="097e6b842fd4a9540432a9dec1e41f0d1a2c2c2f",
- deprecated=True,
- )
- version(
- "1.1.7dev0",
- sha256="bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0",
- deprecated=True,
- )
-
- depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
- depends_on("python@3.6:", type=("build", "run"), when="@1.1.9:")
depends_on("py-setuptools", type=("build"), when="@:1.1.8")
depends_on("py-poetry-core@1.0.8:", type=("build"), when="@1.1.9:")
depends_on("py-coloredlogs", type=("build", "run"), when="@1.1.7:")
diff --git a/var/spack/repos/builtin/packages/py-merlin/package.py b/var/spack/repos/builtin/packages/py-merlin/package.py
index 35296b5c39..0a073c07eb 100644
--- a/var/spack/repos/builtin/packages/py-merlin/package.py
+++ b/var/spack/repos/builtin/packages/py-merlin/package.py
@@ -14,33 +14,19 @@ class PyMerlin(PythonPackage):
git = "https://github.com/LLNL/merlin.git"
tags = ["radiuss"]
- version("1.10.3", sha256="6edaf17b502db090cef0bc53ae0118c55f77d7a16f43c7a235e0dd1770decadb")
- version("1.7.5", sha256="1994c1770ec7fc9da216f9d0ca8214684dcc0daa5fd55337b96e308b2e68daaa")
- version("1.7.4", sha256="9a6f8a84a1b52d0bfb0dc7bdbd7e15677e4a1041bd25a49a2d965efe503a6c20")
- version("1.4.1", sha256="9d515cfdbcde2443892afd92b78dbc5bf2aed2060ed3a336e683188e015bca7c")
- version("master", branch="master")
version("develop", branch="develop")
+ version("master", branch="master")
+ version("1.10.3", sha256="6edaf17b502db090cef0bc53ae0118c55f77d7a16f43c7a235e0dd1770decadb")
- depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools", type=("build", "run"))
depends_on("py-cached-property", type=("build", "run"))
- depends_on("py-celery@5.0.3:+redis+sqlalchemy", when="@1.7.6:", type=("build", "run"))
- depends_on("py-celery@5.0.0:+redis+sqlalchemy", when="@1.7.5", type=("build", "run"))
- depends_on("py-celery@4.4.5:+redis+sqlalchemy", when="@1.6.2:1.7.4", type=("build", "run"))
- depends_on("py-celery@4.3.0:+redis+sqlalchemy", when="@:1.5.2", type=("build", "run"))
- depends_on("py-celery@4.3.0:+redis", when="@1.4.1:1.5.1", type=("build", "run"))
- # The upperbound on py-celery is not in requirements.txt because there was no 5.x release
- # then. See commit 61b4fc708a3d6fd22709b35836065c778bf6304e for why it's needed.
- depends_on("py-celery@:4", when="@:1.7.4", type=("build", "run"))
+ depends_on("py-celery@5.0.3:+redis+sqlalchemy", type=("build", "run"))
depends_on("py-coloredlogs", type=("build", "run"))
depends_on("py-cryptography", type=("build", "run"))
- depends_on("py-importlib-metadata@:4", when="@1.10: ^python@3.7", type=("build", "run"))
- depends_on("py-maestrowf@1.1.9:", when="@1.9.0:", type=("build", "run"))
- depends_on("py-maestrowf@1.1.7dev0", when="@1.2.0:1.8", type=("build", "run"))
- depends_on("py-maestrowf@1.1.6:", when="@:1.1", type=("build", "run"))
+ depends_on("py-maestrowf@1.1.9:", type=("build", "run"))
depends_on("py-numpy", type=("build", "run"))
depends_on("py-parse", type=("build", "run"))
depends_on("py-psutil@5.1.0:", type=("build", "run"))
depends_on("py-pyyaml@5.1.2:", type=("build", "run"))
depends_on("py-tabulate", type=("build", "run"))
- depends_on("py-redis@4.3.4:", when="@1.9.0:", type=("build", "run"))
+ depends_on("py-redis@4.3.4:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-meson-python/package.py b/var/spack/repos/builtin/packages/py-meson-python/package.py
index 8c63595a4f..de60dc008c 100644
--- a/var/spack/repos/builtin/packages/py-meson-python/package.py
+++ b/var/spack/repos/builtin/packages/py-meson-python/package.py
@@ -14,13 +14,7 @@ class PyMesonPython(PythonPackage):
maintainers("eli-schwartz", "adamjstewart", "rgommers")
- # Needed for py-scikit-image, deprecate and remove once 0.13.0 is officially released
version("0.13.1", sha256="63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618")
- version(
- "0.13.0.pre0",
- sha256="8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95",
- deprecated=True,
- )
version("0.12.0", sha256="8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d")
version("0.11.0", sha256="110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09")
version("0.10.0", sha256="08dd122c1074dbd5c55b53993a719cca73dd8216372c91217f7a550260f9e7e1")
diff --git a/var/spack/repos/builtin/packages/py-nibetaseries/package.py b/var/spack/repos/builtin/packages/py-nibetaseries/package.py
index f3298884dd..a795b126f8 100644
--- a/var/spack/repos/builtin/packages/py-nibetaseries/package.py
+++ b/var/spack/repos/builtin/packages/py-nibetaseries/package.py
@@ -14,7 +14,6 @@ class PyNibetaseries(PythonPackage):
git = "https://github.com/HBClab/NiBetaSeries.git"
version("master", branch="master")
- version("0.6.0", sha256="afddea1bf9b9de4ae446a5d9d2a56bdc88a5a9588bec5ecd3c8ac978fe416515")
depends_on("python@3.5:", type=("build", "run"))
depends_on("py-setuptools@40.8:", type="build")
@@ -35,21 +34,6 @@ class PyNibetaseries(PythonPackage):
depends_on("py-mne", type=("build", "run"))
# pypiwin32; platform_system=="Windows"
- with when("@:0.6"):
- depends_on("py-nipype@1.4.2:1.4", type=("build", "run"))
- depends_on("py-pybids@0.9.3:0.9", type=("build", "run"))
- depends_on("py-nibabel@2.4.0:2.4", type=("build", "run"))
- depends_on("py-nistats@0.0.1b2", type=("build", "run"))
- depends_on("py-nilearn@0.4.2:0.4", type=("build", "run"))
- depends_on("py-pandas@0.24.0:0.24", type=("build", "run"))
- depends_on("py-numpy", type=("build", "run"))
- depends_on("py-niworkflows@1.0.2:1.0", type=("build", "run"))
- depends_on("py-duecredit@0.6.4:0.6", type=("build", "run"))
- depends_on("py-scikit-learn@0.19.2:0.19", type=("build", "run"))
- depends_on("py-matplotlib@2.2.4:2.2", type=("build", "run"))
- depends_on("py-mne@0.18.1:0.18", type=("build", "run"))
- # pypiwin32; platform_system=="Windows"
-
@run_after("install")
def patch_bin(self):
# pkg_resources fails to find the dependencies, resulting in errors
diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py
index 965f865874..b051debf8b 100644
--- a/var/spack/repos/builtin/packages/py-numba/package.py
+++ b/var/spack/repos/builtin/packages/py-numba/package.py
@@ -25,7 +25,6 @@ class PyNumba(PythonPackage):
version("0.51.1", sha256="1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160")
version("0.50.1", sha256="89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7")
version("0.48.0", sha256="9d21bc77e67006b5723052840c88cc59248e079a907cc68f1a1a264e1eaba017")
- version("0.40.1", sha256="52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33")
depends_on("python@3.8:3.11", when="@0.57:", type=("build", "run"))
depends_on("python@3.7:3.10", when="@0.55:0.56", type=("build", "run"))
@@ -33,7 +32,6 @@ class PyNumba(PythonPackage):
depends_on("python@3.6:3.9", when="@0.53", type=("build", "run"))
depends_on("python@3.6:3.8", when="@0.52", type=("build", "run"))
depends_on("python@3.6:3.8", when="@0.48:0.51", type=("build", "run"))
- depends_on("python@3.3:3.7", when="@0.40.1:0.47", type=("build", "run"))
depends_on("py-numpy@1.22:1.26", when="@0.58.1:", type=("build", "run"))
depends_on("py-numpy@1.21:1.25", when="@0.58.0", type=("build", "run"))
depends_on("py-numpy@1.21:1.24", when="@0.57", type=("build", "run"))
@@ -42,7 +40,6 @@ class PyNumba(PythonPackage):
depends_on("py-numpy@1.18:1.21", when="@0.55.0:0.55.1", type=("build", "run"))
depends_on("py-numpy@1.17:1.20", when="@0.54", type=("build", "run"))
depends_on("py-numpy@1.15:1.20", when="@0.48:0.53", type=("build", "run"))
- depends_on("py-numpy@1.10:1.20", when="@:0.47", type=("build", "run"))
depends_on("py-setuptools", type=("build", "run"))
depends_on("py-llvmlite@0.41", when="@0.58", type=("build", "run"))
depends_on("py-llvmlite@0.40", when="@0.57", type=("build", "run"))
@@ -51,9 +48,7 @@ class PyNumba(PythonPackage):
depends_on("py-llvmlite@0.37", when="@0.54.0", type=("build", "run"))
depends_on("py-llvmlite@0.34", when="@0.51.1", type=("build", "run"))
depends_on("py-llvmlite@0.33", when="@0.50.1", type=("build", "run"))
- depends_on("py-llvmlite@0.31", when="@0.47,0.48", type=("build", "run"))
- depends_on("py-llvmlite@0.25", when="@0.40", type=("build", "run"))
- depends_on("py-llvmlite@0.20:0.25", when="@0.35.1", type=("build", "run"))
+ depends_on("py-llvmlite@0.31", when="@0.48", type=("build", "run"))
depends_on("py-importlib-metadata", when="@0.56:^python@:3.8", type=("build", "run"))
# Version 6.0.0 of llvm had a hidden symbol which breaks numba at runtime.
diff --git a/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch b/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch
deleted file mode 100644
index ac27d87dcd..0000000000
--- a/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-Allows you to specify order of BLAS/LAPACK preference
-https://github.com/numpy/numpy/pull/13132
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 806f4f7d3..0480d7b5a 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -474,6 +474,13 @@ class LapackSrcNotFoundError(LapackNotFoundError):
- the LAPACK_SRC environment variable."""
-
-
-+class BlasOptNotFoundError(NotFoundError):
-+ """
-+ Optimized (vendor) Blas libraries are not found.
-+ Falls back to netlib Blas library which has worse performance.
-+ A better performance should be easily gained by switching
-+ Blas library."""
-+
- class BlasNotFoundError(NotFoundError):
- """
- Blas (http://www.netlib.org/blas/) libraries not found.
-@@ -1541,139 +1548,219 @@ Make sure that -lgfortran is used for C++ extensions.
- class lapack_opt_info(system_info):
-
- notfounderror = LapackNotFoundError
-+ # Default order of LAPACK checks
-+ lapack_order = ['mkl', 'openblas', 'atlas', 'accelerate', 'lapack']
-
-- def calc_info(self):
-+ def _calc_info_mkl(self):
-+ info = get_info('lapack_mkl')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- lapack_mkl_info = get_info('lapack_mkl')
-- if lapack_mkl_info:
-- self.set_info(**lapack_mkl_info)
-- return
-+ def _calc_info_openblas(self):
-+ info = get_info('openblas_lapack')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ info = get_info('openblas_clapack')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- openblas_info = get_info('openblas_lapack')
-- if openblas_info:
-- self.set_info(**openblas_info)
-- return
-+ def _calc_info_atlas(self):
-+ info = get_info('atlas_3_10_threads')
-+ if not info:
-+ info = get_info('atlas_3_10')
-+ if not info:
-+ info = get_info('atlas_threads')
-+ if not info:
-+ info = get_info('atlas')
-+ if info:
-+ # Figure out if ATLAS has lapack...
-+ # If not we need the lapack library, but not BLAS!
-+ l = info.get('define_macros', [])
-+ if ('ATLAS_WITH_LAPACK_ATLAS', None) in l \
-+ or ('ATLAS_WITHOUT_LAPACK', None) in l:
-+ # Get LAPACK (with possible warnings)
-+ # If not found we don't accept anything
-+ # since we can't use ATLAS with LAPACK!
-+ lapack_info = self._get_info_lapack()
-+ if not lapack_info:
-+ return False
-+ dict_append(info, **lapack_info)
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- openblas_info = get_info('openblas_clapack')
-- if openblas_info:
-- self.set_info(**openblas_info)
-- return
-+ def _calc_info_accelerate(self):
-+ info = get_info('accelerate')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- atlas_info = get_info('atlas_3_10_threads')
-- if not atlas_info:
-- atlas_info = get_info('atlas_3_10')
-- if not atlas_info:
-- atlas_info = get_info('atlas_threads')
-- if not atlas_info:
-- atlas_info = get_info('atlas')
--
-- accelerate_info = get_info('accelerate')
-- if accelerate_info and not atlas_info:
-- self.set_info(**accelerate_info)
-- return
-+ def _get_info_blas(self):
-+ # Default to get the optimized BLAS implementation
-+ info = get_info('blas_opt')
-+ if not info:
-+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=3)
-+ info_src = get_info('blas_src')
-+ if not info_src:
-+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=3)
-+ return {}
-+ dict_append(info, libraries=[('fblas_src', info_src)])
-+ return info
-
-- need_lapack = 0
-- need_blas = 0
-- info = {}
-- if atlas_info:
-- l = atlas_info.get('define_macros', [])
-- if ('ATLAS_WITH_LAPACK_ATLAS', None) in l \
-- or ('ATLAS_WITHOUT_LAPACK', None) in l:
-- need_lapack = 1
-- info = atlas_info
-+ def _get_info_lapack(self):
-+ info = get_info('lapack')
-+ if not info:
-+ warnings.warn(LapackNotFoundError.__doc__ or '', stacklevel=3)
-+ info_src = get_info('lapack_src')
-+ if not info_src:
-+ warnings.warn(LapackSrcNotFoundError.__doc__ or '', stacklevel=3)
-+ return {}
-+ dict_append(info, libraries=[('flapack_src', info_src)])
-+ return info
-
-- else:
-- warnings.warn(AtlasNotFoundError.__doc__, stacklevel=2)
-- need_blas = 1
-- need_lapack = 1
-+ def _calc_info_lapack(self):
-+ info = self._get_info_lapack()
-+ if info:
-+ info_blas = self._get_info_blas()
-+ dict_append(info, **info_blas)
- dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)])
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- if need_lapack:
-- lapack_info = get_info('lapack')
-- #lapack_info = {} ## uncomment for testing
-- if lapack_info:
-- dict_append(info, **lapack_info)
-- else:
-- warnings.warn(LapackNotFoundError.__doc__, stacklevel=2)
-- lapack_src_info = get_info('lapack_src')
-- if not lapack_src_info:
-- warnings.warn(LapackSrcNotFoundError.__doc__, stacklevel=2)
-- return
-- dict_append(info, libraries=[('flapack_src', lapack_src_info)])
--
-- if need_blas:
-- blas_info = get_info('blas')
-- if blas_info:
-- dict_append(info, **blas_info)
-- else:
-- warnings.warn(BlasNotFoundError.__doc__, stacklevel=2)
-- blas_src_info = get_info('blas_src')
-- if not blas_src_info:
-- warnings.warn(BlasSrcNotFoundError.__doc__, stacklevel=2)
-- return
-- dict_append(info, libraries=[('fblas_src', blas_src_info)])
-+ def calc_info(self):
-+ user_order = os.environ.get('NPY_LAPACK_ORDER', None)
-+ if user_order is None:
-+ lapack_order = self.lapack_order
-+ else:
-+ # the user has requested the order of the
-+ # check they are all in the available list, a COMMA SEPARATED list
-+ user_order = user_order.lower().split(',')
-+ non_existing = []
-+ lapack_order = []
-+ for order in user_order:
-+ if order in self.lapack_order:
-+ lapack_order.append(order)
-+ elif len(order) > 0:
-+ non_existing.append(order)
-+ if len(non_existing) > 0:
-+ raise ValueError("lapack_opt_info user defined "
-+ "LAPACK order has unacceptable "
-+ "values: {}".format(non_existing))
-+
-+ for lapack in lapack_order:
-+ if getattr(self, '_calc_info_{}'.format(lapack))():
-+ return
-
-- self.set_info(**info)
-- return
-+ if 'lapack' not in lapack_order:
-+ # Since the user may request *not* to use any library, we still need
-+ # to raise warnings to signal missing packages!
-+ warnings.warn(LapackNotFoundError.__doc__ or '', stacklevel=2)
-+ warnings.warn(LapackSrcNotFoundError.__doc__ or '', stacklevel=2)
-
-
- class blas_opt_info(system_info):
-
- notfounderror = BlasNotFoundError
-+ # Default order of BLAS checks
-+ blas_order = ['mkl', 'blis', 'openblas', 'atlas', 'accelerate', 'blas']
-
-- def calc_info(self):
-+ def _calc_info_mkl(self):
-+ info = get_info('blas_mkl')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- blas_mkl_info = get_info('blas_mkl')
-- if blas_mkl_info:
-- self.set_info(**blas_mkl_info)
-- return
-+ def _calc_info_blis(self):
-+ info = get_info('blis')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- blis_info = get_info('blis')
-- if blis_info:
-- self.set_info(**blis_info)
-- return
-+ def _calc_info_openblas(self):
-+ info = get_info('openblas')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- openblas_info = get_info('openblas')
-- if openblas_info:
-- self.set_info(**openblas_info)
-- return
-+ def _calc_info_atlas(self):
-+ info = get_info('atlas_3_10_blas_threads')
-+ if not info:
-+ info = get_info('atlas_3_10_blas')
-+ if not info:
-+ info = get_info('atlas_blas_threads')
-+ if not info:
-+ info = get_info('atlas_blas')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- atlas_info = get_info('atlas_3_10_blas_threads')
-- if not atlas_info:
-- atlas_info = get_info('atlas_3_10_blas')
-- if not atlas_info:
-- atlas_info = get_info('atlas_blas_threads')
-- if not atlas_info:
-- atlas_info = get_info('atlas_blas')
--
-- accelerate_info = get_info('accelerate')
-- if accelerate_info and not atlas_info:
-- self.set_info(**accelerate_info)
-- return
-+ def _calc_info_accelerate(self):
-+ info = get_info('accelerate')
-+ if info:
-+ self.set_info(**info)
-+ return True
-+ return False
-
-- need_blas = 0
-+ def _calc_info_blas(self):
-+ # Warn about a non-optimized BLAS library
-+ warnings.warn(BlasOptNotFoundError.__doc__ or '', stacklevel=3)
- info = {}
-- if atlas_info:
-- info = atlas_info
-+ dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)])
-+
-+ blas = get_info('blas')
-+ if blas:
-+ dict_append(info, **blas)
- else:
-- warnings.warn(AtlasNotFoundError.__doc__, stacklevel=2)
-- need_blas = 1
-- dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)])
-+ # Not even BLAS was found!
-+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=3)
-
-- if need_blas:
-- blas_info = get_info('blas')
-- if blas_info:
-- dict_append(info, **blas_info)
-- else:
-- warnings.warn(BlasNotFoundError.__doc__, stacklevel=2)
-- blas_src_info = get_info('blas_src')
-- if not blas_src_info:
-- warnings.warn(BlasSrcNotFoundError.__doc__, stacklevel=2)
-- return
-- dict_append(info, libraries=[('fblas_src', blas_src_info)])
-+ blas_src = get_info('blas_src')
-+ if not blas_src:
-+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=3)
-+ return False
-+ dict_append(info, libraries=[('fblas_src', blas_src)])
-
- self.set_info(**info)
-- return
-+ return True
-+
-+ def calc_info(self):
-+ user_order = os.environ.get('NPY_BLAS_ORDER', None)
-+ if user_order is None:
-+ blas_order = self.blas_order
-+ else:
-+ # the user has requested the order of the
-+ # check they are all in the available list
-+ user_order = user_order.lower().split(',')
-+ non_existing = []
-+ blas_order = []
-+ for order in user_order:
-+ if order in self.blas_order:
-+ blas_order.append(order)
-+ elif len(order) > 0:
-+ non_existing.append(order)
-+ if len(non_existing) > 0:
-+ raise ValueError("blas_opt_info user defined BLAS order has unacceptable values: {}".format(non_existing))
-+
-+ for blas in blas_order:
-+ if getattr(self, '_calc_info_{}'.format(blas))():
-+ return
-+
-+ if 'blas' not in blas_order:
-+ # Since the user may request *not* to use any library, we still need
-+ # to raise warnings to signal missing packages!
-+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=2)
-+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=2)
-
-
- class blas_info(system_info):
diff --git a/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch b/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch
deleted file mode 100644
index b553acb46f..0000000000
--- a/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- spack-src/numpy/distutils/fcompiler/__init__.py.orig 2018-11-03 10:49:58.000000000 +0900
-+++ spack-src/numpy/distutils/fcompiler/__init__.py 2021-02-12 17:57:50.632263931 +0900
-@@ -318,7 +318,12 @@
- if not exe_from_environ:
- possibles = [f90, f77] + self.possible_executables
- else:
-- possibles = [exe_from_environ] + self.possible_executables
-+ matching_executables = []
-+ for e in exe_from_environ:
-+ for p in self.possible_executables:
-+ if p in e:
-+ matching_executables.append(e)
-+ possibles = [matching_executables] + self.possible_executables
-
- seen = set()
- unique_possibles = []
diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py
index 05f5ceec49..80580f9d83 100644
--- a/var/spack/repos/builtin/packages/py-numpy/package.py
+++ b/var/spack/repos/builtin/packages/py-numpy/package.py
@@ -68,24 +68,6 @@ class PyNumpy(PythonPackage):
version("1.17.5", sha256="16507ba6617f62ae3c6ab1725ae6f550331025d4d9a369b83f6d5a470446c342")
version("1.17.4", sha256="f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316")
version("1.17.3", sha256="a0678793096205a4d784bd99f32803ba8100f639cf3b932dc63b21621390ea7e")
- version("1.17.2", sha256="73615d3edc84dd7c4aeb212fa3748fb83217e00d201875a47327f55363cef2df")
- version("1.17.1", sha256="f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca")
- version("1.17.0", sha256="951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a")
- version("1.16.6", sha256="e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff")
- version("1.16.5", sha256="8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c")
- version("1.16.4", sha256="7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7")
- version("1.16.3", sha256="78a6f89da87eeb48014ec652a65c4ffde370c036d780a995edaeb121d3625621")
- version("1.16.2", sha256="6c692e3879dde0b67a9dc78f9bfb6f61c666b4562fd8619632d7043fb5b691b0")
- version("1.16.1", sha256="31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288")
- version("1.16.0", sha256="cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb")
- version("1.15.4", sha256="3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7")
- version("1.15.3", sha256="1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6")
- version("1.15.2", sha256="27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1")
- version("1.15.2", sha256="27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1")
- version("1.15.1", sha256="7b9e37f194f8bcdca8e9e6af92e2cbad79e360542effc2dd6b98d63955d8d8a3")
- version("1.15.0", sha256="f28e73cf18d37a413f7d5de35d024e6b98f14566a10d82100f9dc491a7d449f9")
- version("1.14.6", sha256="1250edf6f6c43e1d7823f0967416bc18258bb271dc536298eb0ea00a9e45b80a")
- version("1.14.5", sha256="a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac")
depends_on("python@3.9:3.12", when="@1.26:", type=("build", "link", "run"))
depends_on("python@3.9:3.11", when="@1.25", type=("build", "link", "run"))
@@ -94,7 +76,6 @@ class PyNumpy(PythonPackage):
depends_on("python@:3.10", when="@1.21.2:1.21", type=("build", "link", "run"))
depends_on("python@:3.9", when="@1.19.3:1.21.1", type=("build", "link", "run"))
depends_on("python@:3.8", when="@1.17.3:1.19.2", type=("build", "link", "run"))
- depends_on("python@:3.7", when="@1.14.5:1.17.2", type=("build", "link", "run"))
depends_on("py-cython@0.29.34:3", when="@1.26:", type="build")
depends_on("py-cython@0.29.34:2", when="@1.25", type="build")
@@ -120,15 +101,10 @@ class PyNumpy(PythonPackage):
depends_on("lapack")
# test_requirements.txt
- depends_on("py-nose@1.0.0:", when="@:1.14", type="test")
- depends_on("py-pytest", when="@1.15:", type="test")
+ depends_on("py-pytest", type="test")
depends_on("py-hypothesis", when="@1.19:", type="test")
depends_on("py-typing-extensions@4.2:", when="@1.23:", type="test")
- # Allows you to specify order of BLAS/LAPACK preference
- # https://github.com/numpy/numpy/pull/13132
- patch("blas-lapack-order.patch", when="@1.15:1.16")
-
# Add Fujitsu Fortran compiler
patch("add_fj_compiler.patch", when="@1.19.3:1.19.5%fj")
patch("add_fj_compiler2.patch", when="@1.19.0:1.19.2%fj")
@@ -137,7 +113,6 @@ class PyNumpy(PythonPackage):
patch("check_executables.patch", when="@1.20.0:")
patch("check_executables2.patch", when="@1.19.0:1.19.5")
patch("check_executables3.patch", when="@1.16.0:1.18.5")
- patch("check_executables4.patch", when="@1.14.0:1.15.4")
# Backport bug fix for f2py's define for threading when building with Mingw
patch(
diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py
index 9e5b90621f..1d4d7670d7 100644
--- a/var/spack/repos/builtin/packages/py-pandas/package.py
+++ b/var/spack/repos/builtin/packages/py-pandas/package.py
@@ -61,11 +61,6 @@ class PyPandas(PythonPackage):
version("1.0.0", sha256="3ea6cc86931f57f18b1240572216f09922d91b19ab8a01cf24734394a3db3bec")
version("0.25.3", sha256="52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4")
version("0.25.2", sha256="ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be")
- version("0.25.1", sha256="cb2e197b7b0687becb026b84d3c242482f20cbb29a9981e43604eb67576da9f6")
- version("0.25.0", sha256="914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995")
- version("0.24.2", sha256="4f919f409c433577a501e023943e582c57355d50a724c589e78bc1d551a535a2")
- version("0.24.1", sha256="435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af")
- version("0.23.4", sha256="5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4")
variant("excel", when="@1.4:", default=False, description="Build with support for Excel")
@@ -78,7 +73,6 @@ class PyPandas(PythonPackage):
depends_on("python@:3.10", when="@1.3.3:1.3", type=("build", "run"))
depends_on("python@:3.9", when="@1.1.3:1.3.2", type=("build", "run"))
depends_on("python@:3.8", when="@0.25.2:1.1.2", type=("build", "run"))
- depends_on("python@:3.7", when="@:0.25.1", type=("build", "run"))
# pyproject.toml
depends_on("py-meson-python@0.13.1", when="@2.1:", type="build")
@@ -102,7 +96,6 @@ class PyPandas(PythonPackage):
depends_on("py-numpy@1.16.5:", when="@1.2:", type=("build", "run"))
depends_on("py-numpy@1.15.4:", when="@1.1:", type=("build", "run"))
depends_on("py-numpy@1.13.3:", when="@0.25:", type=("build", "run"))
- depends_on("py-numpy", type=("build", "run"))
# 'NUMPY_IMPORT_ARRAY_RETVAL' was removed in numpy@1.19
depends_on("py-numpy@:1.18", when="@:0.25", type=("build", "run"))
depends_on("py-python-dateutil@2.8.2:", when="@2:", type=("build", "run"))
@@ -123,12 +116,10 @@ class PyPandas(PythonPackage):
depends_on("py-numexpr@2.7.0:", when="@1.3:", type=("build", "run"))
depends_on("py-numexpr@2.6.8:", when="@1.2:", type=("build", "run"))
depends_on("py-numexpr@2.6.2:", when="@0.25:", type=("build", "run"))
- depends_on("py-numexpr", type=("build", "run"))
depends_on("py-bottleneck@1.3.4:", when="@2.1:", type=("build", "run"))
depends_on("py-bottleneck@1.3.2:", when="@1.5:", type=("build", "run"))
depends_on("py-bottleneck@1.3.1:", when="@1.4:", type=("build", "run"))
depends_on("py-bottleneck@1.2.1:", when="@0.25:", type=("build", "run"))
- depends_on("py-bottleneck", type=("build", "run"))
depends_on("py-numba@0.55.2:", when="@2.1:", type=("build", "run"))
depends_on("py-numba@0.53.1:", when="@2.0:", type=("build", "run"))
@@ -156,9 +147,3 @@ class PyPandas(PythonPackage):
depends_on("py-setuptools@24.2:", when="@:1.2", type="build")
skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"]
-
- def flag_handler(self, name, flags):
- if name == "cflags":
- if self.spec.satisfies("@0.24.2 %oneapi"):
- flags.append("-Wno-error=implicit-function-declaration")
- return (flags, None, None)
diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py
index 5a6007e9e3..31cd7b4e73 100644
--- a/var/spack/repos/builtin/packages/py-pillow/package.py
+++ b/var/spack/repos/builtin/packages/py-pillow/package.py
@@ -48,8 +48,6 @@ class PyPillowBase(PythonPackage):
depends_on("python@3.6:3.9", when="@8:8.3.1", type=("build", "link", "run"))
depends_on("python@3.5:3.8", when="@7.0:7.2", type=("build", "link", "run"))
depends_on("python@2.7:2.8,3.5:3.8", when="@6.2.1:6.2.2", type=("build", "link", "run"))
- depends_on("python@2.7:2.8,3.5:3.7", when="@6.0:6.2.0", type=("build", "link", "run"))
- depends_on("python@2.7:2.8,3.4:3.7", when="@5.2:5.4", type=("build", "link", "run"))
depends_on("py-setuptools", type="build")
# Optional dependencies
@@ -124,9 +122,6 @@ class PyPillow(PyPillowBase):
version("7.0.0", sha256="4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946")
version("6.2.2", sha256="db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950")
version("6.2.1", sha256="bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1")
- version("6.2.0", sha256="4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df")
- version("6.0.0", sha256="809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5")
- version("5.4.1", sha256="5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f")
for ver in [
"10.0.0",
@@ -144,8 +139,5 @@ class PyPillow(PyPillowBase):
"7.0.0",
"6.2.2",
"6.2.1",
- "6.2.0",
- "6.0.0",
- "5.4.1",
]:
provides("pil@" + ver, when="@" + ver)
diff --git a/var/spack/repos/builtin/packages/py-psycopg2/package.py b/var/spack/repos/builtin/packages/py-psycopg2/package.py
index 47e163c956..b9c68a6348 100644
--- a/var/spack/repos/builtin/packages/py-psycopg2/package.py
+++ b/var/spack/repos/builtin/packages/py-psycopg2/package.py
@@ -15,7 +15,6 @@ class PyPsycopg2(PythonPackage):
version("2.9.6", sha256="f15158418fd826831b28585e2ab48ed8df2d0d98f502a2b4fe619e7d5ca29011")
version("2.9.1", sha256="de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c")
version("2.8.6", sha256="fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543")
- version("2.7.5", sha256="eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e")
# https://www.psycopg.org/docs/install.html#prerequisites
# https://github.com/psycopg/psycopg2/blob/master/doc/src/install.rst
@@ -24,8 +23,6 @@ class PyPsycopg2(PythonPackage):
depends_on("python@:3.11", when="@2.9.5:", type=("build", "link", "run"))
depends_on("python@:3.10", when="@2.9.1:2.9.4", type=("build", "link", "run"))
depends_on("python@:3.9", when="@2.8.6:2.9.0", type=("build", "link", "run"))
- depends_on("python@:3.8", when="@2.8.4:2.8.5", type=("build", "link", "run"))
- depends_on("python@:3.7", when="@:2.8.3", type=("build", "link", "run"))
depends_on("py-setuptools", type="build")
@@ -34,4 +31,3 @@ class PyPsycopg2(PythonPackage):
depends_on("postgresql@9.1:13", when="@2.9:2.9.1", type=("build", "link", "run"))
depends_on("postgresql@9.1:12", when="@2.8.4:2.8", type=("build", "link", "run"))
depends_on("postgresql@9.1:11", when="@2.8:2.8.3", type=("build", "link", "run"))
- depends_on("postgresql@9.1:10", when="@:2.7", type=("build", "link", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py
index 0021915fac..8d3b92d05b 100644
--- a/var/spack/repos/builtin/packages/py-pycairo/package.py
+++ b/var/spack/repos/builtin/packages/py-pycairo/package.py
@@ -17,18 +17,14 @@ class PyPycairo(PythonPackage):
version("1.24.0", sha256="1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6")
version("1.20.0", sha256="5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c")
- version("1.18.1", sha256="70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786")
- version("1.17.1", sha256="0f0a35ec923d87bc495f6753b1e540fd046d95db56a35250c44089fbce03b698")
depends_on("python@3.8:", when="@1.23:", type=("build", "run"))
depends_on("python@3.6:3", when="@1.20:1.22", type=("build", "run"))
- depends_on("python@2.7:2.8,3.4:3.7", when="@1.18.1:1.19", type=("build", "run"))
depends_on("py-setuptools", type="build")
# https://github.com/pygobject/pycairo/blob/main/docs/getting_started.rst
depends_on("pkgconfig", type="build")
# version requirements from setup.py
- depends_on("cairo@1.15.10: +pdf", when="@1.20:")
- depends_on("cairo@1.13.1: +pdf", when="@:1.18.1")
+ depends_on("cairo@1.15.10: +pdf")
@run_after("install")
def post_install(self):
diff --git a/var/spack/repos/builtin/packages/py-pygit2/package.py b/var/spack/repos/builtin/packages/py-pygit2/package.py
index 78d9664c94..fbdf009289 100644
--- a/var/spack/repos/builtin/packages/py-pygit2/package.py
+++ b/var/spack/repos/builtin/packages/py-pygit2/package.py
@@ -19,7 +19,6 @@ class PyPygit2(PythonPackage):
version("1.6.0", sha256="7aacea4e57011777f4774421228e5d0ddb9a6ddb87ac4b542346d17ab12a4d62")
version("1.4.0", sha256="cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8")
version("1.3.0", sha256="0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452")
- version("0.28.2", sha256="4d8c3fbbf2e5793a9984681a94e6ac2f1bc91a92cbac762dbdfbea296b917f86")
depends_on("py-setuptools", type="build")
# https://www.pygit2.org/install.html#version-numbers
@@ -29,14 +28,10 @@ class PyPygit2(PythonPackage):
depends_on("libgit2@1.3", when="@1.7:1.8")
depends_on("libgit2@1.1", when="@1.4:1.6")
depends_on("libgit2@1.0", when="@1.2:1.3")
- depends_on("libgit2@0.99:1.0", when="@1.1")
- depends_on("libgit2@0.28", when="@0.28:1.0")
depends_on("python@3.8:3.11", when="@1.11:1.12.1")
depends_on("python@:3.10", when="@1.7:1.10")
depends_on("python@:3.9", when="@1.4:1.6")
depends_on("python@:3.8", when="@1.0:1.3")
- depends_on("python@:3.7", when="@0.28")
- depends_on("py-six", type=("build", "run"), when="@:0.28.2")
depends_on("py-cffi@1.4.0:", when="@:1.5", type=("build", "run"))
depends_on("py-cffi@1.6.0:", when="@1.6:1.7", type=("build", "run"))
depends_on("py-cffi@1.9.1:", when="@1.8:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyqt4/package.py b/var/spack/repos/builtin/packages/py-pyqt4/package.py
index 4ce26a7829..7e19b33fa5 100644
--- a/var/spack/repos/builtin/packages/py-pyqt4/package.py
+++ b/var/spack/repos/builtin/packages/py-pyqt4/package.py
@@ -16,12 +16,6 @@ class PyPyqt4(SIPPackage):
url = "https://www.riverbankcomputing.com/static/Downloads/PyQt4/4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz"
version("4.12.3", sha256="a00f5abef240a7b5852b7924fa5fdf5174569525dc076cd368a566619e56d472")
- version(
- "4.11.3",
- sha256="853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686",
- url="http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/PyQt-x11-gpl-4.11.3.tar.gz",
- deprecated=True,
- )
# API files can be installed regardless if QScintilla is installed or not
variant("qsci_api", default=False, description="Install PyQt API file for QScintilla")
diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py
index 55a63dce74..d4b31b548e 100644
--- a/var/spack/repos/builtin/packages/py-pyqt5/package.py
+++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py
@@ -16,21 +16,6 @@ class PyPyqt5(SIPPackage):
list_url = "https://pypi.org/simple/PyQt5/"
version("5.15.9", sha256="dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0")
- version(
- "5.13.1",
- sha256="54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af",
- deprecated=True,
- )
- version(
- "5.13.0",
- sha256="0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9",
- deprecated=True,
- )
- version(
- "5.12.3",
- sha256="0db0fa37debab147450f9e052286f7a530404e2aaddc438e97a7dcdf56292110",
- deprecated=True,
- )
# pyproject.toml
depends_on("py-sip@6.6.2:6", type="build")
diff --git a/var/spack/repos/builtin/packages/py-pyrosar/package.py b/var/spack/repos/builtin/packages/py-pyrosar/package.py
deleted file mode 100644
index 4e18df9911..0000000000
--- a/var/spack/repos/builtin/packages/py-pyrosar/package.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-
-
-class PyPyrosar(PythonPackage):
- """A framework for large-scale SAR satellite data processing"""
-
- homepage = "https://github.com/johntruckenbrodt/pyroSAR"
- url = "https://github.com/johntruckenbrodt/pyroSAR/archive/v0.8.tar.gz"
-
- version("0.8", sha256="03f6d846afde85807a63f84b1fd25fe61e9a4cda93e9af7d44a67fd4b0b7dbc8")
-
- # python
- depends_on("py-setuptools", type="build")
- depends_on("py-progressbar2", type=("build", "run"))
- depends_on("py-pathos@0.2.0:", type=("build", "run"))
- depends_on("py-numpy@1.16.3", type=("build", "run"))
- depends_on("py-scoop", type=("build", "run"))
- depends_on("py-spatialist@0.2.8", type=("build", "run"))
- depends_on("py-pyyaml", type=("build", "run"))
- # other
- depends_on("gdal+python", type=("build", "link", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pyscf/package.py b/var/spack/repos/builtin/packages/py-pyscf/package.py
index df56a139ba..55018b986e 100644
--- a/var/spack/repos/builtin/packages/py-pyscf/package.py
+++ b/var/spack/repos/builtin/packages/py-pyscf/package.py
@@ -34,7 +34,6 @@ class PyPyscf(PythonPackage):
conflicts("^py-numpy@1.16:1.17", when="@2:")
depends_on("py-scipy@0.12:", type=("build", "run"))
depends_on("py-scipy@0.19:", type=("build", "run"), when="@2.1:")
- depends_on("py-scipy@:1.1.0", when="^python@:3.7 platform=darwin", type=("build", "run"))
conflicts("^py-scipy@1.5.0:1.5.1", when="@2:")
depends_on("py-h5py@2.3.0:", type=("build", "run"))
depends_on("py-h5py@2.7.0:", type=("build", "run"), when="@2:")
diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py
index 541852cbbd..21f70b3fe3 100644
--- a/var/spack/repos/builtin/packages/py-pyspark/package.py
+++ b/var/spack/repos/builtin/packages/py-pyspark/package.py
@@ -18,20 +18,11 @@ class PyPyspark(PythonPackage):
version("3.1.3", sha256="39ac641ef5559a3d1286154779fc990316e9934520853615ae4785c1af52d14b")
version("3.1.2", sha256="5e25ebb18756e9715f4d26848cc7e558035025da74b4fc325a0ebc05ff538e65")
version("3.0.1", sha256="38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479")
- version("2.4.4", sha256="13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694")
- version("2.3.2", sha256="7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8")
- version("2.3.0", sha256="0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e")
- depends_on("python@3.7:", when="@3.3.0:", type=("build", "run"))
- depends_on("python@3.6:", when="@3:3.2.3", type=("build", "run"))
- depends_on("python@2.7:3.7", when="@:2", type=("build", "run"))
- depends_on("python@2.7:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-py4j@0.10.9.5", when="@3.3.0:", type=("build", "run"))
depends_on("py-py4j@0.10.9.3", when="@3.2.1", type=("build", "run"))
depends_on("py-py4j@0.10.9", when="@3.0.1:3.1.3", type=("build", "run"))
- depends_on("py-py4j@0.10.7", when="@2.3.2:2.4.4", type=("build", "run"))
- depends_on("py-py4j@0.10.6", when="@2.3.0", type=("build", "run"))
def setup_run_environment(self, env):
env.set("PYSPARK_PYTHON", self.spec["python"].command.path)
diff --git a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
index d7d225f7cf..f298997924 100644
--- a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
+++ b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py
@@ -45,10 +45,7 @@ class PyQiskitTerra(PythonPackage):
depends_on("py-retworkx@0.11.0:", type=("build", "run"))
depends_on("py-scipy@1.5:", type=("build", "run"))
depends_on("py-symengine@0.9:", type=("build", "run"))
- depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
- depends_on("py-shared-memory38", when="^python@:3.7", type=("build", "run"))
depends_on("py-tweedledum@1.1:1", type=("build", "run"), when="^python@:3.11")
- depends_on("py-importlib-metadata@:4", when="^python@:3.7", type=("build", "run"))
with when("@0.23.3"):
depends_on("python@3.7:", type=("build", "run"))
@@ -56,7 +53,3 @@ class PyQiskitTerra(PythonPackage):
depends_on("py-rustworkx@0.12.0:", type=("build", "run"))
depends_on("py-scipy@1.5:", type=("build", "run"))
depends_on("py-symengine@0.9:", type=("build", "run"))
- depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
- depends_on("py-shared-memory38", when="^python@:3.7", type=("build", "run"))
- depends_on("py-importlib-metadata@:4", when="^python@:3.7", type=("build", "run"))
- depends_on("py-singledispatchmethod", when="^python@:3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py
index 0d9b38f69e..d98f009c9f 100644
--- a/var/spack/repos/builtin/packages/py-quantities/package.py
+++ b/var/spack/repos/builtin/packages/py-quantities/package.py
@@ -17,7 +17,6 @@ class PyQuantities(PythonPackage):
version("0.13.0", sha256="0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81")
version("0.12.5", sha256="67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0")
version("0.12.4", sha256="a33d636d1870c9e1127631185d89b0105a49f827d6aacd44ad9d8f151f331d8b")
- version("0.12.3", sha256="582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883")
depends_on("python@3.8:", type=("build", "run"), when="@0.14:")
@@ -28,4 +27,3 @@ class PyQuantities(PythonPackage):
depends_on("py-numpy@1.19:", type=("build", "run"), when="@0.14:")
depends_on("py-numpy@1.16:", type=("build", "run"), when="@0.13")
depends_on("py-numpy@1.8.2:1.17", type=("build", "run"), when="@0.12.4:0.12")
- depends_on("py-numpy@1.8.2:1.16", type=("build", "run"), when="@0.12.3")
diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py
index 83db363c98..478149f894 100644
--- a/var/spack/repos/builtin/packages/py-rasterio/package.py
+++ b/var/spack/repos/builtin/packages/py-rasterio/package.py
@@ -34,8 +34,6 @@ class PyRasterio(PythonPackage):
version("1.2.3", sha256="d8c345e01052b70ac3bbbe100c83def813c0ab19f7412c2c98e553d03720c1c5")
version("1.1.8", sha256="f7cac7e2ecf65b4b1eb78c994c63bd429b67dc679b0bc0ecfe487d3d5bf88fd5")
version("1.1.5", sha256="ebe75c71f9257c780615caaec8ef81fa4602702cf9290a65c213e1639284acc9")
- version("1.0.24", sha256="4839479621045211f66868ec49625979693450bc2e476f23e7e8ac4804eaf452")
- version("1.0a12", sha256="47d460326e04c64590ff56952271a184a6307f814efc34fb319c12e690585f3c")
# From pyproject.toml
depends_on("py-setuptools@67.8:", when="@1.3.9:", type="build")
@@ -46,7 +44,6 @@ class PyRasterio(PythonPackage):
depends_on("python@3.8:", when="@1.3:", type=("build", "link", "run"))
depends_on("python@3.6:3.9", when="@1.2", type=("build", "link", "run"))
depends_on("python@2.7:2.8,3.5:3.8", when="@1.1", type=("build", "link", "run"))
- depends_on("python@2.7:2.8,3.5:3.7", when="@:1.0", type=("build", "link", "run"))
depends_on("py-affine", type=("build", "run"))
depends_on("py-attrs", type=("build", "run"))
depends_on("py-certifi", when="@1.2:", type=("build", "run"))
@@ -65,5 +62,3 @@ class PyRasterio(PythonPackage):
depends_on("gdal@2.4:3.3", when="@1.2.7:1.2")
depends_on("gdal@2.3:3.2", when="@1.2.0:1.2.6")
depends_on("gdal@1.11:3.2", when="@1.1.0:1.1")
- depends_on("gdal@1.11:3.0", when="@1.0.25:1.0")
- depends_on("gdal@1.11:2", when="@:1.0.24")
diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
index 05f6d09b53..8f6e121c20 100644
--- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
@@ -41,13 +41,6 @@ class PyScikitLearn(PythonPackage):
)
version("0.22.1", sha256="51ee25330fc244107588545c70e2f3570cfc4017cff09eed69d6e1d82a212b7d")
version("0.22", sha256="314abf60c073c48a1e95feaae9f3ca47a2139bd77cebb5b877c23a45c9e03012")
- version("0.21.3", sha256="eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003")
- version("0.21.2", sha256="0aafc312a55ebf58073151b9308761a5fcfa45b7f7730cea4b1f066f824c72db")
- version("0.21.1", sha256="228d0611e69e5250946f8cd7bbefec75347950f0ca426d0c518db8f06583f660")
- version("0.20.3", sha256="c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41")
- version("0.20.2", sha256="bc5bc7c7ee2572a1edcb51698a6caf11fae554194aaab9a38105d9ec419f29e6")
- version("0.20.0", sha256="97d1d971f8ec257011e64b7d655df68081dd3097322690afa1a71a1d755f8c18")
- version("0.19.2", sha256="b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888")
variant("openmp", default=True, description="Build with OpenMP support")
@@ -58,7 +51,6 @@ class PyScikitLearn(PythonPackage):
depends_on("python@:3.10", when="@1.0.2", type=("build", "run"))
depends_on("python@:3.9", when="@0.24:1.0.1", type=("build", "run"))
depends_on("python@:3.8", when="@0.22:0.23", type=("build", "run"))
- depends_on("python@:3.7", when="@:0.21", type=("build", "run"))
# pyproject.toml
depends_on("py-setuptools", type="build")
@@ -66,27 +58,22 @@ class PyScikitLearn(PythonPackage):
depends_on("py-cython@0.29.33:2", when="@1.3:", type="build")
depends_on("py-cython@0.29.24:2", when="@1.0.2:", type="build")
depends_on("py-cython@0.28.5:2", when="@0.21:", type="build")
- depends_on("py-cython@0.23:2", type="build")
# sklearn/_min_dependencies.py
depends_on("py-numpy@1.17.3:", when="@1.1:", type=("build", "run"))
depends_on("py-numpy@1.14.6:", when="@1.0:", type=("build", "run"))
depends_on("py-numpy@1.13.3:", when="@0.23:", type=("build", "run"))
depends_on("py-numpy@1.11.0:", when="@0.21:", type=("build", "run"))
- depends_on("py-numpy@1.8.2:", when="@0.20", type=("build", "run"))
- depends_on("py-numpy@1.6.1:", when="@:0.19", type=("build", "run"))
depends_on("py-scipy@1.5:", when="@1.3:", type=("build", "run"))
depends_on("py-scipy@1.3.2:", when="@1.1:", type=("build", "run"))
depends_on("py-scipy@1.1.0:", when="@1.0:", type=("build", "run"))
depends_on("py-scipy@0.19.1:", when="@0.23:", type=("build", "run"))
depends_on("py-scipy@0.17.0:", when="@0.21:", type=("build", "run"))
- depends_on("py-scipy@0.13.3:", when="@0.20", type=("build", "run"))
- depends_on("py-scipy@0.9:", when="@:0.19", type=("build", "run"))
depends_on("py-joblib@1.1.1:", when="@1.2:", type=("build", "run"))
depends_on("py-joblib@1:", when="@1.1:", type=("build", "run"))
depends_on("py-joblib@0.11:", type=("build", "run"))
depends_on("py-threadpoolctl@2.0.0:", when="@0.23:", type=("build", "run"))
- depends_on("llvm-openmp", when="@0.21: %apple-clang +openmp")
+ depends_on("llvm-openmp", when="%apple-clang +openmp")
# Test dependencies
depends_on("py-matplotlib@3.1.3:", type="test")
diff --git a/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py b/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py
deleted file mode 100644
index 24811637c0..0000000000
--- a/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class PyScikitTensorPy3(PythonPackage):
- """A python module for multilinear algebra and tensor factorizations."""
-
- homepage = "http://github.com/evertrol/scikit-tensor-py3"
- pypi = "scikit-tensor-py3/scikit-tensor-py3-0.4.1.tar.gz"
-
- maintainers("meyersbs")
-
- version("0.4.1", sha256="b45de97ebd57e0213f54e891bf9a0549957eb2387f4df9f3dc3f7a50f8818b0a")
-
- depends_on("python@3.5:", type=("build", "run"))
- depends_on("py-setuptools", type="build")
- depends_on("py-numpy@1.16:1.16", type=("build", "run"))
- depends_on("py-scipy@1.3:1.3", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index 5d053cbb91..5bee65a3c0 100644
--- a/var/spack/repos/builtin/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
@@ -16,7 +16,6 @@ class PyScipy(PythonPackage):
maintainers("adamjstewart", "rgommers")
version("main", branch="main")
- version("master", branch="master", deprecated=True)
version("1.11.4", sha256="90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa")
version("1.11.3", sha256="bba4d955f54edd61899776bad459bf7326e14b9fa1c552181f0479cc60a568cd")
version("1.11.2", sha256="b29318a5e39bd200ca4381d80b065cdf3076c7d7281c5e36569e99273867f61d")
@@ -47,12 +46,6 @@ class PyScipy(PythonPackage):
version("1.4.0", sha256="31f7cfa93b01507c935c12b535e24812594002a02a56803d7cd063e9920d25e8")
version("1.3.3", sha256="64bf4e8ae0db2d42b58477817f648d81e77f0b381d0ea4427385bba3f959380a")
version("1.3.2", sha256="a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4")
- version("1.3.1", sha256="2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5")
- version("1.3.0", sha256="c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a")
- version("1.2.3", sha256="ecbe6413ca90b8e19f8475bfa303ac001e81b04ec600d17fa7f816271f7cca57")
- version("1.2.2", sha256="a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1")
- version("1.2.1", sha256="e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c")
- version("1.1.0", sha256="878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1")
# Based on wheel availability on PyPI
depends_on("python@3.9:3.12", when="@1.11:", type=("build", "link", "run"))
@@ -61,7 +54,6 @@ class PyScipy(PythonPackage):
depends_on("python@:3.10", when="@1.7.2:1.7", type=("build", "link", "run"))
depends_on("python@:3.9", when="@1.5.4:1.7.1", type=("build", "link", "run"))
depends_on("python@:3.8", when="@1.3.2:1.5.3", type=("build", "link", "run"))
- depends_on("python@:3.7", when="@1.1:1.3.1", type=("build", "link", "run"))
depends_on("py-meson-python@0.12.1:", when="@1.11:", type="build")
depends_on("py-meson-python@0.11:", when="@1.10:", type="build")
@@ -103,7 +95,6 @@ class PyScipy(PythonPackage):
depends_on("py-numpy@1.16.5:1.22", when="@1.6:1.7", type=("build", "link", "run"))
depends_on("py-numpy@1.14.5:1.21", when="@1.5", type=("build", "link", "run"))
depends_on("py-numpy@1.13.3:1.21", when="@1.3:1.4", type=("build", "link", "run"))
- depends_on("py-numpy@1.8.2:1.20", when="@:1.2", type=("build", "link", "run"))
depends_on("py-pytest", type="test")
# Required to use --config-settings
@@ -111,7 +102,7 @@ class PyScipy(PythonPackage):
# https://docs.scipy.org/doc/scipy/dev/toolchain.html#other-libraries
depends_on("lapack@3.7.1:", when="@1.9:")
- depends_on("lapack@3.4.1:", when="@1.2:")
+ depends_on("lapack@3.4.1:")
depends_on("lapack")
depends_on("blas")
@@ -147,7 +138,7 @@ class PyScipy(PythonPackage):
patch(
"https://git.sagemath.org/sage.git/plain/build/pkgs/scipy/patches/extern_decls.patch?id=711fe05025795e44b84233e065d240859ccae5bd",
sha256="5433f60831cb554101520a8f8871ac5a32c95f7a971ccd68b69049535b106780",
- when="@1.2:1.5.3",
+ when="@:1.5.3",
)
patch("scipy-clang.patch", when="@1.5.0:1.6.3 %clang")
diff --git a/var/spack/repos/builtin/packages/py-shared-memory38/package.py b/var/spack/repos/builtin/packages/py-shared-memory38/package.py
deleted file mode 100644
index 61a012a50d..0000000000
--- a/var/spack/repos/builtin/packages/py-shared-memory38/package.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
-from spack.package import *
-
-
-class PySharedMemory38(PythonPackage):
- """Backport of multiprocessing.shared_memory for Python 3.6 and
- 3.7. Simply import all things from shared_memory to make your code
- work. Note that multiprocessing.managers.SharedMemoryManager is also
- included under shared_memory package."""
-
- homepage = "https://github.com/mars-project/shared_memory38"
- pypi = "shared_memory38/shared_memory38-0.1.2.tar.gz"
-
- version("0.1.2", sha256="9d4f11fcb08cce059cc31fc8c70292b786a4cf9e411555b37077b7020f5d97e5")
-
- depends_on("python@3.6:3.7", type=("build", "run"))
- depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-tap-py/package.py b/var/spack/repos/builtin/packages/py-tap-py/package.py
deleted file mode 100644
index 6ab4ba352a..0000000000
--- a/var/spack/repos/builtin/packages/py-tap-py/package.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class PyTapPy(PythonPackage):
- """Python TAP interface module for unit tests"""
-
- homepage = "https://github.com/python-tap/tappy"
- pypi = "tap.py/tap.py-3.0.tar.gz"
-
- version("3.0", sha256="f5eeeeebfd64e53d32661752bb4c288589a3babbb96db3f391a4ec29f1359c70")
- version("2.6.2", sha256="5f219d92dbad5e378f8f7549cdfe655b0d5fd2a778f9c83bee51b61c6ca40efb")
-
- depends_on("python@3.5:3.7", when="@3.0:", type=("build", "run"))
- depends_on("python@2.7:2.8,3.5:3.7", type=("build", "run"))
- depends_on("py-setuptools", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
index 355f59a4a7..db4e210b68 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
@@ -30,9 +30,6 @@ class PyTensorflowEstimator(Package):
version("2.4.0", sha256="e6ea12014c3d8c89a81ace95f8f8b7c39ffcd3e4e4626709e4aee0010eefd962")
version("2.3.0", sha256="75403e7de7e8ec30ec0781ede56ed84cbe5e90daad64a9c242cd489c8fe63a17")
version("2.2.0", sha256="2d68cb6e6442e7dcbfa2e092aa25bdcb0eda420536a829b85d732854a4c85d46")
- version("2.1", sha256="1d74c8181b981748976fa33ad97d3434c3cf2b7e29a0b00861365fe8329dbc4e")
- version("2.0.0", sha256="6f4bdf1ab219e1f1cba25d2af097dc820f56479f12a839853d97422fe4d8b465")
- version("1.13.0", sha256="a787b150ff436636df723e507019c72a5d6486cfe506886279d380166953f12f")
extends("python")
@@ -56,9 +53,6 @@ class PyTensorflowEstimator(Package):
"2.4",
"2.3",
"2.2",
- "2.1",
- "2.0",
- "1.13",
]:
depends_on("py-tensorflow@" + ver, when="@" + ver, type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch b/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch
deleted file mode 100644
index bb742ff1b4..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/tensorflow/core/BUILD.orig 2020-01-22 18:43:57.000000000 -0500
-+++ b/tensorflow/core/BUILD 2020-03-26 16:33:17.318229701 -0400
-@@ -107,8 +107,6 @@
- load(
- "//tensorflow/core/platform:default/build_config.bzl",
- "tf_additional_all_protos",
-- "tf_additional_cloud_kernel_deps",
-- "tf_additional_cloud_op_deps",
- "tf_additional_core_deps",
- "tf_additional_cupti_wrapper_deps",
- "tf_additional_device_tracer_cuda_deps",
-@@ -1427,7 +1425,7 @@
- ]) + if_tensorrt([
- "//tensorflow/compiler/tf2tensorrt:trt_engine_resource_ops_op_lib",
- "//tensorflow/compiler/tf2tensorrt:trt_op_libs",
-- ]) + tf_additional_cloud_op_deps(),
-+ ]),
- alwayslink = 1,
- )
-
-@@ -1590,7 +1588,7 @@
- "//tensorflow/core/kernels:summary_kernels",
- "//tensorflow/core/kernels:training_ops",
- "//tensorflow/core/kernels:word2vec_kernels",
-- ] + tf_additional_cloud_kernel_deps() + if_not_windows([
-+ ] + if_not_windows([
- "//tensorflow/core/kernels:fact_op",
- "//tensorflow/core/kernels:array_not_windows",
- "//tensorflow/core/kernels:math_not_windows",
-
-diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
-index b822effa14e5..61a19bdf128f 100644
---- a/tensorflow/core/platform/default/build_config.bzl
-+++ b/tensorflow/core/platform/default/build_config.bzl
-@@ -682,38 +682,6 @@ def tf_additional_core_deps():
- ],
- })
-
--# TODO(jart, jhseu): Delete when GCP is default on.
--def tf_additional_cloud_op_deps():
-- return select({
-- "//tensorflow:android": [],
-- "//tensorflow:ios": [],
-- "//tensorflow:linux_s390x": [],
-- "//tensorflow:windows": [],
-- "//tensorflow:api_version_2": [],
-- "//tensorflow:windows_and_api_version_2": [],
-- "//tensorflow:no_gcp_support": [],
-- "//conditions:default": [
-- "//tensorflow/contrib/cloud:bigquery_reader_ops_op_lib",
-- "//tensorflow/contrib/cloud:gcs_config_ops_op_lib",
-- ],
-- })
--
--# TODO(jhseu): Delete when GCP is default on.
--def tf_additional_cloud_kernel_deps():
-- return select({
-- "//tensorflow:android": [],
-- "//tensorflow:ios": [],
-- "//tensorflow:linux_s390x": [],
-- "//tensorflow:windows": [],
-- "//tensorflow:api_version_2": [],
-- "//tensorflow:windows_and_api_version_2": [],
-- "//tensorflow:no_gcp_support": [],
-- "//conditions:default": [
-- "//tensorflow/contrib/cloud/kernels:bigquery_reader_ops",
-- "//tensorflow/contrib/cloud/kernels:gcs_config_ops",
-- ],
-- })
--
- def tf_lib_proto_parsing_deps():
- return [
- ":protos_all_cc",
---
-2.19.1
-
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch b/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch
deleted file mode 100644
index 281cd63b14..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
-index 740f24ec4a..7b8300f678 100644
---- a/tensorflow/tensorflow.bzl
-+++ b/tensorflow/tensorflow.bzl
-@@ -1604,6 +1604,7 @@ def _py_wrap_cc_impl(ctx):
- outputs = outputs,
- mnemonic = "PythonSwig",
- progress_message = "SWIGing " + src.path,
-+ use_default_shell_env = True,
- )
- return struct(files = depset(outputs))
-
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch
deleted file mode 100644
index 8813edf365..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tensorflow/contrib/__init__.py 2020-05-05 17:52:57.716350118 -0500
-+++ b/tensorflow/contrib/__init__.py 2020-05-05 17:56:55.665192882 -0500
-@@ -20,7 +20,10 @@
-
- # Add projects here, they will show up under tf.contrib.
- from tensorflow.contrib import bayesflow
--from tensorflow.contrib import cloud
-+try:
-+ from tensorflow.contrib import cloud
-+except ImportError:
-+ pass
- from tensorflow.contrib import compiler
- from tensorflow.contrib import copy_graph
- from tensorflow.contrib import crf
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch
deleted file mode 100644
index e76defff49..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tensorflow/contrib/__init__.py 2020-05-05 18:14:30.701463150 -0500
-+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:15:12.392435370 -0500
-@@ -26,7 +26,10 @@
- from tensorflow.contrib import bayesflow
- from tensorflow.contrib import checkpoint
- if os.name != "nt":
-- from tensorflow.contrib import cloud
-+ try:
-+ from tensorflow.contrib import cloud
-+ except ImportError:
-+ pass
- from tensorflow.contrib import cluster_resolver
- from tensorflow.contrib import coder
- from tensorflow.contrib import compiler
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch
deleted file mode 100644
index a65417233e..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tensorflow/contrib/__init__.py 2020-05-05 18:08:09.361724827 -0500
-+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:08:46.345699058 -0500
-@@ -20,7 +20,10 @@
-
- # Add projects here, they will show up under tf.contrib.
- from tensorflow.contrib import bayesflow
--from tensorflow.contrib import cloud
-+try:
-+ from tensorflow.contrib import cloud
-+except ImportError:
-+ pass
- from tensorflow.contrib import cluster_resolver
- from tensorflow.contrib import compiler
- from tensorflow.contrib import copy_graph
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch
deleted file mode 100644
index 2a0ac1f713..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tensorflow/contrib/__init__.py 2020-05-05 18:11:33.660582455 -0500
-+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:12:32.570541708 -0500
-@@ -25,7 +25,10 @@
- from tensorflow.contrib import batching
- from tensorflow.contrib import bayesflow
- from tensorflow.contrib import checkpoint
--from tensorflow.contrib import cloud
-+try:
-+ from tensorflow.contrib import cloud
-+except ImportError:
-+ pass
- from tensorflow.contrib import cluster_resolver
- from tensorflow.contrib import coder
- from tensorflow.contrib import compiler
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch b/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch
deleted file mode 100644
index ea919567c1..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/WORKSPACE b/WORKSPACE
-index 1796182..84b5eab 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -1,5 +1,7 @@
- workspace(name = "org_tensorflow")
-
-+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
-+
- http_archive(
- name = "io_bazel_rules_closure",
- sha256 = "a38539c5b5c358548e75b44141b4ab637bba7c4dc02b46b1f62a96d6433f56ae",
-@@ -30,7 +32,7 @@ android_workspace()
- # Please add all new TensorFlow dependencies in workspace.bzl.
- tf_workspace()
-
--new_http_archive(
-+http_archive(
- name = "inception_v1",
- build_file = "models.BUILD",
- sha256 = "7efe12a8363f09bc24d7b7a450304a15655a57a7751929b2c1593a71183bb105",
-@@ -40,7 +42,7 @@ new_http_archive(
- ],
- )
-
--new_http_archive(
-+http_archive(
- name = "mobile_ssd",
- build_file = "models.BUILD",
- sha256 = "bddd81ea5c80a97adfac1c9f770e6f55cbafd7cce4d3bbe15fbeb041e6b8f3e8",
-@@ -50,7 +52,7 @@ new_http_archive(
- ],
- )
-
--new_http_archive(
-+http_archive(
- name = "mobile_multibox",
- build_file = "models.BUILD",
- sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96",
-@@ -60,7 +62,7 @@ new_http_archive(
- ],
- )
-
--new_http_archive(
-+http_archive(
- name = "stylize",
- build_file = "models.BUILD",
- sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa",
-@@ -70,7 +72,7 @@ new_http_archive(
- ],
- )
-
--new_http_archive(
-+http_archive(
- name = "speech_commands",
- build_file = "models.BUILD",
- sha256 = "c3ec4fea3158eb111f1d932336351edfe8bd515bb6e87aad4f25dbad0a600d0c",
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch b/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch
deleted file mode 100644
index 5b341e69f1..0000000000
--- a/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/WORKSPACE b/WORKSPACE
-index 74ea14d..0b09a6e 100644
---- a/WORKSPACE
-+++ b/WORKSPACE
-@@ -34,6 +34,13 @@ load(
-
- bazel_toolchains_repositories()
-
-+http_archive(
-+ name = "io_bazel_rules_docker",
-+ sha256 = "413bb1ec0895a8d3249a01edf24b82fd06af3c8633c9fb833a0cb1d4b234d46d",
-+ strip_prefix = "rules_docker-0.12.0",
-+ urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.0/rules_docker-v0.12.0.tar.gz"],
-+)
-+
- load(
- "@io_bazel_rules_docker//repositories:repositories.bzl",
- container_repositories = "repositories",
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py
index 13bbdf3a11..0fd3d7d9fe 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py
@@ -71,56 +71,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
version("2.2.2", sha256="fb4b5d26c5b983350f7ce8297b71176a86a69e91faf66e6ebb1e58538ad3bb51")
version("2.2.1", sha256="e6a28e64236d729e598dbeaa02152219e67d0ac94d6ed22438606026a02e0f88")
version("2.2.0", sha256="69cd836f87b8c53506c4f706f655d423270f5a563b76dc1cfa60fbc3184185a3")
- version("2.1.4", sha256="f5bd53802b616cc5b4fe5e57a5d3b0f090500a87790020d5fccb0773be7c4b47")
- version("2.1.3", sha256="cfa66cce372f486e95a42beb1aacfefdaf0092c5efaaaa92459b381fde931fb8")
- version("2.1.2", sha256="3f941cda0ed12dfef5472e46f1d0238ea85da7583d73f1132d2ef050fda6e8ad")
- version("2.1.1", sha256="a200bc16e4b630db3ac7225bcb6f239a76841967b0aec1d7d7bbe44dc5661318")
- version("2.1.0", sha256="638e541a4981f52c69da4a311815f1e7989bf1d67a41d204511966e1daed14f7")
- version("2.0.4", sha256="6ca3ce1255da8d655080a89db10da03f72c361d7faecc9a35e6af26ff12c06e6")
- version("2.0.3", sha256="6314299a723441bd9892e5c2af182c2be7d2256e20e71026e1cb1264cb497f33")
- version("2.0.2", sha256="a548742bbafd302eec51e2794d7687674a64f6b10ce1414073858cb83c0cefc2")
- version("2.0.1", sha256="29197d30923b9670992ee4b9c6161f50c7452e9a4158c720746e846080ac245a")
- version("2.0.0", sha256="49b5f0495cd681cbcb5296a4476853d4aea19a43bdd9f179c928a977308a0617")
- version("1.15.5", sha256="4c4d23e311093ded2d2e287b18d7c45b07b5984ab88a1d2f91f8f13c886123db")
- version("1.15.4", sha256="e18c55e771ad136f9bf3a70ea8f0e2d36662b2ba7c890f9eaf7950554557c7fa")
- version("1.15.3", sha256="9ab1d92e58eb813922b040acc7622b32d73c2d8d971fe6491a06f9df4c778151")
- version("1.15.2", sha256="d95d75d26a298211b5e802842e87fda5b8b14f6ad83719377b391e5fb71b8746")
- version("1.15.1", sha256="19b6e72bc8675937f618cede364d7228a71c2eeaffc42801bcefd98dda7ca056")
- version("1.15.0", sha256="a5d49c00a175a61da7431a9b289747d62339be9cf37600330ad63b611f7f5dc9")
- version("1.14.0", sha256="aa2a6a1daafa3af66807cfe0bc77bfe1144a9a53df9a96bab52e3e575b3047ed")
- version("1.13.2", sha256="abe3bf0c47845a628b7df4c57646f41a10ee70f914f1b018a5c761be75e1f1a9")
- version("1.13.1", sha256="7cd19978e6bc7edc2c847bce19f95515a742b34ea5e28e4389dade35348f58ed")
- version("1.12.3", sha256="b9e5488e84f4a133ed20b18605f0cd6301f11d356bd959712db4e7b9301d0462")
- version("1.12.2", sha256="90ffc7cf1df5e4b8385c9108db18d5d5034ec423547c0e167d44f5746a20d06b")
- version("1.12.1", sha256="7b559a3ae56322b7a7e4307f45f9fce96022c533a98b32c18bfdff8c5838271d")
- version("1.12.0", sha256="3c87b81e37d4ed7f3da6200474fa5e656ffd20d8811068572f43610cae97ca92")
- version("1.11.0", sha256="f49ce3f1d04cee854bc9f74fa9696991140b34a2e2447f35f01391b72c8bfa9f")
- version("1.10.1", sha256="83092d709800e2d93d4d4b1bcacaeb74f2f328962ed764cb35bbee20402879c6")
- version("1.10.0", sha256="ee9cb98d9e0d8106f2f4ed52a38fe89399324af303e1401567e5b64a9f86744b")
- version("1.9.0", sha256="ffc3151b06823d57b4a408261ba8efe53601563dfe93af0866751d4f6ca5068c")
- version("1.8.0", sha256="47646952590fd213b747247e6870d89bb4a368a95ae3561513d6c76e44f92a75")
- version("1.7.1", sha256="3147f8c60d1f30da23a831bcf732e74b935dcee7c62e4b8b85f0f093030b52c8")
- version("1.7.0", sha256="c676a96fc8700722816b2b98c85578b2f99fac7a7b2484c9c7f0641484f8d50d")
- version("1.6.0", sha256="03cf1423446abbead6bd8c3cf6e6affa7d99746cd119691b012aac9a1795f4fb")
- version("1.5.1", sha256="cab2157783905e12a7a3baae3264edfb739dd92d5658019a131fff4b14190240")
- version("1.5.0", sha256="0642781c3a3a8c2c4834b91b86aec385f0b2ada7d721571458079478cc5b29c8")
- version("1.4.1", sha256="1f75e463318419a1b3ae076d5a92697c1d3a85e8377c946a5510b651ff5c0d60")
- version("1.4.0", sha256="8a0ad8d61f8f6c0282c548661994a5ab83ac531bac496c3041dedc1ab021107b")
- version("1.3.1", sha256="ded509c209f8a1d390df8a2f44be5b5c29963172b0e0f095304efb59765d0523")
- version("1.3.0", sha256="e1af1bb767b57c3416de0d43a5f74d174c42b85231dffd36f3630173534d4307")
- version("1.2.1", sha256="f2baf09b1a9a0500907b4d5cb5473070b3ecede06ed6e8d1096873c91922fb9e")
- version("1.2.0", sha256="03dbf7548d1fc1c11ed58da5fa68616f795c819f868f43478cbcaa26abed374f")
- version("1.1.0", sha256="aad4470f52fa59f54de7b9a2da727429e6755d91d756f245f952698c42a60027")
- version("1.0.1", sha256="deea3c65e0703da96d9c3f1162e464c51d37659dd129396af134e9e8f1ea8c05")
- version("1.0.0", sha256="db8b3b8f4134b7c9c1b4165492ad5d5bb78889fcd99ffdffc325e97da3e8c677")
variant("mkl", default=False, description="Build with MKL support")
variant("jemalloc", default=False, description="Build with jemalloc as malloc support")
variant("gcp", default=False, description="Build with Google Cloud Platform support")
variant("hdfs", default=False, description="Build with Hadoop File System support")
variant("aws", default=False, description="Build with Amazon AWS Platform support")
- variant("kafka", default=False, description="Build with Apache Kafka Platform support")
- variant("ignite", default=False, description="Build with Apache Ignite support")
variant("xla", default=sys.platform != "darwin", description="Build with XLA JIT support")
variant("gdr", default=False, description="Build with GDR support")
variant("verbs", default=False, description="Build with libverbs support")
@@ -153,7 +109,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("python@:3.10", when="@2.8:2.11", type=("build", "run"))
depends_on("python@:3.9", when="@2.5:2.7", type=("build", "run"))
depends_on("python@:3.8", when="@2.2:2.4", type=("build", "run"))
- depends_on("python@:3.7", when="@:2.1", type=("build", "run"))
# See .bazelversion
depends_on("bazel@6.1.0", type="build", when="@2.14:")
@@ -166,20 +121,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("bazel@3.7.2:3.99.0", type="build", when="@2.5:2.6")
depends_on("bazel@3.1.0:3.99.0", type="build", when="@2.3:2.4")
depends_on("bazel@2.0.0", type="build", when="@2.2")
- depends_on("bazel@0.27.1:0.29.1", type="build", when="@2.1")
- depends_on("bazel@0.24.1:0.26.1", type="build", when="@1.15:2.0")
- # See call to check_bazel_version in configure.py
- depends_on("bazel@0.24.1:0.25.2", type="build", when="@1.14")
- depends_on("bazel@0.19.0:0.21.0", type="build", when="@1.13")
- depends_on("bazel@0.24.1:0.25.0", type="build", when="@1.12.1")
- depends_on("bazel@0.15.0", type="build", when="@1.10:1.12.0,1.12.2:1.12.3")
- depends_on("bazel@0.10.0", type="build", when="@1.7:1.9")
- # See call to check_version in tensorflow/workspace.bzl
- depends_on("bazel@0.5.4", type="build", when="@1.4:1.6")
- # See MIN_BAZEL_VERSION in configure
- depends_on("bazel@0.4.5", type="build", when="@1.2:1.3")
- # See call to check_version in WORKSPACE
- depends_on("bazel@0.4.2", type="build", when="@1.0:1.1")
depends_on("swig", type="build")
depends_on("py-pip", type="build")
@@ -189,8 +130,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("py-absl-py@1:", type=("build", "run"), when="@2.9:")
depends_on("py-absl-py@0.4:", type=("build", "run"), when="@2.7:2.8")
depends_on("py-absl-py@0.10:0", type=("build", "run"), when="@2.4:2.6")
- depends_on("py-absl-py@0.7:", type=("build", "run"), when="@1.12.1,1.14:2.3")
- depends_on("py-absl-py@0.1.6:", type=("build", "run"), when="@1.5:1.12.0,1.12.2:1.13.2")
+ depends_on("py-absl-py@0.7:", type=("build", "run"), when="@:2.3")
depends_on("py-astunparse@1.6:", type=("build", "run"), when="@2.7:")
depends_on("py-astunparse@1.6.3:1.6", type=("build", "run"), when="@2.4:2.6")
depends_on("py-astunparse@1.6.3", type=("build", "run"), when="@2.2:2.3")
@@ -207,22 +147,20 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("py-gast@0.2.1:0.4", type=("build", "run"), when="@2.7")
depends_on("py-gast@0.4.0", type=("build", "run"), when="@2.5:2.6")
depends_on("py-gast@0.3.3", type=("build", "run"), when="@2.2:2.4")
- depends_on("py-gast@0.2.2", type=("build", "run"), when="@1.15:2.1")
- depends_on("py-gast@0.2:", type=("build", "run"), when="@1.6:1.14")
+ depends_on("py-gast@0.2.2", type=("build", "run"), when="@:2.1")
depends_on("py-google-pasta@0.1.1:", type=("build", "run"), when="@2.7:")
depends_on("py-google-pasta@0.2:0", type=("build", "run"), when="@2.4:2.6")
depends_on("py-google-pasta@0.1.8:", type=("build", "run"), when="@2.2:2.3")
- depends_on("py-google-pasta@0.1.6:", type=("build", "run"), when="@1.14:2.1")
- depends_on("py-google-pasta@0.1.2:", type=("build", "run"), when="@1.12.1")
+ depends_on("py-google-pasta@0.1.6:", type=("build", "run"), when="@:2.1")
depends_on("py-h5py@2.9:", type=("build", "run"), when="@2.7:")
depends_on("py-h5py@3.1", type=("build", "run"), when="@2.5:2.6")
depends_on("py-h5py@2.10", type=("build", "run"), when="@2.2:2.4")
- depends_on("py-h5py@:2.10.0", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:2.1")
+ depends_on("py-h5py@:2.10.0", type=("build", "run"), when="@2.1.3:2.1")
# propagate the mpi variant setting for h5py/hdf5 to avoid unexpected crashes
- depends_on("py-h5py+mpi", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:+mpi")
- depends_on("py-h5py~mpi", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:~mpi")
- depends_on("hdf5+mpi", type="build", when="@1.15.5,2.0.4,2.1.3:+mpi")
- depends_on("hdf5~mpi", type="build", when="@1.15.5,2.0.4,2.1.3:~mpi")
+ depends_on("py-h5py+mpi", type=("build", "run"), when="@2.1.3:+mpi")
+ depends_on("py-h5py~mpi", type=("build", "run"), when="@2.1.3:~mpi")
+ depends_on("hdf5+mpi", type="build", when="@2.1.3:+mpi")
+ depends_on("hdf5~mpi", type="build", when="@2.1.3:~mpi")
depends_on("py-libclang@13:", type=("build", "run"), when="@2.9:")
depends_on("py-libclang@9.0.1:", type=("build", "run"), when="@2.7:2.8")
depends_on("py-ml-dtypes@0.2.0", type=("build", "run"), when="@2.14:")
@@ -233,36 +171,22 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("py-numpy@1.14.5:", type=("build", "run"), when="@2.7")
depends_on("py-numpy@1.19.2:1.19", type=("build", "run"), when="@2.4:2.6")
# https://github.com/tensorflow/tensorflow/issues/40688
- depends_on("py-numpy@1.16.0:1.18", type=("build", "run"), when="@1.13.2,1.15:2.3")
- depends_on("py-numpy@1.14.5:1.18", type=("build", "run"), when="@1.12.1,1.14")
- depends_on(
- "py-numpy@1.13.3:1.18", type=("build", "run"), when="@1.6:1.9,1.11:1.12.0,1.12.2:1.13.1"
- )
- depends_on("py-numpy@1.13.3:1.14.5", type=("build", "run"), when="@1.10")
- depends_on("py-numpy@1.12.1:1.14.5", type=("build", "run"), when="@1.4:1.5")
- depends_on("py-numpy@1.11.0:1.14.5", type=("build", "run"), when="@:1.3")
- depends_on("py-opt-einsum@2.3.2:", type=("build", "run"), when="@1.15:2.3,2.7:")
+ depends_on("py-numpy@1.16.0:1.18", type=("build", "run"), when="@:2.3")
+ depends_on("py-opt-einsum@2.3.2:", type=("build", "run"), when="@:2.3,2.7:")
depends_on("py-opt-einsum@3.3", type=("build", "run"), when="@2.4:2.6")
depends_on("py-packaging", type=("build", "run"), when="@2.9:")
depends_on("py-protobuf@3.20.3:4.20,4.21.6:4", type=("build", "run"), when="@2.12:")
depends_on("py-protobuf@3.9.2:", type=("build", "run"), when="@2.3:2.11")
- depends_on("py-protobuf@3.8.0:", type=("build", "run"), when="@2.1:2.2")
- depends_on("py-protobuf@3.6.1:", type=("build", "run"), when="@1.12:2.0")
- depends_on("py-protobuf@3.6.0:", type=("build", "run"), when="@1.10:1.11")
- depends_on("py-protobuf@3.4.0:", type=("build", "run"), when="@1.5:1.9")
- depends_on("py-protobuf@3.3.0:", type=("build", "run"), when="@1.3:1.4")
- depends_on("py-protobuf@3.2.0:", type=("build", "run"), when="@1.1:1.2")
- depends_on("py-protobuf@3.1.0:", type=("build", "run"), when="@:1.0")
+ depends_on("py-protobuf@3.8.0:", type=("build", "run"), when="@:2.2")
# https://github.com/protocolbuffers/protobuf/issues/10051
# https://github.com/tensorflow/tensorflow/issues/56266
depends_on("py-protobuf@:3.19", type=("build", "run"), when="@:2.11")
# Must be matching versions of py-protobuf and protobuf
conflicts("^py-protobuf~cpp")
depends_on("py-setuptools", type=("build", "run"))
- depends_on("py-six@1.12:", type=("build", "run"), when="@2.1:2.3,2.7:")
+ depends_on("py-six@1.12:", type=("build", "run"), when="@:2.3,2.7:")
depends_on("py-six@1.15", type=("build", "run"), when="@2.4:2.6")
- depends_on("py-six@1.10:", type=("build", "run"), when="@:2.0")
- depends_on("py-termcolor@1.1:", type=("build", "run"), when="@1.6:2.3,2.7:")
+ depends_on("py-termcolor@1.1:", type=("build", "run"), when="@:2.3,2.7:")
depends_on("py-termcolor@1.1", type=("build", "run"), when="@2.4:2.6")
depends_on("py-typing-extensions@3.6.6:", type=("build", "run"), when="@2.7:2.12,2.14:")
depends_on("py-typing-extensions@3.6.6:4.5", type=("build", "run"), when="@2.13")
@@ -270,7 +194,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("py-wrapt@1.11:1.14", type=("build", "run"), when="@2.12,2.14:")
depends_on("py-wrapt@1.11:", type=("build", "run"), when="@2.7:2.11,2.13")
depends_on("py-wrapt@1.12.1:1.12", type=("build", "run"), when="@2.4:2.6")
- depends_on("py-wrapt@1.11.1:", type=("build", "run"), when="@1.12.1,1.14:2.3")
+ depends_on("py-wrapt@1.11.1:", type=("build", "run"), when="@:2.3")
# TODO: add packages for these dependencies
# depends_on('py-tensorflow-io-gcs-filesystem@0.23.1:', type=('build', 'run'), when='@2.8:')
@@ -282,7 +206,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("py-grpcio@1.37.0:1", type=("build", "run"), when="@2.6")
depends_on("py-grpcio@1.34", type=("build", "run"), when="@2.5")
depends_on("py-grpcio@1.32", type=("build", "run"), when="@2.4")
- depends_on("py-grpcio@1.8.6:", type=("build", "run"), when="@1.6:2.3")
+ depends_on("py-grpcio@1.8.6:", type=("build", "run"), when="@:2.3")
for minor_ver in range(5, 15):
depends_on(
@@ -301,20 +225,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("coreutils", when="@2.13: platform=darwin", type="build")
# No longer a dependency in latest versions
- depends_on("py-astor@0.6:", type=("build", "run"), when="@1.6:2.1")
- depends_on("py-backports-weakref@1.0rc1", type=("build", "run"), when="@1.2")
depends_on("py-jax@0.3.15:", type=("build", "run"), when="@2.12")
- depends_on("py-keras-applications@1.0.8:", type=("build", "run"), when="@1.15:2.1")
- depends_on("py-keras-applications@1.0.6:", type=("build", "run"), when="@1.12:1.14")
- depends_on("py-keras-applications@1.0.5:", type=("build", "run"), when="@1.11")
depends_on("py-keras-preprocessing@1.1.1:", type=("build", "run"), when="@2.7:2.10")
depends_on("py-keras-preprocessing@1.1.2:1.1", type=("build", "run"), when="@2.4:2.6")
depends_on("py-keras-preprocessing@1.1.1:1.1", type=("build", "run"), when="@2.3")
- depends_on("py-keras-preprocessing@1.1:", type=("build", "run"), when="@2.1.0,2.2")
- depends_on("py-keras-preprocessing@1.1.0", type=("build", "run"), when="@2.1.1:2.1")
- depends_on("py-keras-preprocessing@1.0.5:", type=("build", "run"), when="@1.12:2.0")
- depends_on("py-keras-preprocessing@1.0.3:", type=("build", "run"), when="@1.11")
- depends_on("py-scipy@1.4.1", type=("build", "run"), when="@2.1.0:2.1.1,2.2.0,2.3.0")
+ depends_on("py-keras-preprocessing@1.1:", type=("build", "run"), when="@2.2")
+ depends_on("py-scipy@1.4.1", type=("build", "run"), when="@2.2.0,2.3.0")
depends_on("py-wheel@0.32:0", type=("build", "run"), when="@2.7")
depends_on("py-wheel@0.35:0", type=("build", "run"), when="@2.4:2.6")
depends_on("py-wheel@0.26:", type=("build", "run"), when="@:2.3")
@@ -353,7 +269,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
depends_on("rocminfo")
# Check configure and configure.py to see when these variants are supported
- conflicts("+mkl", when="@:1.0")
conflicts("+mkl", when="platform=darwin", msg="Darwin is not yet supported")
conflicts(
"+jemalloc",
@@ -365,12 +280,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
when="platform=cray",
msg="Currently jemalloc is only support on Linux platform",
)
- conflicts("+aws", when="@:1.3")
- conflicts("+kafka", when="@:1.5,2.1:")
- conflicts("+ignite", when="@:1.11,2.1:")
- conflicts("+gdr", when="@:1.3")
- conflicts("+verbs", when="@:1.1")
- conflicts("+ngraph", when="@:1.10")
conflicts("+opencl", when="platform=windows")
conflicts("+computecpp", when="~opencl")
conflicts(
@@ -384,27 +293,9 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
when="+cuda",
msg="Must specify CUDA compute capabilities of your GPU, see https://developer.nvidia.com/cuda-gpus",
)
- conflicts(
- "cuda_arch=20",
- when="@1.12.1,1.14:",
- msg="TensorFlow only supports compute capabilities >= 3.5",
- )
- conflicts(
- "cuda_arch=30",
- when="@1.12.1,1.14:",
- msg="TensorFlow only supports compute capabilities >= 3.5",
- )
- conflicts(
- "cuda_arch=32",
- when="@1.12.1,1.14:",
- msg="TensorFlow only supports compute capabilities >= 3.5",
- )
- conflicts(
- "cuda_arch=20",
- when="@1.4:1.12.0,1.12.2:1.12.3",
- msg="Only compute capabilities 3.0 or higher are supported",
- )
- conflicts("+tensorrt", when="@:1.5")
+ conflicts("cuda_arch=20", msg="TensorFlow only supports compute capabilities >= 3.5")
+ conflicts("cuda_arch=30", msg="TensorFlow only supports compute capabilities >= 3.5")
+ conflicts("cuda_arch=32", msg="TensorFlow only supports compute capabilities >= 3.5")
conflicts("+tensorrt", when="~cuda")
conflicts(
"+tensorrt",
@@ -416,7 +307,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
when="platform=cray",
msg="Currently TensorRT is only supported on Linux platform",
)
- conflicts("+nccl", when="@:1.7")
conflicts("+nccl", when="~cuda~rocm")
conflicts(
"+nccl", when="platform=darwin", msg="Currently NCCL is only supported on Linux platform"
@@ -425,14 +315,8 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
"+nccl", when="platform=cray", msg="Currently NCCL is only supported on Linux platform"
)
conflicts("+mpi", when="platform=windows")
- conflicts("+mpi", when="@:1.2")
- conflicts("+android", when="@:1.4")
- conflicts("+ios", when="@:1.12.0,1.12.2:1.13")
conflicts("+ios", when="platform=linux", msg="iOS support only available on macOS")
conflicts("+ios", when="platform=cray", msg="iOS support only available on macOS")
- conflicts("+monolithic", when="@:1.3")
- conflicts("+numa", when="@:1.12.0,1.12.2:1.13")
- conflicts("+dynamic_kernels", when="@:1.12.0,1.12.2:1.12.3")
# https://github.com/tensorflow/tensorflow/pull/45404
conflicts("platform=darwin target=aarch64:", when="@:2.4")
# https://github.com/tensorflow/tensorflow/pull/39225
@@ -445,8 +329,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
# https://www.tensorflow.org/install/source#tested_build_configurations
conflicts("%gcc@:9.3.0", when="@2.9:")
- conflicts("%gcc@:7.3.0", when="@1.15:")
- conflicts("%gcc@:4.7")
+ conflicts("%gcc@:7.3.0")
# zlib is vendored and downloaded directly from zlib.org (or mirrors), but
# old downloads are removed from that site immediately after a new release.
@@ -469,30 +352,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
when="@2.10",
)
- # Avoid build error: "no such package '@io_bazel_rules_docker..."
- patch("io_bazel_rules_docker2.patch", when="@1.15:2.0")
- # Avoide build error: "name 'new_http_archive' is not defined"
- patch("http_archive.patch", when="@1.12.3")
- # Backport of 837c8b6b upstream
- # "Remove contrib cloud bigtable and storage ops/kernels."
- # Allows 2.0.* releases to build with '--config=nogcp'
- patch("0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch", when="@2.0.0:2.0")
-
- # for fcc
- patch("1-1_fcc_tf_patch.patch", when="@2.1.0:2.1%fj")
-
- # do not import contrib.cloud if not available
- patch(
- "https://github.com/tensorflow/tensorflow/commit/ed62ac8203999513dfae03498e871ea35eb60cc4.patch?full_index=1",
- sha256="ff02e249532a5661b123108734a39534992d81da90f0c8187bf4e151a865effc",
- when="@1.14.0",
- )
- # import_contrib_cloud patch for older versions
- patch("contrib_cloud_1.10.patch", when="@1.10:1.13")
- patch("contrib_cloud_1.9.patch", when="@1.9")
- patch("contrib_cloud_1.4.patch", when="@1.4:1.8")
- patch("contrib_cloud_1.1.patch", when="@1.1:1.3")
-
# needed for protobuf 3.16+
patch("example_parsing.patch", when="@:2.7 ^protobuf@3.16:")
@@ -561,18 +420,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
env.set("TF_NEED_AWS", "0")
env.set("TF_NEED_S3", "0")
- # Do you wish to build TensorFlow with Apache Kafka Platform support?
- if "+kafka" in spec:
- env.set("TF_NEED_KAFKA", "1")
- else:
- env.set("TF_NEED_KAFKA", "0")
-
- # Do you wish to build TensorFlow with Apache Ignite support?
- if "+ignite" in spec:
- env.set("TF_NEED_IGNITE", "1")
- else:
- env.set("TF_NEED_IGNITE", "0")
-
# Do you wish to build TensorFlow with XLA JIT support?
if "+xla" in spec:
env.set("TF_ENABLE_XLA", "1")
@@ -785,21 +632,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
".tf_configure.bazelrc",
)
- if spec.satisfies("@1.5.0: ~android"):
+ if spec.satisfies("~android"):
# env variable is somehow ignored -> brute force
# TODO: find a better solution
filter_file(r"if workspace_has_any_android_rule\(\)", r"if True", "configure.py")
- # version dependent fixes
- if spec.satisfies("@1.3.0:1.5.0"):
- # checksum for protobuf that bazel downloads (@github) changed
- filter_file(
- r'sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93"',
- r'sha256 = "e5fdeee6b28cf6c38d61243adff06628baa434a22b5ebb7432d2a7fbabbdb13d"',
- "tensorflow/workspace.bzl",
- )
-
- if spec.satisfies("@1.5.0: ~gcp"):
+ if spec.satisfies("~gcp"):
# google cloud support seems to be installed on default, leading
# to boringssl error manually set the flag to false to avoid
# installing gcp support
@@ -810,7 +648,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
".tf_configure.bazelrc",
)
- if spec.satisfies("@1.8.0: ~opencl"):
+ if spec.satisfies("~opencl"):
# 1.8.0 and 1.9.0 aborts with numpy import error during python_api
# generation somehow the wrong PYTHONPATH is used...
# set --distinct_host_configuration=false as a workaround
@@ -819,26 +657,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
f.write("build --distinct_host_configuration=false\n")
f.write('build --action_env PYTHONPATH="{0}"\n'.format(env["PYTHONPATH"]))
- if spec.satisfies("@1.13.1 +nccl"):
- filter_file(
- r"^build --action_env NCCL_INSTALL_PATH=.*",
- r'build --action_env NCCL_INSTALL_PATH="' + spec["nccl"].libs.directories[0] + '"',
- ".tf_configure.bazelrc",
- )
- filter_file(
- r"^build --action_env NCCL_HDR_PATH=.*",
- r'build --action_env NCCL_HDR_PATH="' + spec["nccl"].prefix.include + '"',
- ".tf_configure.bazelrc",
- )
-
- # see tensorflow issue #31187 on github
- if spec.satisfies("@2.0.0:2.0"):
- filter_file(
- r"\#define RUY_DONOTUSEDIRECTLY_AVX512 1",
- "#define RUY_DONOTUSEDIRECTLY_AVX512 0",
- "tensorflow/lite/experimental/ruy/platform.h",
- )
-
if spec.satisfies("+cuda"):
libs = spec["cuda"].libs.directories
libs.extend(spec["cudnn"].libs.directories)
@@ -881,56 +699,46 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
args.append("--incompatible_no_support_tools_in_action_inputs=false")
# See .bazelrc for when each config flag is supported
- if spec.satisfies("@1.12.1:"):
- if "+mkl" in spec:
- args.append("--config=mkl")
-
- if "+monolithic" in spec:
- args.append("--config=monolithic")
-
- if "+gdr" in spec:
- args.append("--config=gdr")
+ if "+mkl" in spec:
+ args.append("--config=mkl")
- if "+verbs" in spec:
- args.append("--config=verbs")
+ if "+monolithic" in spec:
+ args.append("--config=monolithic")
- if "+ngraph" in spec:
- args.append("--config=ngraph")
+ if "+gdr" in spec:
+ args.append("--config=gdr")
- if "+dynamic_kernels" in spec:
- args.append("--config=dynamic_kernels")
+ if "+verbs" in spec:
+ args.append("--config=verbs")
- if "+cuda" in spec:
- args.append("--config=cuda")
+ if "+ngraph" in spec:
+ args.append("--config=ngraph")
- if "+rocm" in spec:
- args.append("--config=rocm")
+ if "+dynamic_kernels" in spec:
+ args.append("--config=dynamic_kernels")
- if "~aws" in spec:
- args.append("--config=noaws")
+ if "+cuda" in spec:
+ args.append("--config=cuda")
- if "~gcp" in spec:
- args.append("--config=nogcp")
+ if "+rocm" in spec:
+ args.append("--config=rocm")
- if "~hdfs" in spec:
- args.append("--config=nohdfs")
+ if "~aws" in spec:
+ args.append("--config=noaws")
- if "~nccl" in spec:
- args.append("--config=nonccl")
+ if "~gcp" in spec:
+ args.append("--config=nogcp")
- if spec.satisfies("@1.12.1:2.0"):
- if "~ignite" in spec:
- args.append("--config=noignite")
+ if "~hdfs" in spec:
+ args.append("--config=nohdfs")
- if "~kafka" in spec:
- args.append("--config=nokafka")
+ if "~nccl" in spec:
+ args.append("--config=nonccl")
- if spec.satisfies("@1.12.1,1.14:"):
- if "+numa" in spec:
- args.append("--config=numa")
+ if "+numa" in spec:
+ args.append("--config=numa")
- if spec.satisfies("@2:"):
- args.append("--config=v2")
+ args.append("--config=v2")
args.append("//tensorflow/tools/pip_package:build_pip_package")
diff --git a/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch b/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch
deleted file mode 100644
index 9cb136b3f8..0000000000
--- a/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu
-index 1cee04c200..f46003d9a9 100644
---- a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu
-+++ b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu
-@@ -10,48 +10,6 @@
- namespace at { namespace native { namespace sparse { namespace cuda {
-
-
--std::string cusparseGetErrorString(cusparseStatus_t status) {
-- switch(status)
-- {
-- case CUSPARSE_STATUS_SUCCESS:
-- return "success";
--
-- case CUSPARSE_STATUS_NOT_INITIALIZED:
-- return "library not initialized";
--
-- case CUSPARSE_STATUS_ALLOC_FAILED:
-- return "resource allocation failed";
--
-- case CUSPARSE_STATUS_INVALID_VALUE:
-- return "an invalid numeric value was used as an argument";
--
-- case CUSPARSE_STATUS_ARCH_MISMATCH:
-- return "an absent device architectural feature is required";
--
-- case CUSPARSE_STATUS_MAPPING_ERROR:
-- return "an access to GPU memory space failed";
--
-- case CUSPARSE_STATUS_EXECUTION_FAILED:
-- return "the GPU program failed to execute";
--
-- case CUSPARSE_STATUS_INTERNAL_ERROR:
-- return "an internal operation failed";
--
-- case CUSPARSE_STATUS_MATRIX_TYPE_NOT_SUPPORTED:
-- return "the matrix type is not supported by this function";
--
-- case CUSPARSE_STATUS_ZERO_PIVOT:
-- return "an entry of the matrix is either structural zero or numerical zero (singular block)";
--
-- default:
-- {
-- std::ostringstream oss;
-- oss << "unknown error " << static_cast<int64_t>(status);
-- return oss.str();
-- }
-- }
--}
--
- inline void CUSPARSE_CHECK(cusparseStatus_t status)
- {
- if (status != CUSPARSE_STATUS_SUCCESS) {
diff --git a/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch b/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch
deleted file mode 100644
index 826c5c2b07..0000000000
--- a/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 00dcabd131..bddd3716ca 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -107,7 +107,7 @@ else()
- set(AT_MKLDNN_ENABLED 0)
- set(AT_MKL_ENABLED 0)
- endif()
--set_property(CACHE BLAS PROPERTY STRINGS "Eigen;ATLAS;OpenBLAS;MKL;vecLib")
-+set_property(CACHE BLAS PROPERTY STRINGS "Eigen;ATLAS;OpenBLAS;MKL;vecLib;SSL2")
- message(STATUS "Trying to find preferred BLAS backend of choice: " ${BLAS})
-
- if(BLAS STREQUAL "Eigen")
-@@ -147,6 +147,20 @@ elseif(BLAS STREQUAL "vecLib")
- find_package(vecLib REQUIRED)
- include_directories(SYSTEM ${vecLib_INCLUDE_DIR})
- list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS ${vecLib_LINKER_LIBS})
-+elseif(BLAS STREQUAL "SSL2")
-+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$"
-+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$")
-+ message(STATUS "SSL2 Selected BLAS library")
-+ list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS "fjlapackexsve.so")
-+ set(SSL2_FOUND ON)
-+ message(STATUS "set CMAKE_SHARED_LINKER_FLAGS: -SSL2 --linkfortran")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran")
-+ set(WITH_BLAS "ssl2")
-+ else()
-+ message(STATUS "Not built using fcc and FCC.")
-+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
-+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
-+ endif()
- else()
- message(FATAL_ERROR "Unrecognized BLAS option: " ${BLAS})
- endif()
-@@ -156,7 +170,7 @@ if (NOT INTERN_BUILD_MOBILE)
- set(AT_MKL_ENABLED 0)
- set(AT_MKL_MT 0)
- set(USE_BLAS 1)
-- if(NOT (ATLAS_FOUND OR OpenBLAS_FOUND OR MKL_FOUND OR VECLIB_FOUND))
-+ if(NOT (ATLAS_FOUND OR OpenBLAS_FOUND OR MKL_FOUND OR VECLIB_FOUND OR SSL2_FOUND))
- message(WARNING "Preferred BLAS (" ${BLAS} ") cannot be found, now searching for a general BLAS library")
- find_package(BLAS)
- if (NOT BLAS_FOUND)
-diff --git a/cmake/Modules/FindBLAS.cmake b/cmake/Modules/FindBLAS.cmake
-index d6c0346739..72f4e18da2 100644
---- a/cmake/Modules/FindBLAS.cmake
-+++ b/cmake/Modules/FindBLAS.cmake
-@@ -225,6 +225,28 @@ if((NOT BLAS_LIBRARIES)
- endif (BLAS_LIBRARIES)
- endif()
-
-+# BLAS in SSL2 library?
-+if((NOT BLAS_LIBRARIES)
-+ AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "ssl2")))
-+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$"
-+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$")
-+ check_fortran_libraries(
-+ BLAS_LIBRARIES
-+ BLAS
-+ sgemm
-+ "-SSL2;--linkfortran"
-+ "fjlapackexsve")
-+ if (BLAS_LIBRARIES)
-+ set(BLAS_INFO "ssl2")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran")
-+ endif (BLAS_LIBRARIES)
-+ else()
-+ message(STATUS "Not built using fcc and FCC.")
-+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
-+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
-+ endif()
-+endif()
-+
- # Generic BLAS library?
- if((NOT BLAS_LIBRARIES)
- AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "generic")))
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py
index 89fc3d0f2a..8f1077eb3a 100644
--- a/var/spack/repos/builtin/packages/py-torch/package.py
+++ b/var/spack/repos/builtin/packages/py-torch/package.py
@@ -24,7 +24,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
import_modules = ["torch", "torch.autograd", "torch.nn", "torch.utils"]
version("main", branch="main")
- version("master", branch="main", deprecated=True)
version("2.1.2", tag="v2.1.2", commit="a8e7c98cb95ff97bb30a728c6b2a1ce6bff946eb")
version("2.1.1", tag="v2.1.1", commit="4c55dc50355d5e923642c59ad2a23d6ad54711e7")
version("2.1.0", tag="v2.1.0", commit="7bcf7da3a268b435777fe87c7794c382f444e86d")
@@ -49,12 +48,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
version("1.5.1", tag="v1.5.1", commit="3c31d73c875d9a4a6ea8a843b9a0d1b19fbe36f3")
version("1.5.0", tag="v1.5.0", commit="4ff3872a2099993bf7e8c588f7182f3df777205b")
version("1.4.1", tag="v1.4.1", commit="74044638f755cd8667bedc73da4dbda4aa64c948")
- version("1.3.1", tag="v1.3.1", commit="ee77ccbb6da4e2efd83673e798acf7081bc03564")
- version("1.3.0", tag="v1.3.0", commit="de394b672d0346f2f387a8bb1a1280d5d2eaf9cb")
- version("1.2.0", tag="v1.2.0", commit="8554416a199c4cec01c60c7015d8301d2bb39b64")
- version("1.1.0", tag="v1.1.0", commit="142c973f4179e768164cd578951489e89021b29c")
- version("1.0.1", tag="v1.0.1", commit="83221655a8237ca80f9673dad06a98d34c43e546")
- version("1.0.0", tag="v1.0.0", commit="db5d3131d16f57abd4f13d3f4b885d5f67bf6644")
is_darwin = sys.platform == "darwin"
@@ -140,7 +133,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
depends_on("python@:3.10", when="@1.11:1", type=("build", "link", "run"))
depends_on("python@:3.9", when="@1.7.1:1.10", type=("build", "link", "run"))
depends_on("python@:3.8", when="@1.4:1.7.0", type=("build", "link", "run"))
- depends_on("python@:3.7", when="@:1.3", type=("build", "link", "run"))
# CMakelists.txt
depends_on("cmake@3.18:", when="@2:", type="build")
@@ -177,8 +169,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
depends_on("py-pybind11@2.10.1", when="@2.0", type=("build", "link", "run"))
depends_on("py-pybind11@2.10.0", when="@1.13:1", type=("build", "link", "run"))
depends_on("py-pybind11@2.6.2", when="@1.8:1.12", type=("build", "link", "run"))
- depends_on("py-pybind11@2.3.0", when="@1.1:1.7", type=("build", "link", "run"))
- depends_on("py-pybind11@2.2.4", when="@:1.0", type=("build", "link", "run"))
+ depends_on("py-pybind11@2.3.0", when="@:1.7", type=("build", "link", "run"))
depends_on("py-protobuf@3.12.2:", when="@1.10:", type=("build", "run"))
depends_on("py-protobuf@:3.14", when="@:1.9", type=("build", "run"))
depends_on("protobuf@3.12.2:", when="@1.10:")
@@ -211,11 +202,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
# https://discuss.pytorch.org/t/compiling-1-10-1-from-source-with-gcc-11-and-cuda-11-5/140971
depends_on("cuda@10.2:11.4", when="@1.10+cuda", type=("build", "link", "run"))
depends_on("cuda@9.2:11.4", when="@1.6:1.9+cuda", type=("build", "link", "run"))
- depends_on("cuda@9:11.4", when="@1.2:1.5+cuda", type=("build", "link", "run"))
- depends_on("cuda@7.5:11.4", when="@:1.1+cuda", type=("build", "link", "run"))
+ depends_on("cuda@9:11.4", when="@:1.5+cuda", type=("build", "link", "run"))
depends_on("cudnn@7:", when="@1.6:+cudnn")
- depends_on("cudnn@7", when="@1.2:1.5+cudnn")
- depends_on("cudnn@6.5:7", when="@:1.1+cudnn")
+ depends_on("cudnn@7", when="@:1.5+cudnn")
depends_on("magma+cuda", when="+magma+cuda")
depends_on("magma+rocm", when="+magma+rocm")
depends_on("nccl", when="+nccl+cuda")
@@ -280,14 +269,14 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
patch(
"https://github.com/pytorch/pytorch/pull/59220.patch?full_index=1",
sha256="6d5717267f901e8ee493dfacd08734d9bcc48ad29a76ca9ef702368e96bee675",
- when="@1.2:1.11",
+ when="@:1.11",
)
# Fixes build on older systems with glibc <2.12
patch(
"https://github.com/pytorch/pytorch/pull/55063.patch?full_index=1",
sha256="2229bcbf20fbe88aa9f7318f89c126ec7f527875ffe689a763c78abfa127a65c",
- when="@1.1:1.8.1",
+ when="@:1.8.1",
)
# https://github.com/pytorch/pytorch/issues/70297
@@ -311,13 +300,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
patch(
"https://github.com/pytorch/pytorch/commit/e921cd222a8fbeabf5a3e74e83e0d8dfb01aa8b5.patch?full_index=1",
sha256="0f3ad037a95af9d34b1d085050c1e7771fd00f0b89e5b3a276097b7c9f4fabf8",
- when="@1.1:1.5",
+ when="@:1.5",
)
- # Removes duplicate definition of getCusparseErrorString
- # https://github.com/pytorch/pytorch/issues/32083
- patch("cusparseGetErrorString.patch", when="@:1.0^cuda@10.1.243:")
-
# Fixes 'FindOpenMP.cmake'
# to detect openmp settings used by Fujitsu compiler.
patch("detect_omp_of_fujitsu_compiler.patch", when="%fj")
@@ -328,8 +313,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
patch("fj-ssl2_1.9.patch", when="@1.9^fujitsu-ssl2")
patch("fj-ssl2_1.8.patch", when="@1.8^fujitsu-ssl2")
patch("fj-ssl2_1.6-1.7.patch", when="@1.6:1.7^fujitsu-ssl2")
- patch("fj-ssl2_1.3-1.5.patch", when="@1.3:1.5^fujitsu-ssl2")
- patch("fj-ssl2_1.2.patch", when="@1.2^fujitsu-ssl2")
+ patch("fj-ssl2_1.3-1.5.patch", when="@:1.5^fujitsu-ssl2")
# Fix compilation of +distributed~tensorpipe
# https://github.com/pytorch/pytorch/issues/68002
@@ -454,7 +438,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
environment variables.
"""
- def enable_or_disable(variant, keyword="USE", var=None, newer=False):
+ def enable_or_disable(variant, keyword="USE", var=None):
"""Set environment variable to enable or disable support for a
particular variant.
@@ -462,23 +446,14 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
variant (str): the variant to check
keyword (str): the prefix to use for enabling/disabling
var (str): CMake variable to set. Defaults to variant.upper()
- newer (bool): newer variants that never used NO_*
"""
if var is None:
var = variant.upper()
- # Version 1.1.0 switched from NO_* to USE_* or BUILD_*
- # But some newer variants have always used USE_* or BUILD_*
- if self.spec.satisfies("@1.1:") or newer:
- if "+" + variant in self.spec:
- env.set(keyword + "_" + var, "ON")
- elif "~" + variant in self.spec:
- env.set(keyword + "_" + var, "OFF")
- else:
- if "+" + variant in self.spec:
- env.unset("NO_" + var)
- elif "~" + variant in self.spec:
- env.set("NO_" + var, "ON")
+ if "+" + variant in self.spec:
+ env.set(keyword + "_" + var, "ON")
+ elif "~" + variant in self.spec:
+ env.set(keyword + "_" + var, "OFF")
# Build in parallel to speed up build times
env.set("MAX_JOBS", make_jobs)
@@ -552,7 +527,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
# cmake/Modules/FindNumPy.cmake
enable_or_disable("numpy")
# cmake/Modules/FindOpenMP.cmake
- enable_or_disable("openmp", newer=True)
+ enable_or_disable("openmp")
enable_or_disable("qnnpack")
enable_or_disable("qnnpack", var="PYTORCH_QNNPACK")
enable_or_disable("valgrind")
@@ -561,7 +536,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
enable_or_disable("distributed")
enable_or_disable("mpi")
# cmake/Modules/FindGloo.cmake
- enable_or_disable("gloo", newer=True)
+ enable_or_disable("gloo")
enable_or_disable("tensorpipe")
if "+debug" in self.spec:
@@ -574,7 +549,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
elif "~onnx_ml" in self.spec:
env.set("ONNX_ML", "OFF")
- if not self.spec.satisfies("@main,master"):
+ if not self.spec.satisfies("@main"):
env.set("PYTORCH_BUILD_VERSION", self.version)
env.set("PYTORCH_BUILD_NUMBER", 0)
diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py
index 571b7b8246..e1c4eb1a6b 100644
--- a/var/spack/repos/builtin/packages/py-torchvision/package.py
+++ b/var/spack/repos/builtin/packages/py-torchvision/package.py
@@ -43,10 +43,6 @@ class PyTorchvision(PythonPackage):
version("0.6.1", sha256="8173680a976c833640ecbd0d7e6f0a11047bf8833433e2147180efc905e48656")
version("0.6.0", sha256="02de11b3abe6882de4032ce86dab9c7794cbc84369b44d04e667486580f0f1f7")
version("0.5.0", sha256="eb9afc93df3d174d975ee0914057a9522f5272310b4d56c150b955c287a4d74d")
- version("0.4.2", sha256="1184a27eab85c9e784bacc6f9d6fec99e168ab4eda6047ef9f709e7fdb22d8f9")
- version("0.4.1", sha256="053689351272b3bd2ac3e6ba51efd284de0e4ca4a301f54674b949f1e62b7176")
- version("0.4.0", sha256="c270d74e568bad4559fed4544f6dd1e22e2eb1c60b088e04a5bd5787c4150589")
- version("0.3.0", sha256="c205f0618c268c6ed2f8abb869ef6eb83e5339c1336c243ad321a2f2a85195f0")
desc = "Enable support for native encoding/decoding of {} formats in torchvision.io"
variant("png", default=False, description=desc.format("PNG"))
@@ -60,7 +56,6 @@ class PyTorchvision(PythonPackage):
depends_on("python@:3.10", when="@0.12:0.14", type=("build", "link", "run"))
depends_on("python@:3.9", when="@0.8.2:0.11", type=("build", "link", "run"))
depends_on("python@:3.8", when="@0.5:0.8.1", type=("build", "link", "run"))
- depends_on("python@:3.7", when="@:0.4", type=("build", "link", "run"))
# https://github.com/pytorch/vision#installation
depends_on("py-torch@main", when="@main", type=("build", "link", "run"))
@@ -90,11 +85,6 @@ class PyTorchvision(PythonPackage):
depends_on("py-torch@1.5.1", when="@0.6.1", type=("build", "link", "run"))
depends_on("py-torch@1.5.0", when="@0.6.0", type=("build", "link", "run"))
depends_on("py-torch@1.4.1", when="@0.5.0", type=("build", "link", "run"))
- depends_on("py-torch@1.3.1", when="@0.4.2", type=("build", "link", "run"))
- depends_on("py-torch@1.3.0", when="@0.4.1", type=("build", "link", "run"))
- depends_on("py-torch@1.2.0", when="@0.4.0", type=("build", "link", "run"))
- depends_on("py-torch@1.1.0", when="@0.3.0", type=("build", "link", "run"))
- depends_on("py-torch@:1.0.1", when="@0.2.2", type=("build", "link", "run"))
depends_on("ninja", type="build")
@@ -118,8 +108,6 @@ class PyTorchvision(PythonPackage):
# https://github.com/pytorch/vision/pull/5898
conflicts("^pil@10:", when="@:0.12")
- # https://github.com/pytorch/vision/issues/1712
- conflicts("^pil@7:", when="@:0.4")
# https://github.com/pytorch/vision/issues/4146
# https://github.com/pytorch/vision/issues/4934
conflicts("^pil@8.3")
diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py
index 40c94a6fe1..36abe8ed9f 100644
--- a/var/spack/repos/builtin/packages/py-tuiview/package.py
+++ b/var/spack/repos/builtin/packages/py-tuiview/package.py
@@ -24,16 +24,9 @@ class PyTuiview(PythonPackage):
version("1.2.8", sha256="e75950908a2d1f7c7216dfeead82483e1d3b0267fff9561549d85ca00725456b")
version("1.2.7", sha256="35dfeb79b2bb57dfb5b8c90c3edf8c8a0a3f89cef85c33f9935e4a4add282aaf")
version("1.2.6", sha256="61b136fa31c949d7a7a4dbf8562e6fc677d5b1845b152ec39e337f4eb2e91662")
- version(
- "1.1.7",
- sha256="fbf0bf29cc775357dad4f8a2f0c2ffa98bbf69d603a96353e75b321adef67573",
- deprecated=True,
- )
# pip silently replaces distutils with setuptools
depends_on("py-setuptools", type="build")
- depends_on("py-pyqt4", type=("build", "run"), when="@:1.1")
- depends_on("py-pyqt5", type=("build", "run"), when="@1.2.0:")
+ depends_on("py-pyqt5", type=("build", "run"))
depends_on("py-numpy", type=("build", "link", "run"))
- depends_on("gdal+geos+python", type=("build", "run"), when="@1.2.0:")
- depends_on("gdal@1.11.0:+python", when="@:1.1")
+ depends_on("gdal+geos+python", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-x21/package.py b/var/spack/repos/builtin/packages/py-x21/package.py
index 01b4093df4..dbb25b04c5 100644
--- a/var/spack/repos/builtin/packages/py-x21/package.py
+++ b/var/spack/repos/builtin/packages/py-x21/package.py
@@ -15,7 +15,7 @@ class PyX21(PythonPackage):
list_url = "https://pypi.org/simple/x21/"
def url_for_version(self, version):
- url = "https://pypi.io/packages/cp{1}/x/x21/x21-{0}-cp{1}-cp{1}{2}-{3}.whl"
+ url = "https://pypi.io/packages/cp{1}/x/x21/x21-{0}-cp{1}-cp{1}-{2}.whl"
if sys.platform == "darwin":
platform_string = "macosx_10_9_x86_64"
@@ -24,20 +24,10 @@ class PyX21(PythonPackage):
py_ver = Version(version.string.split("y")[1])
- return url.format(
- version.string.split("-")[0],
- py_ver.joined,
- "m" if py_ver == Version("3.7") else "",
- platform_string,
- )
+ return url.format(version.string.split("-")[0], py_ver.joined, platform_string)
if sys.platform == "darwin":
version(
- "0.2.6-py3.7",
- sha256="7367b7c93fba520e70cc29731baec5b95e7be32d7615dad4f1f034cd21c194bd",
- expand=False,
- )
- version(
"0.2.6-py3.8",
sha256="bbbfdb6b56562ecc81f0dc39e009713157011fbb50d47353eb25f633acf77204",
expand=False,
@@ -54,11 +44,6 @@ class PyX21(PythonPackage):
)
elif sys.platform.startswith("linux"):
version(
- "0.2.6-py3.7",
- sha256="8b35248d0b049dd09985d1a45c6fa36dd39db2c9d805a96028ec3bf9dc80e0dd",
- expand=False,
- )
- version(
"0.2.6-py3.8",
sha256="64275052bcda784395bc613f750b8b5a6b1ddbfa4e7a590cb8e209543f0ca0c4",
expand=False,
@@ -74,7 +59,6 @@ class PyX21(PythonPackage):
expand=False,
)
- depends_on("python@3.7.0:3.7", type=("build", "run"), when="@0.2.6-py3.7")
depends_on("python@3.8.0:3.8", type=("build", "run"), when="@0.2.6-py3.8")
depends_on("python@3.9.0:3.9", type=("build", "run"), when="@0.2.6-py3.9")
depends_on("python@3.10.0:3.10", type=("build", "run"), when="@0.2.6-py3.10")