From d7643d4f88e8e378bba900d84e7e7c6fe090463f Mon Sep 17 00:00:00 2001 From: Jen Herting Date: Tue, 8 Oct 2024 07:26:31 -0400 Subject: [PATCH] [py-torchmetrics] added image variant and deprecated 1.3.0 (#46258) * [py-torchmetrics] - Added variant - deprecated version 1.3.0 * [py-torchmetrics] - py-scipy@1.0.1: - removed upper bounds on dependencies --- .../builtin/packages/py-torchmetrics/package.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-torchmetrics/package.py b/var/spack/repos/builtin/packages/py-torchmetrics/package.py index c3065b5d298..53ba4321d86 100644 --- a/var/spack/repos/builtin/packages/py-torchmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-torchmetrics/package.py @@ -19,7 +19,11 @@ class PyTorchmetrics(PythonPackage): version("1.4.0", sha256="0b1e5acdcc9beb05bfe369d3d56cfa5b143f060ebfd6079d19ccc59ba46465b3") version("1.3.2", sha256="0a67694a4c4265eeb54cda741eaf5cb1f3a71da74b7e7e6215ad156c9f2379f6") version("1.3.1", sha256="8d371f7597a1a5eb02d5f2ed59642d6fef09093926997ce91e18b1147cc8defa") - version("1.3.0", sha256="e8ac3adcc61e7a847d0504b0a0e0a3b7f57796178b239c6fafb5d20c0c9460ac") + version( + "1.3.0", + sha256="e8ac3adcc61e7a847d0504b0a0e0a3b7f57796178b239c6fafb5d20c0c9460ac", + deprecated=True, + ) # Yanked version("1.2.1", sha256="217387738f84939c39b534b20d4983e737cc448d27aaa5340e0327948d97ca3e") version("1.2.0", sha256="7eb28340bde45e13187a9ad54a4a7010a50417815d8181a5df6131f116ffe1b7") version("1.1.1", sha256="65ea34205c0506eecfd06b98f63f4d2a2c5c0e17367cf324e1747adc854c80a5") @@ -44,6 +48,8 @@ class PyTorchmetrics(PythonPackage): version("0.3.1", sha256="78f4057db53f7c219fdf9ec9eed151adad18dd43488a44e5c780806d218e3f1d") version("0.2.0", sha256="481a28759acd2d77cc088acba6bc7dc4a356c7cb767da2e1495e91e612e2d548") + variant("image", default=False, description="image support", when="@0.11.2:") + # setup.py depends_on("py-setuptools", type="build") @@ -61,6 +67,11 @@ class PyTorchmetrics(PythonPackage): depends_on("py-lightning-utilities@0.8:", when="@1.1:") depends_on("py-lightning-utilities@0.7:", when="@1:") + depends_on("py-scipy@1.0.1:", when="+image") + depends_on("py-torchvision@0.8:", when="+image") + depends_on("py-torch-fidelity", when="+image") + depends_on("py-lpips", when="@:1.2.0+image") + # Historical dependencies depends_on("py-pretty-errors@1.2.25", when="@1.4.0") depends_on("py-pydeprecate@0.3", when="@0.7:0.8")