Update versions (#715)

Update versions to use 0.36.0 and pl lightning's rc. --------- Co-authored-by: David Ittah <[email protected]>
PennyLaneAI · May 6, 2024 · 73bd0bc · 73bd0bc
1 parent 3a36b9c
commit 73bd0bc
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 14 deletions.
diff --git a/.dep-versions b/.dep-versions
@@ -5,6 +5,3 @@ llvm=cd9a641613eddf25d4b25eaa96b2c393d401d42c
 enzyme=1beb98b51442d50652eaa3ffb9574f4720d611f1
 
 # Always remove custom PL/LQ versions before release.
-
-lightning=0.36.0-dev40
-pennylane=d7342b69f5b7829532e7d3cd8f750afa7f54d25d
diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml
@@ -306,7 +306,7 @@ jobs:
               -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \
               -DENABLE_LIGHTNING_KOKKOS=ON \
               -DENABLE_LAPACK=OFF \
-              -DLIGHTNING_GIT_TAG=5feb4a10c9cd15fa590c513fc7c6a10a0b334269 \
+              -DLIGHTNING_GIT_TAG=latest_release \
               -DKokkos_ENABLE_SERIAL=ON \
               -DKokkos_ENABLE_OPENMP=ON \
               -DENABLE_WARNINGS=OFF \
@@ -323,6 +323,7 @@ jobs:
           CXX_COMPILER=$(which g++) \
           OQC_BUILD_DIR="$(pwd)/oqc-build" \
           RT_BUILD_DIR="$(pwd)/runtime-build" \
+          PYTHON=$(which python${{ matrix.python_version }}) \
           make oqc
 
     # Build Quantum and Gradient Dialects
@@ -412,7 +413,12 @@ jobs:
 
     - name: Install Catalyst
       run: |
-        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple
+        python${{ matrix.python_version }} -m pip install pennylane-lightning==0.36.0
+        python${{ matrix.python_version }} -m pip install 'pennylane-lightning[kokkos]==0.36.0'
+        python${{ matrix.python_version }} -m pip install --upgrade git+https://github.com/PennyLaneAI/[email protected]
+        python${{ matrix.python_version }} -m pip install jax==0.4.23 jaxlib==0.4.23 tomlkit 'scipy<1.13' 'numpy<2' 'diastatic-malt>=2.15.1'
+        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --no-deps
+
 
     - name: Run Python Pytest Tests
       run: |

diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml
@@ -289,7 +289,7 @@ jobs:
               -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \
               -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \
               -DENABLE_LIGHTNING_KOKKOS=ON \
-              -DLIGHTNING_GIT_TAG=5feb4a10c9cd15fa590c513fc7c6a10a0b334269 \
+              -DLIGHTNING_GIT_TAG=latest_release \
               -DENABLE_LAPACK=OFF \
               -DKokkos_ENABLE_SERIAL=ON \
               -DKokkos_ENABLE_OPENMP=ON \
@@ -406,7 +406,11 @@ jobs:
 
     - name: Install Catalyst
       run: |
-        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple
+        python${{ matrix.python_version }} -m pip install pennylane-lightning==0.36.0
+        python${{ matrix.python_version }} -m pip install --upgrade git+https://github.com/PennyLaneAI/[email protected]
+        python${{ matrix.python_version }} -m pip install jax==0.4.23 jaxlib==0.4.23 tomlkit 'scipy<1.13' 'numpy<2' 'diastatic-malt>=2.15.1'
+        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --no-deps
+
 
     - name: Run Python Pytest Tests
       run: |

diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml
@@ -261,7 +261,7 @@ jobs:
               -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \
               -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \
               -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \
-              -DLIGHTNING_GIT_TAG=5feb4a10c9cd15fa590c513fc7c6a10a0b334269 \
+              -DLIGHTNING_GIT_TAG=latest_release \
               -DENABLE_LIGHTNING_KOKKOS=ON \
               -DENABLE_LAPACK=OFF \
               -DKokkos_ENABLE_SERIAL=ON \
@@ -376,7 +376,10 @@ jobs:
 
     - name: Install Catalyst
       run: |
-        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple
+        python${{ matrix.python_version }} -m pip install pennylane-lightning==0.36.0
+        python${{ matrix.python_version }} -m pip install --upgrade git+https://github.com/PennyLaneAI/[email protected]
+        python${{ matrix.python_version }} -m pip install jax==0.4.23 jaxlib==0.4.23 tomlkit 'scipy<1.13' 'numpy<2' 'diastatic-malt>=2.15.1'
+        python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --no-deps
 
     - name: Run Python Pytest Tests
       run: |

diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml
@@ -410,6 +410,9 @@ jobs:
         # macOS requirements.txt
         python3 -m pip install cuda-quantum==0.6.0
         python3 -m pip install oqc-qcaas-client
+        # TODO: remove workaround before merging to main
+        pip install pennylane-lightning==0.36
+        pip install git+https://github.com/PennyLaneAI/[email protected]
         make frontend
 
     - name: Get Cached LLVM Build
@@ -482,6 +485,9 @@ jobs:
         sudo apt-get install -y python3 python3-pip libomp-dev libasan6 make
         python3 --version | grep ${{ needs.constants.outputs.primary_python_version }}
         python3 -m pip install -r requirements.txt
+        # TODO: remove workaround before merging to main
+        pip install pennylane-lightning==0.36
+        pip install git+https://github.com/PennyLaneAI/[email protected]
         make frontend
 
     - name: Get Cached LLVM Build
@@ -532,6 +538,9 @@ jobs:
         sudo apt-get install -y python3 python3-pip libomp-dev libasan6 make
         python3 --version | grep ${{ needs.constants.outputs.primary_python_version }}
         python3 -m pip install -r requirements.txt
+        # TODO: remove workaround before merging to main
+        pip install pennylane-lightning==0.36
+        pip install git+https://github.com/PennyLaneAI/[email protected]
         make frontend
 
     - name: Get Cached LLVM Build

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -29,4 +29,5 @@ lxml_html_clean
 
 # Pre-install development lightning wheels
 --extra-index-url https://test.pypi.org/simple/
-pennylane-lightning==0.36.0-dev40
+pennylane-lightning==0.36.0
+pennylane @ git+https://github.com/pennylaneAI/[email protected]
diff --git a/frontend/catalyst/oqc/src/Makefile b/frontend/catalyst/oqc/src/Makefile
@@ -1,4 +1,4 @@
-PYTHON := $(shell which python3)
+PYTHON?=$(shell which python3)
 C_COMPILER?=$(shell which clang)
 CXX_COMPILER?=$(shell which clang++)
 NPROC?=$(shell python3 -c "import os; print(os.cpu_count())")

diff --git a/frontend/test/pytest/test_quantum_control.py b/frontend/test/pytest/test_quantum_control.py
@@ -59,7 +59,7 @@ def pennylane_workflow(*args):
         else:
             return quantum_func(*args, ctrl_fn=PL_ctrl)
 
-    assert_allclose(catalyst_workflow(*args), pennylane_workflow(*args))
+    assert_allclose(catalyst_workflow(*args), pennylane_workflow(*args), atol=1e-7)
 
 
 def test_qctrl_op_object(backend):

diff --git a/runtime/Makefile b/runtime/Makefile
@@ -15,7 +15,7 @@ ENABLE_LIGHTNING?=ON
 ENABLE_LIGHTNING_KOKKOS?=ON
 ENABLE_OPENQASM?=ON
 ENABLE_ASAN?=OFF
-LIGHTNING_GIT_TAG_VALUE?=5feb4a10c9cd15fa590c513fc7c6a10a0b334269
+LIGHTNING_GIT_TAG_VALUE?=latest_release
 ENABLE_LAPACK?=OFF
 
 BUILD_TARGETS := rt_capi rtd_dummy

diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@
     pl_version = next((line[10:].strip() for line in lines if "pennylane=" in line), None)
     lq_version = next((line[10:].strip() for line in lines if "lightning=" in line), None)
 
-pl_min_release = 0.35
+pl_min_release = 0.36
 lq_min_release = pl_min_release
 
 if pl_version is not None: