From 9066eb3a18a10db6ae593860b200e4f55d0fa5af Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 15 May 2023 11:36:03 -0400 Subject: [PATCH 1/7] Update PennyLane ecosystem for 0.30 release --- .../packages/py-pennylane-lightning-kokkos/package.py | 7 +++++-- .../builtin/packages/py-pennylane-lightning/package.py | 3 ++- var/spack/repos/builtin/packages/py-pennylane/package.py | 9 ++++++--- 3 files changed, 13 insertions(+), 6 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 c0acd561665274..b5d9da6b419793 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 @@ -67,7 +69,8 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC 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 9648c02f8593c2..532bac23ccd0ac 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", diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py index 286343fc57634c..990d9f4dc24ea1 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", @@ -30,14 +31,16 @@ class PyPennylane(PythonPackage): 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 From 57d93c58b75a5c3b58993d64099e200f5f321605 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 15 May 2023 15:10:15 -0400 Subject: [PATCH 2/7] Update package dep versions --- .../packages/py-pennylane-lightning-kokkos/package.py | 8 ++++---- .../builtin/packages/py-pennylane-lightning/package.py | 4 ++-- var/spack/repos/builtin/packages/py-pennylane/package.py | 1 + 3 files changed, 7 insertions(+), 6 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 b5d9da6b419793..03ef33047ab8ef 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 @@ -36,17 +36,17 @@ 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.01+{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", 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 532bac23ccd0ac..7a4ab8a421b606 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py @@ -48,8 +48,8 @@ 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")) diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py index 990d9f4dc24ea1..7346f861ea7515 100644 --- a/var/spack/repos/builtin/packages/py-pennylane/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane/package.py @@ -26,6 +26,7 @@ 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")) From 8f84ae2be6dcf6394cd1e40420ecf111ff42d0b0 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 15 May 2023 15:14:42 -0400 Subject: [PATCH 3/7] Fix formatting --- .../packages/py-pennylane-lightning-kokkos/package.py | 8 ++++++-- var/spack/repos/builtin/packages/py-pennylane/package.py | 6 ++++-- 2 files changed, 10 insertions(+), 4 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 03ef33047ab8ef..6d77cd4a0eb1c5 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 @@ -36,7 +36,9 @@ 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@:3.7.01+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build")) + depends_on( + f"kokkos@:3.7.01+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build") + ) # CUDA for val in CudaPackage.cuda_arch_values: @@ -46,7 +48,9 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC # ROCm for val in ROCmPackage.amdgpu_targets: - depends_on("kokkos@:3.7.01 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", diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py index 7346f861ea7515..8d239e0676f300 100644 --- a/var/spack/repos/builtin/packages/py-pennylane/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane/package.py @@ -26,7 +26,7 @@ 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-pip", type=("build", "run")) # Runtime req for pennylane.about() depends_on("py-setuptools", type="build") depends_on("py-numpy@:1.23", type=("build", "run")) @@ -41,7 +41,9 @@ class PyPennylane(PythonPackage): depends_on("py-autoray@0.3.1:", type=("build", "run")) depends_on("py-cachetools", 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-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 From 48a3cf3d0fcec537e6d79f487d4066d2baacfefb Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 15 May 2023 16:02:05 -0400 Subject: [PATCH 4/7] Update dep versions --- .../builtin/packages/py-pennylane-lightning-kokkos/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 6d77cd4a0eb1c5..ae571561010222 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 @@ -72,7 +72,8 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC depends_on("py-pybind11", type="build") 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@:0.29", type=("build", "run"), when="@0.29") + depends_on("py-pennylane@0.30:", type=("build", "run"), when="@0.30:") 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") From b1c385f5692284934f5aba3b03313edf739be622 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Fri, 19 May 2023 15:49:17 -0400 Subject: [PATCH 5/7] Remove PL hard pin and rely on PLQ to define version --- .../builtin/packages/py-pennylane-lightning-kokkos/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 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 ae571561010222..811940e9028036 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 @@ -72,8 +72,7 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC depends_on("py-pybind11", type="build") depends_on("py-pip", type="build") depends_on("py-wheel", type="build") - depends_on("py-pennylane@:0.29", type=("build", "run"), when="@0.29") - depends_on("py-pennylane@0.30:", type=("build", "run"), when="@0.30:") + depends_on("py-pennylane@:0.28", 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") From 36a0d7cd21371a53e534950b0f08010235555265 Mon Sep 17 00:00:00 2001 From: Lee James O'Riordan Date: Fri, 19 May 2023 15:49:51 -0400 Subject: [PATCH 6/7] Update var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py Co-authored-by: Vincent Michaud-Rioux --- .../builtin/packages/py-pennylane-lightning-kokkos/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 811940e9028036..1d34dbc6a3ac25 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 @@ -37,7 +37,7 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC deflt_bool, descr = backends[backend] variant(backend.lower(), default=deflt_bool, description=descr) depends_on( - f"kokkos@:3.7.01+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build") + f"kokkos@3.7+{backend.lower()}", when=f"+{backend.lower()}", type=("run", "build") ) # CUDA From 06058ee5e9daaf0578b4faee9005afe6d30e1e93 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Tue, 23 May 2023 10:54:09 -0400 Subject: [PATCH 7/7] Convert pybind11 from build to link dep, and PL ver limit --- .../builtin/packages/py-pennylane-lightning-kokkos/package.py | 4 ++-- .../repos/builtin/packages/py-pennylane-lightning/package.py | 2 +- 2 files changed, 3 insertions(+), 3 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 1d34dbc6a3ac25..39d766a0ee1d2d 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 @@ -69,10 +69,10 @@ 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@0.28:", 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") 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 7a4ab8a421b606..35885e5da16403 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py @@ -55,7 +55,7 @@ class PyPennylaneLightning(CMakePackage, PythonExtension): 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