From d0cb5efa3bbab453d5aeed54bfbc78d397b8ea83 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 16 Jan 2023 02:10:40 -0700 Subject: py-segmentation-models-pytorch: add v0.3.2 (#34853) --- .../builtin/packages/py-segmentation-models-pytorch/package.py | 4 +++- var/spack/repos/builtin/packages/py-timm/package.py | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py index 960a8db487..9e84f4e660 100644 --- a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py @@ -12,6 +12,7 @@ class PySegmentationModelsPytorch(PythonPackage): homepage = "https://github.com/qubvel/segmentation_models.pytorch" pypi = "segmentation_models_pytorch/segmentation_models_pytorch-0.2.0.tar.gz" + version("0.3.2", sha256="8372733e57a10cb8f6b9e18a20577fbb3fb83549b6945664dc774a9b6d3ecd13") version("0.3.1", sha256="d4a4817cf48872c3461bb7d22864c00f9d491719a6460adb252c035f9b0e8d51") version("0.3.0", sha256="8e00ed1707698d309d23f207aef15f21465e091aa0f1dc8043ec3300f5f67216") version("0.2.1", sha256="86744552b04c6bedf7e10f7928791894d8d9b399b9ed58ed1a3236d2bf69ead6") @@ -22,6 +23,7 @@ class PySegmentationModelsPytorch(PythonPackage): depends_on("py-pretrainedmodels@0.7.4", type=("build", "run")) depends_on("py-efficientnet-pytorch@0.7.1", when="@0.3:", type=("build", "run")) depends_on("py-efficientnet-pytorch@0.6.3", when="@:0.2", type=("build", "run")) - depends_on("py-timm@0.4.12", type=("build", "run")) + depends_on("py-timm@0.6.12", when="@0.3.2:", type=("build", "run")) + depends_on("py-timm@0.4.12", when="@:0.3.1", type=("build", "run")) depends_on("py-tqdm", when="@0.3:", type=("build", "run")) depends_on("pil", when="@0.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-timm/package.py b/var/spack/repos/builtin/packages/py-timm/package.py index 28bd65050d..b937b995e2 100644 --- a/var/spack/repos/builtin/packages/py-timm/package.py +++ b/var/spack/repos/builtin/packages/py-timm/package.py @@ -12,13 +12,17 @@ class PyTimm(PythonPackage): homepage = "https://github.com/rwightman/pytorch-image-models" pypi = "timm/timm-0.4.12.tar.gz" + version("0.6.12", sha256="8f1747121598e06a1ea2d00df16d332cc284cdd4596bdc136b490a2122d3aa91") version("0.5.4", sha256="5d7b92e66a76c432009aba90d515ea7a882aae573415a7c5269e3617df901c1f") version("0.4.12", sha256="b14be70dbd4528b5ca8657cf5bc2672c7918c3d9ebfbffe80f4785b54e884b1e") - depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") + depends_on("py-torch@1.7:", when="@0.6:", type=("build", "run")) depends_on("py-torch@1.4:", type=("build", "run")) depends_on("py-torchvision", type=("build", "run")) + depends_on("py-pyyaml", when="@0.6:", type=("build", "run")) + depends_on("py-huggingface-hub", when="@0.6:", type=("build", "run")) + # https://github.com/rwightman/pytorch-image-models/pull/1256 - depends_on("pil@:9", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) + depends_on("pil@:9", when="@:0.5", type=("build", "run")) + depends_on("py-numpy", when="@:0.5", type=("build", "run")) -- cgit v1.2.3-70-g09d2