Skip to content

Update/py-pennylane and associated packages to v0.30.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mlxd wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Update/py-pennylane and associated packages to v0.30.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9066eb3
Update PennyLane ecosystem for 0.30 release
mlxd May 15, 2023
57d93c5
Update package dep versions
mlxd May 15, 2023
8f84ae2
Fix formatting
mlxd May 15, 2023
48a3cf3
Update dep versions
mlxd May 15, 2023
2a4093b
Merge branch 'develop' into update/py-pennylane-v0.30
mlxd May 18, 2023
b1c385f
Remove PL hard pin and rely on PLQ to define version
mlxd May 19, 2023
36a0d7c
Update var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos…
mlxd May 19, 2023
06058ee
Convert pybind11 from build to link dep, and PL ver limit
mlxd May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
Expand All @@ -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")
Expand Down
9 changes: 5 additions & 4 deletions var/spack/repos/builtin/packages/py-pennylane-lightning/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions var/spack/repos/builtin/packages/py-pennylane/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
Expand Down