summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee James O'Riordan <mlxd@users.noreply.github.com>2023-05-26 17:55:21 -0400
committerGitHub <noreply@github.com>2023-05-26 16:55:21 -0500
commitd9472c083d74f228cfc0412846a6e66ced02a6e7 (patch)
tree8480f3dbae83e4cb0ebbcec641fb2678e38cdcf3
parentac2a5ef4ddc05c347d75133f46d94e95f2838379 (diff)
downloadspack-d9472c083d74f228cfc0412846a6e66ced02a6e7.tar.gz
spack-d9472c083d74f228cfc0412846a6e66ced02a6e7.tar.bz2
spack-d9472c083d74f228cfc0412846a6e66ced02a6e7.tar.xz
spack-d9472c083d74f228cfc0412846a6e66ced02a6e7.zip
Update py-pennylane ecosystem to support v0.30.0 (#37763)
* Update PennyLane ecosystem for 0.30 release * Update package dep versions * Fix formatting * Update dep versions * Remove PL hard pin and rely on PLQ to define version * Update var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py Co-authored-by: Vincent Michaud-Rioux <vincent.michaud-rioux@xanadu.ai> * Convert pybind11 from build to link dep, and PL ver limit --------- Co-authored-by: Vincent Michaud-Rioux <vincent.michaud-rioux@xanadu.ai>
-rw-r--r--var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py21
-rw-r--r--var/spack/repos/builtin/packages/py-pennylane-lightning/package.py9
-rw-r--r--var/spack/repos/builtin/packages/py-pennylane/package.py12
3 files changed, 28 insertions, 14 deletions
diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py
index c0acd56166..39d766a0ee 100644
--- a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py
+++ b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py
@@ -13,11 +13,13 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC
homepage = "https://docs.pennylane.ai/projects/lightning-kokkos"
git = "https://github.com/PennyLaneAI/pennylane-lightning-kokkos.git"
- url = "https://github.com/PennyLaneAI/pennylane-lightning-kokkos/archive/refs/tags/v0.29.1.tar.gz"
+ url = "https://github.com/PennyLaneAI/pennylane-lightning-kokkos/archive/refs/tags/v0.30.0.tar.gz"
maintainers("AmintorDusko", "vincentmr")
version("main", branch="main")
+
+ version("0.30.0", sha256="7c8f0e0431f8052993cd8033a316f53590c7bf5419445d0725e214b93cbc661b")
version("0.29.1", sha256="f51ba7718defc7bb5064f690f381e04b2ec58cb09f22a171ae5f410860716e30")
# kokkos backends
@@ -34,17 +36,21 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC
for backend in backends:
deflt_bool, descr = backends[backend]
variant(backend.lower(), default=deflt_bool, description=descr)
- depends_on(f"kokkos+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build"))
+ depends_on(
+ f"kokkos@3.7+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build")
+ )
# CUDA
for val in CudaPackage.cuda_arch_values:
- depends_on("kokkos cuda_arch={0}".format(val), when="cuda_arch={0}".format(val))
+ depends_on("kokkos@:3.7.01 cuda_arch={0}".format(val), when="cuda_arch={0}".format(val))
# Use +wrapper when not %clang %cce
- depends_on("kokkos+wrapper", when="%gcc+cuda")
+ depends_on("kokkos@:3.7.01+wrapper", when="%gcc+cuda")
# ROCm
for val in ROCmPackage.amdgpu_targets:
- depends_on("kokkos amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val))
+ depends_on(
+ "kokkos@:3.7.01 amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)
+ )
conflicts(
"+cuda",
@@ -63,11 +69,12 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC
depends_on("ninja", type="build")
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-setuptools", type="build")
- depends_on("py-pybind11", type="build")
+ depends_on("py-pybind11", type="link")
depends_on("py-pip", type="build")
depends_on("py-wheel", type="build")
depends_on("py-pennylane@0.28:", type=("build", "run"))
- depends_on("py-pennylane-lightning@0.28:~kokkos", type=("build", "run"))
+ depends_on("py-pennylane-lightning@0.30:~kokkos", type=("build", "run"), when="@0.30.0:")
+ depends_on("py-pennylane-lightning@0.28:0.29~kokkos", type=("build", "run"), when="@0.29.1")
# variant defined dependencies
depends_on("llvm-openmp", when="+openmp %apple-clang")
diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py
index 9648c02f85..35885e5da1 100644
--- a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py
+++ b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py
@@ -12,11 +12,12 @@ class PyPennylaneLightning(CMakePackage, PythonExtension):
homepage = "https://docs.pennylane.ai/projects/lightning"
git = "https://github.com/PennyLaneAI/pennylane-lightning.git"
- url = "https://github.com/PennyLaneAI/pennylane-lightning/archive/refs/tags/v0.28.2.tar.gz"
+ url = "https://github.com/PennyLaneAI/pennylane-lightning/archive/refs/tags/v0.30.0.tar.gz"
maintainers("mlxd", "AmintorDusko")
version("master", branch="master")
+ version("0.30.0", sha256="0f4032409d20d00991b5d14fe0b2b928baca4a13c5a1b16eab91f61f9273e58d")
version("0.29.0", sha256="da9912f0286d1a54051cc19cf8bdbdcd732795636274c95f376db72a88e52d85")
version(
"0.28.0",
@@ -47,14 +48,14 @@ class PyPennylaneLightning(CMakePackage, PythonExtension):
# variant defined dependencies
depends_on("blas", when="+blas")
- depends_on("kokkos@3.7.00", when="+kokkos")
- depends_on("kokkos-kernels@3.7.00", when="+kokkos")
+ depends_on("kokkos@:3.7.01", when="+kokkos")
+ depends_on("kokkos-kernels@:3.7.01", when="+kokkos")
depends_on("llvm-openmp", when="+openmp %apple-clang")
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-numpy", type=("build", "run"))
- depends_on("py-pybind11", type=("build"))
+ depends_on("py-pybind11", type="link")
depends_on("py-pip", type="build")
depends_on("py-wheel", type="build")
# depends_on("py-pennylane@0.28:", type=("build", "run")) # circular dependency
diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py
index 286343fc57..8d239e0676 100644
--- a/var/spack/repos/builtin/packages/py-pennylane/package.py
+++ b/var/spack/repos/builtin/packages/py-pennylane/package.py
@@ -12,11 +12,12 @@ class PyPennylane(PythonPackage):
homepage = "https://docs.pennylane.ai/"
git = "https://github.com/PennyLaneAI/pennylane.git"
- url = "https://github.com/PennyLaneAI/pennylane/archive/refs/tags/v0.29.1.tar.gz"
+ url = "https://github.com/PennyLaneAI/pennylane/archive/refs/tags/v0.30.0.tar.gz"
maintainers("mlxd", "AmintorDusko", "marcodelapierre")
version("master", branch="master")
+ version("0.30.0", sha256="7fe4821fbc733e3e40d7011e054bd2e31edde3151fd9539025c827a5a3579d6b")
version("0.29.1", sha256="6ecfb305a3898347df8c539a89a67e748766941d159dbef9e34864872f13c45c")
version(
"0.28.0",
@@ -25,19 +26,24 @@ class PyPennylane(PythonPackage):
)
depends_on("python@3.8:", type=("build", "run"))
+ depends_on("py-pip", type=("build", "run")) # Runtime req for pennylane.about()
depends_on("py-setuptools", type="build")
depends_on("py-numpy@:1.23", type=("build", "run"))
depends_on("py-scipy", type=("build", "run"))
depends_on("py-networkx", type=("build", "run"))
- depends_on("py-retworkx", type=("build", "run"))
+ depends_on("py-rustworkx", type=("build", "run"), when="@0.30.0:")
+ depends_on("py-retworkx", type=("build", "run"), when="@0.28.0:0.29.1")
depends_on("py-autograd", type=("build", "run"))
depends_on("py-toml", type=("build", "run"))
depends_on("py-appdirs", type=("build", "run"))
depends_on("py-semantic-version@2.7:", type=("build", "run"))
depends_on("py-autoray@0.3.1:", type=("build", "run"))
depends_on("py-cachetools", type=("build", "run"))
- depends_on("py-pennylane-lightning@0.28.0:", type=("build", "run"))
+ depends_on("py-pennylane-lightning@0.30.0:", type=("build", "run"), when="@0.30.0:")
+ depends_on(
+ "py-pennylane-lightning@0.28.0:0.29.0", type=("build", "run"), when="@0.28.0:0.29.1"
+ )
depends_on("py-requests", type=("build", "run"))
# Test deps