diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-keras/package.py | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index e2456f9e66..548e1a0144 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -22,6 +22,7 @@ class PyKeras(PythonPackage): maintainers("adamjstewart") license("Apache-2.0") + version("3.5.0", sha256="53ae4f9472ec9d9c6941c82a3fda86969724ace3b7630a94ba0a1f17ba1065c3") version("3.4.1", sha256="34cd9aeaa008914715149234c215657ca758e1b473bd2aab2e211ac967d1f8fe") version("3.4.0", sha256="c4b05b150b1c4df27b4a17efd137b2d5e20f385f146fd48636791d675e75059d") version("3.3.3", sha256="f2fdffc8434fd77045cf8fb21816dbaa2308d5f76974ca924b2f60b40433b1a0") @@ -79,8 +80,6 @@ class PyKeras(PythonPackage): depends_on("python@3.8:", when="@2.12:") depends_on("py-absl-py", when="@2.6:") depends_on("py-numpy") - # https://github.com/keras-team/keras/issues/19691 - depends_on("py-numpy@:1") depends_on("py-rich", when="@3:") depends_on("py-namex@0.0.8:", when="@3.3.3:") depends_on("py-namex", when="@3:") @@ -96,21 +95,27 @@ class PyKeras(PythonPackage): depends_on("py-protobuf", when="@3:") # requirements-tensorflow-cuda.txt - depends_on("py-tensorflow@2.16.1:2.16", when="@3.0: backend=tensorflow") + with when("backend=tensorflow"): + depends_on("py-tensorflow@2.17", when="@3.5:") + depends_on("py-tensorflow@2.16.1:2.16", when="@3.0:3.4") # requirements-jax-cuda.txt - depends_on("py-jax@0.4.23", when="@3.0.5: backend=jax") - depends_on("py-jax", when="@3: backend=jax") + with when("backend=jax"): + depends_on("py-jax@0.4.23", when="@3.0.5:") + depends_on("py-jax", when="@3:") # requirements-torch-cuda.txt - depends_on("py-torch@2.2.1", when="@3.1.0: backend=torch") - depends_on("py-torch@2.1.2", when="@3.0.3:3.0.5 backend=torch") - depends_on("py-torch@2.1.1", when="@3.0.1:3.0.2 backend=torch") - depends_on("py-torch@2.1.0", when="@3.0.0 backend=torch") - depends_on("py-torchvision@0.17.1", when="@3.1.0: backend=torch") - depends_on("py-torchvision@0.16.2", when="@3.0.3:3.0.5 backend=torch") - depends_on("py-torchvision@0.16.1", when="@3.0.1:3.0.2 backend=torch") - depends_on("py-torchvision@0.16.0", when="@3.0.0 backend=torch") + with when("backend=torch"): + depends_on("py-torch@2.4.0", when="@3.5:") + depends_on("py-torch@2.2.1", when="@3.1:3.4") + depends_on("py-torch@2.1.2", when="@3.0.3:3.0.5") + depends_on("py-torch@2.1.1", when="@3.0.1:3.0.2") + depends_on("py-torch@2.1.0", when="@3.0.0") + depends_on("py-torchvision@0.19.0", when="@3.5:") + depends_on("py-torchvision@0.17.1", when="@3.1:3.4") + depends_on("py-torchvision@0.16.2", when="@3.0.3:3.0.5") + depends_on("py-torchvision@0.16.1", when="@3.0.1:3.0.2") + depends_on("py-torchvision@0.16.0", when="@3.0.0") # Historical dependencies with default_args(type="build"): @@ -120,6 +125,8 @@ class PyKeras(PythonPackage): with default_args(type=("build", "run")): depends_on("pil", when="@:2") depends_on("py-dm-tree", when="@3.0") + # https://github.com/keras-team/keras/issues/19691 + depends_on("py-numpy@:1", when="@:3.4") depends_on("py-portpicker", when="@2.10:2") depends_on("py-pydot", when="@:2") depends_on("py-pyyaml", when="@:2") |