diff options
Diffstat (limited to 'var')
4 files changed, 108 insertions, 98 deletions
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index cdac882620..ded43e2097 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -26,6 +26,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") version("main", branch="main") + version("2.2.1", tag="v2.2.1", commit="6c8c5ad5eaf47a62fafbb4a2747198cbffbf1ff0") version("2.2.0", tag="v2.2.0", commit="8ac9b20d4b090c213799e81acf48a55ea8d437d6") version("2.1.2", tag="v2.1.2", commit="a8e7c98cb95ff97bb30a728c6b2a1ce6bff946eb") version("2.1.1", tag="v2.1.1", commit="4c55dc50355d5e923642c59ad2a23d6ad54711e7") diff --git a/var/spack/repos/builtin/packages/py-torchaudio/package.py b/var/spack/repos/builtin/packages/py-torchaudio/package.py index 4fd49f05e6..8c12089e15 100644 --- a/var/spack/repos/builtin/packages/py-torchaudio/package.py +++ b/var/spack/repos/builtin/packages/py-torchaudio/package.py @@ -17,6 +17,7 @@ class PyTorchaudio(PythonPackage): license("BSD-2-Clause") version("main", branch="main") + version("2.2.1", tag="v2.2.1", commit="06ea59c97d56868e487490702d01b3cf59103b9c") version("2.2.0", tag="v2.2.0", commit="08901ade5d17d3e3cf6fc039cbd601cbd2853686") version("2.1.2", tag="v2.1.2", commit="c4c1957d24b423200fd83591d46066135979a5a8") version("2.1.1", tag="v2.1.1", commit="db624844f5c95bb7618fe5a5f532bf9b68efeb45") @@ -43,12 +44,41 @@ class PyTorchaudio(PythonPackage): version("0.5.0", tag="v0.5.0", commit="09494ea545738538f9db2dceeffe10d421060ee5") version("0.4.0", tag="v0.4.0", commit="8afed303af3de41f3586007079c0534543c8f663") - # Based on PyPI wheel availability - depends_on("python@3.8:3.12", when="@2.2:", type=("build", "link", "run")) - depends_on("python@3.8:3.11", when="@2.0:2.1", type=("build", "link", "run")) - depends_on("python@:3.10", when="@0.12:0", type=("build", "link", "run")) - depends_on("python@:3.9", when="@0.7.2:0.11", type=("build", "link", "run")) - depends_on("python@:3.8", when="@:0.7.0", type=("build", "link", "run")) + with default_args(type=("build", "link", "run")): + # Based on PyPI wheel availability + depends_on("python@3.8:3.12", when="@2.2:") + depends_on("python@3.8:3.11", when="@2.0:2.1") + depends_on("python@:3.10", when="@0.12:0") + depends_on("python@:3.9", when="@0.7.2:0.11") + depends_on("python@:3.8", when="@:0.7.0") + + depends_on("py-torch@main", when="@main") + depends_on("py-torch@2.2.1", when="@2.2.1") + depends_on("py-torch@2.2.0", when="@2.2.0") + depends_on("py-torch@2.1.2", when="@2.1.2") + depends_on("py-torch@2.1.1", when="@2.1.1") + depends_on("py-torch@2.1.0", when="@2.1.0") + depends_on("py-torch@2.0.1", when="@2.0.2") + depends_on("py-torch@2.0.0", when="@2.0.1") + depends_on("py-torch@1.13.1", when="@0.13.1") + depends_on("py-torch@1.13.0", when="@0.13.0") + depends_on("py-torch@1.12.1", when="@0.12.1") + depends_on("py-torch@1.12.0", when="@0.12.0") + depends_on("py-torch@1.11.0", when="@0.11.0") + depends_on("py-torch@1.10.2", when="@0.10.2") + depends_on("py-torch@1.10.1", when="@0.10.1") + depends_on("py-torch@1.10.0", when="@0.10.0") + depends_on("py-torch@1.9.1", when="@0.9.1") + depends_on("py-torch@1.9.0", when="@0.9.0") + depends_on("py-torch@1.8.2", when="@0.8.2") + depends_on("py-torch@1.8.1", when="@0.8.1") + depends_on("py-torch@1.8.0", when="@0.8.0") + depends_on("py-torch@1.7.1", when="@0.7.2") + depends_on("py-torch@1.7.0", when="@0.7.0") + depends_on("py-torch@1.6.0", when="@0.6.0") + depends_on("py-torch@1.5.1", when="@0.5.1") + depends_on("py-torch@1.5.0", when="@0.5.0") + depends_on("py-torch@1.4.1", when="@0.4.0") # CMakelists.txt depends_on("cmake@3.18:", when="@0.10:", type="build") @@ -61,33 +91,6 @@ class PyTorchaudio(PythonPackage): depends_on("pkgconfig", type="build") depends_on("sox") - depends_on("py-torch@main", when="@main", type=("build", "link", "run")) - depends_on("py-torch@2.2.0", when="@2.2.0", type=("build", "link", "run")) - depends_on("py-torch@2.1.2", when="@2.1.2", type=("build", "link", "run")) - depends_on("py-torch@2.1.1", when="@2.1.1", type=("build", "link", "run")) - depends_on("py-torch@2.1.0", when="@2.1.0", type=("build", "link", "run")) - depends_on("py-torch@2.0.1", when="@2.0.2", type=("build", "link", "run")) - depends_on("py-torch@2.0.0", when="@2.0.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.1", when="@0.13.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.0", when="@0.13.0", type=("build", "link", "run")) - depends_on("py-torch@1.12.1", when="@0.12.1", type=("build", "link", "run")) - depends_on("py-torch@1.12.0", when="@0.12.0", type=("build", "link", "run")) - depends_on("py-torch@1.11.0", when="@0.11.0", type=("build", "link", "run")) - depends_on("py-torch@1.10.2", when="@0.10.2", type=("build", "link", "run")) - depends_on("py-torch@1.10.1", when="@0.10.1", type=("build", "link", "run")) - depends_on("py-torch@1.10.0", when="@0.10.0", type=("build", "link", "run")) - depends_on("py-torch@1.9.1", when="@0.9.1", type=("build", "link", "run")) - depends_on("py-torch@1.9.0", when="@0.9.0", type=("build", "link", "run")) - depends_on("py-torch@1.8.2", when="@0.8.2", type=("build", "link", "run")) - depends_on("py-torch@1.8.1", when="@0.8.1", type=("build", "link", "run")) - depends_on("py-torch@1.8.0", when="@0.8.0", type=("build", "link", "run")) - depends_on("py-torch@1.7.1", when="@0.7.2", type=("build", "link", "run")) - depends_on("py-torch@1.7.0", when="@0.7.0", type=("build", "link", "run")) - depends_on("py-torch@1.6.0", when="@0.6.0", type=("build", "link", "run")) - depends_on("py-torch@1.5.1", when="@0.5.1", type=("build", "link", "run")) - depends_on("py-torch@1.5.0", when="@0.5.0", type=("build", "link", "run")) - depends_on("py-torch@1.4.1", when="@0.4.0", type=("build", "link", "run")) - def setup_build_environment(self, env): # tools/setup_helpers/extension.py env.set("BUILD_SOX", 0) diff --git a/var/spack/repos/builtin/packages/py-torchtext/package.py b/var/spack/repos/builtin/packages/py-torchtext/package.py index a04fef47a3..3ec373283b 100644 --- a/var/spack/repos/builtin/packages/py-torchtext/package.py +++ b/var/spack/repos/builtin/packages/py-torchtext/package.py @@ -19,6 +19,7 @@ class PyTorchtext(PythonPackage): license("BSD-3-Clause") version("main", branch="main") + version("0.17.1", tag="v0.17.1", commit="15e55dd73b5de8c179c7bd5cc9e2cc813830fb34") version("0.17.0", tag="v0.17.0", commit="400da5c61bab4abaaeaeca91744ca031ad9b2edf") version("0.16.2", tag="v0.16.2", commit="299b90e908c1b492139a4cf9da3912660e79a06b") version("0.16.1", tag="v0.16.1", commit="66671007c84e07386da3c04e5ca403b8a417c8e5") @@ -39,11 +40,35 @@ class PyTorchtext(PythonPackage): version("0.6.0", tag="0.6.0", commit="3a54c7f52584f201c17ca7489b52b812152612dc") version("0.5.0", tag="0.5.0", commit="0169cde2f1d446ae886ef0be07e9a673585ed256") - # Based on PyPI wheel availability - depends_on("python@3.8:3.11", when="@0.15:", type=("build", "link", "run")) - depends_on("python@:3.10", when="@0.13:0.14", type=("build", "link", "run")) - depends_on("python@:3.9", when="@0.8.1:0.12", type=("build", "link", "run")) - depends_on("python@:3.8", when="@:0.8.0", type=("build", "link", "run")) + with default_args(type=("build", "link", "run")): + # Based on PyPI wheel availability + depends_on("python@3.8:3.11", when="@0.15:") + depends_on("python@:3.10", when="@0.13:0.14") + depends_on("python@:3.9", when="@0.8.1:0.12") + depends_on("python@:3.8", when="@:0.8.0") + + # https://github.com/pytorch/text#installation + depends_on("py-torch@main", when="@main") + depends_on("py-torch@2.2.1", when="@0.17.1") + depends_on("py-torch@2.2.0", when="@0.17.0") + depends_on("py-torch@2.1.2", when="@0.16.2") + depends_on("py-torch@2.1.1", when="@0.16.1") + depends_on("py-torch@2.1.0", when="@0.16.0") + depends_on("py-torch@2.0.1", when="@0.15.2") + depends_on("py-torch@2.0.0", when="@0.15.1") + depends_on("py-torch@1.13.1", when="@0.14.1") + depends_on("py-torch@1.13.0", when="@0.14.0") + depends_on("py-torch@1.12.1", when="@0.13.1") + depends_on("py-torch@1.12.0", when="@0.13.0") + depends_on("py-torch@1.11.0", when="@0.12.0") + depends_on("py-torch@1.10.2", when="@0.11.2") + depends_on("py-torch@1.10.1", when="@0.11.1") + depends_on("py-torch@1.9.1", when="@0.10.1") + depends_on("py-torch@1.9.0", when="@0.10.0") + depends_on("py-torch@1.8.2", when="@0.9.2") + depends_on("py-torch@1.7.1", when="@0.8.1") + depends_on("py-torch@1.5.0", when="@0.6.0") + depends_on("py-torch@1.4.1", when="@0.5.0") # CMakelists.txt depends_on("cmake@3.18:", when="@0.13:", type="build") @@ -60,25 +85,3 @@ class PyTorchtext(PythonPackage): depends_on("py-pybind11", when="@0.8:", type=("build", "link")) depends_on("py-six", when="@:0.6", type=("build", "run")) depends_on("py-sentencepiece", when="@:0.7", type=("build", "run")) - - # https://github.com/pytorch/text#installation - depends_on("py-torch@main", when="@main", type=("build", "link", "run")) - depends_on("py-torch@2.2.0", when="@0.17.0", type=("build", "link", "run")) - depends_on("py-torch@2.1.2", when="@0.16.2", type=("build", "link", "run")) - depends_on("py-torch@2.1.1", when="@0.16.1", type=("build", "link", "run")) - depends_on("py-torch@2.1.0", when="@0.16.0", type=("build", "link", "run")) - depends_on("py-torch@2.0.1", when="@0.15.2", type=("build", "link", "run")) - depends_on("py-torch@2.0.0", when="@0.15.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.1", when="@0.14.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.0", when="@0.14.0", type=("build", "link", "run")) - depends_on("py-torch@1.12.1", when="@0.13.1", type=("build", "link", "run")) - depends_on("py-torch@1.12.0", when="@0.13.0", type=("build", "link", "run")) - depends_on("py-torch@1.11.0", when="@0.12.0", type=("build", "link", "run")) - depends_on("py-torch@1.10.2", when="@0.11.2", type=("build", "link", "run")) - depends_on("py-torch@1.10.1", when="@0.11.1", type=("build", "link", "run")) - depends_on("py-torch@1.9.1", when="@0.10.1", type=("build", "link", "run")) - depends_on("py-torch@1.9.0", when="@0.10.0", type=("build", "link", "run")) - depends_on("py-torch@1.8.2", when="@0.9.2", type=("build", "link", "run")) - depends_on("py-torch@1.7.1", when="@0.8.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")) diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index ad97b8a64d..dda702ea43 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -19,6 +19,7 @@ class PyTorchvision(PythonPackage): license("BSD-3-Clause") version("main", branch="main") + version("0.17.1", sha256="a01c7bce4098c41b62cd3a08d87569113e25d12994b1370f0fd5f531952b6cef") version("0.17.0", sha256="55e395d5c7d9bf7658c82ac633cac2224aa168e1bfe8bb5b2b2a296c792a3500") version("0.16.2", sha256="8c1f2951e98d8ada6e5a468f179af4be9f56d2ebc3ab057af873da61669806d7") version("0.16.1", sha256="d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50") @@ -54,49 +55,50 @@ class PyTorchvision(PythonPackage): variant("ffmpeg", default=False, description=desc.format("FFMPEG")) variant("video_codec", default=False, description=desc.format("video_codec")) - # Based on PyPI wheel availability - depends_on("python@3.8:3.12", when="@0.17:", type=("build", "link", "run")) - depends_on("python@3.8:3.11", when="@0.15:0.16", type=("build", "link", "run")) - 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")) - - # https://github.com/pytorch/vision#installation - depends_on("py-torch@main", when="@main", type=("build", "link", "run")) - depends_on("py-torch@2.2.0", when="@0.17.0", type=("build", "link", "run")) - depends_on("py-torch@2.1.2", when="@0.16.2", type=("build", "link", "run")) - depends_on("py-torch@2.1.1", when="@0.16.1", type=("build", "link", "run")) - depends_on("py-torch@2.1.0", when="@0.16.0", type=("build", "link", "run")) - depends_on("py-torch@2.0.1", when="@0.15.2", type=("build", "link", "run")) - depends_on("py-torch@2.0.0", when="@0.15.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.1", when="@0.14.1", type=("build", "link", "run")) - depends_on("py-torch@1.13.0", when="@0.14.0", type=("build", "link", "run")) - depends_on("py-torch@1.12.1", when="@0.13.1", type=("build", "link", "run")) - depends_on("py-torch@1.12.0", when="@0.13.0", type=("build", "link", "run")) - depends_on("py-torch@1.11.0", when="@0.12.0", type=("build", "link", "run")) - depends_on("py-torch@1.10.2", when="@0.11.3", type=("build", "link", "run")) - depends_on("py-torch@1.10.1", when="@0.11.2", type=("build", "link", "run")) - depends_on("py-torch@1.10.0", when="@0.11.1", type=("build", "link", "run")) - depends_on("py-torch@1.10.0", when="@0.11.0", type=("build", "link", "run")) - depends_on("py-torch@1.9.1", when="@0.10.1", type=("build", "link", "run")) - depends_on("py-torch@1.9.0", when="@0.10.0", type=("build", "link", "run")) - depends_on("py-torch@1.8.2", when="@0.9.2", type=("build", "link", "run")) - depends_on("py-torch@1.8.1", when="@0.9.1", type=("build", "link", "run")) - depends_on("py-torch@1.8.0", when="@0.9.0", type=("build", "link", "run")) - depends_on("py-torch@1.7.1", when="@0.8.2", type=("build", "link", "run")) - depends_on("py-torch@1.7.0", when="@0.8.1", type=("build", "link", "run")) - depends_on("py-torch@1.7.0", when="@0.8.0", type=("build", "link", "run")) - depends_on("py-torch@1.6.0", when="@0.7.0", type=("build", "link", "run")) - 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")) + with default_args(type=("build", "link", "run")): + # Based on PyPI wheel availability + depends_on("python@3.8:3.12", when="@0.17:") + depends_on("python@3.8:3.11", when="@0.15:0.16") + depends_on("python@:3.10", when="@0.12:0.14") + depends_on("python@:3.9", when="@0.8.2:0.11") + depends_on("python@:3.8", when="@0.5:0.8.1") + + # https://github.com/pytorch/vision#installation + depends_on("py-torch@main", when="@main") + depends_on("py-torch@2.2.1", when="@0.17.1") + depends_on("py-torch@2.2.0", when="@0.17.0") + depends_on("py-torch@2.1.2", when="@0.16.2") + depends_on("py-torch@2.1.1", when="@0.16.1") + depends_on("py-torch@2.1.0", when="@0.16.0") + depends_on("py-torch@2.0.1", when="@0.15.2") + depends_on("py-torch@2.0.0", when="@0.15.1") + depends_on("py-torch@1.13.1", when="@0.14.1") + depends_on("py-torch@1.13.0", when="@0.14.0") + depends_on("py-torch@1.12.1", when="@0.13.1") + depends_on("py-torch@1.12.0", when="@0.13.0") + depends_on("py-torch@1.11.0", when="@0.12.0") + depends_on("py-torch@1.10.2", when="@0.11.3") + depends_on("py-torch@1.10.1", when="@0.11.2") + depends_on("py-torch@1.10.0", when="@0.11.1") + depends_on("py-torch@1.10.0", when="@0.11.0") + depends_on("py-torch@1.9.1", when="@0.10.1") + depends_on("py-torch@1.9.0", when="@0.10.0") + depends_on("py-torch@1.8.2", when="@0.9.2") + depends_on("py-torch@1.8.1", when="@0.9.1") + depends_on("py-torch@1.8.0", when="@0.9.0") + depends_on("py-torch@1.7.1", when="@0.8.2") + depends_on("py-torch@1.7.0", when="@0.8.1") + depends_on("py-torch@1.7.0", when="@0.8.0") + depends_on("py-torch@1.6.0", when="@0.7.0") + depends_on("py-torch@1.5.1", when="@0.6.1") + depends_on("py-torch@1.5.0", when="@0.6.0") + depends_on("py-torch@1.4.1", when="@0.5.0") depends_on("ninja", type="build") # setup.py depends_on("py-setuptools", type="build") depends_on("py-numpy", type=("build", "run")) - depends_on("py-requests", when="@0.12:", type=("build", "run")) depends_on("pil@5.3:", when="@0.10:", type=("build", "run")) depends_on("pil@4.1.1:", type=("build", "run")) @@ -108,8 +110,9 @@ class PyTorchvision(PythonPackage): depends_on("cuda", when="+video_codec") # Historical dependencies - depends_on("py-typing-extensions", when="@0.12:0.14", type=("build", "run")) + depends_on("py-requests", when="@0.12:0.17.0", type=("build", "run")) depends_on("py-six", when="@:0.5", type=("build", "run")) + depends_on("py-typing-extensions", when="@0.12:0.14", type=("build", "run")) # https://github.com/pytorch/vision/pull/5898 conflicts("^pil@10:", when="@:0.12") |