diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-11-25 15:59:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 22:59:39 +0100 |
| commit | 93ff19c9b718d705fdb36d187413566c525cdd81 (patch) | |
| tree | aa8fdbc5747bee2e60882f87652f50bb7c628379 /var | |
| parent | 2167cbf72cdc94d573e1e7af843b0a5dc296e958 (diff) | |
| download | spack-93ff19c9b718d705fdb36d187413566c525cdd81.tar.gz spack-93ff19c9b718d705fdb36d187413566c525cdd81.tar.bz2 spack-93ff19c9b718d705fdb36d187413566c525cdd81.tar.xz spack-93ff19c9b718d705fdb36d187413566c525cdd81.zip | |
py-pytorch-lightning: add v1.8.3 (#34096)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pytorch-lightning/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorboardx/package.py | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py index 04bee2110d..22264b21b7 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py @@ -14,6 +14,7 @@ class PyPytorchLightning(PythonPackage): maintainers = ["adamjstewart"] + version("1.8.3", sha256="c12293da19810a08e4f81a40145760fb29514449ef5d294fa1ef741553cdf217") version("1.8.2", sha256="480f3396cd63888c4e5ec2f21c02fe662a2b035d9634e6f31fcf1197a36ebd15") version("1.8.1", sha256="5b60e5eb84dd16ee8dc408286f0074ab475bed385b09a702d678ccbde91e4818") version("1.8.0", sha256="deff9bc7978ecebc8f45e881adef65dc8d9f4554e88c3b064f80587f32ab158d") @@ -58,9 +59,7 @@ class PyPytorchLightning(PythonPackage): depends_on("py-fsspec@2021.06.1:+http", when="@1.8:", type=("build", "run")) depends_on("py-fsspec@2021.05.0:2021.05,2021.06.1:+http", when="@1.3:", type=("build", "run")) depends_on("py-fsspec@0.8.1:+http", when="@:1.2", type=("build", "run")) - depends_on("py-tensorboard@2.9.1:", when="@1.7:", type=("build", "run")) - depends_on("py-tensorboard@2.2.0:", when="@1.5:", type=("build", "run")) - depends_on("py-tensorboard@2.2.0:2.4,2.5.1:", when="@:1.4", type=("build", "run")) + depends_on("py-tensorboardx@2.2:", when="@1.8.3:", type=("build", "run")) depends_on("py-torchmetrics@0.7:", when="@1.7:", type=("build", "run")) depends_on("py-torchmetrics@0.4.1:", when="@1.5:", type=("build", "run")) depends_on("py-torchmetrics@0.4.0:", when="@1.4", type=("build", "run")) @@ -81,6 +80,9 @@ class PyPytorchLightning(PythonPackage): depends_on("py-pydeprecate@0.3.1:0.3", when="@1.6:1.6.3", type=("build", "run")) depends_on("py-pydeprecate@0.3.1", when="@1.4:1.5", type=("build", "run")) depends_on("py-pydeprecate@0.3.0", when="@1.3", type=("build", "run")) + depends_on("py-tensorboard@2.9.1:", when="@1.7:1.8.2", type=("build", "run")) + depends_on("py-tensorboard@2.2.0:", when="@1.5:1.6", type=("build", "run")) + depends_on("py-tensorboard@2.2.0:2.4,2.5.1:", when="@:1.4", type=("build", "run")) # https://github.com/Lightning-AI/lightning/issues/15494 conflicts("^py-torch~distributed", when="@1.8.0") diff --git a/var/spack/repos/builtin/packages/py-tensorboardx/package.py b/var/spack/repos/builtin/packages/py-tensorboardx/package.py index c73cb04fe1..ff225def19 100644 --- a/var/spack/repos/builtin/packages/py-tensorboardx/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboardx/package.py @@ -17,12 +17,14 @@ class PyTensorboardx(PythonPackage): homepage = "https://github.com/lanpa/tensorboardX" pypi = "tensorboardx/tensorboardX-1.8.tar.gz" + version("2.5.1", sha256="ea85a3446f22ce8a917fe4fa4d8a7a96222ef84ac835267d038c34bb99f6d61b") version("2.1", sha256="9e8907cf2ab900542d6cb72bf91aa87b43005a7f0aa43126268697e3727872f9") version("2.0", sha256="835d85db0aef2c6768f07c35e69a74e3dcb122d6afceaf2b8504d7d16c7209a5") version("1.9", sha256="2505d0092e6212f04c4522eea7123e8886c4d0a0b2c406e480fa61ca3c1da7ea") version("1.8", sha256="13fe0abba27f407778a7321937190eedaf12bc8c544d9a4e294fcf0ba177fd76") depends_on("py-setuptools", type="build") - depends_on("py-six", type=("build", "run")) - depends_on("py-protobuf@3.8.0:", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) + depends_on("py-protobuf@3.8.0:3.20.1", type=("build", "run")) + + depends_on("py-six", when="@:2.1", type=("build", "run")) |