diff --git a/var/spack/repos/spack_repo/builtin/packages/py_kornia/package.py b/var/spack/repos/spack_repo/builtin/packages/py_kornia/package.py index d62fcd3b521..e55356942ce 100644 --- a/var/spack/repos/spack_repo/builtin/packages/py_kornia/package.py +++ b/var/spack/repos/spack_repo/builtin/packages/py_kornia/package.py @@ -22,6 +22,7 @@ class PyKornia(PythonPackage): "adamjstewart", ) + version("0.8.1", sha256="9ce5a54a11df661794934a293f89f8b8d49e83dd09b0b9419f6082ab07afe433") version("0.8.0", sha256="a0ffc31106e8d777a8df693572ad5ea11f7236b8bc1d452754f5e57de012ea9a") version("0.7.4", sha256="1f8dd6268ca5a2f2ec04b13c48da4dfb90ba2cfae7e31e0cc80d37f6520fa3f1") version("0.7.3", sha256="0eb861ea5d7e6c3891ae699a8b7103a5783af0a7c41888ca482420dd3d055306") @@ -47,6 +48,7 @@ class PyKornia(PythonPackage): depends_on("py-setuptools", type="build") # requirements/requirements.txt + depends_on("py-kornia-rs@0.1.9:", when="@0.8.1:", type=("build", "run")) depends_on("py-kornia-rs@0.1:", when="@0.7.2:", type=("build", "run")) depends_on("py-packaging", when="@0.6:", type=("build", "run")) depends_on("py-torch@1.9.1:", when="@0.6.9:", type=("build", "run")) diff --git a/var/spack/repos/spack_repo/builtin/packages/py_kornia_rs/package.py b/var/spack/repos/spack_repo/builtin/packages/py_kornia_rs/package.py index 7e617d9e7c1..7c028c920ad 100644 --- a/var/spack/repos/spack_repo/builtin/packages/py_kornia_rs/package.py +++ b/var/spack/repos/spack_repo/builtin/packages/py_kornia_rs/package.py @@ -22,12 +22,12 @@ class PyKorniaRs(PythonPackage): "adamjstewart", ) + version("0.1.9", sha256="a9b8a6afa00d80c9b1b1e3e5ff650762dac9605829a4f768ff5aedf47649efc2") version("0.1.1", sha256="b9ac327fae6e982e6d7df9faeadd1d4f6453e65521819ae9ae5b90e9da0ed1a5") version("0.1.0", sha256="0fca64f901dddff49b72e51fc92a25f0a7606e9a1a72ef283606245ea6b4f90d") - build_directory = "py-kornia" - - depends_on("py-maturin@1.3.2:", type="build") + depends_on("py-maturin@1", when="@0.1.6:", type="build") + depends_on("py-maturin@1.3.2:", when="@:0.1.5", type="build") # rav1e needs rustdoc depends_on("rust+dev", type="build") @@ -40,3 +40,7 @@ class PyKorniaRs(PythonPackage): # dlpack-rs needs libclang depends_on("llvm+clang") + + @property + def build_directory(self): + return "kornia-py" if self.spec.satisfies("@0.1.3:") else "py-kornia"