From 244cb03f073257380416327df20da0033f76534a Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:16:49 -0500 Subject: [PATCH 01/15] Fix aarch64 wheels --- .github/workflows/wheel_linux_aarch64.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 07d32fd78f..8c2c8cd372 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -75,13 +75,14 @@ jobs: -i ${{ matrix.container_img }} \ bash -c "git config --global --add safe.directory /io && \ cd /io && \ - python3.10 -m pip install ninja && \ + pip install ninja && \ ln -s /opt/python/cp310-cp10/bin/ninja /usr/bin/ninja && \ cmake -BBuild . -DCMAKE_INSTALL_PREFIX=/install \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_${{ matrix.exec_model }}=ON \ -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \ + -DCMAKE_CXX_COMPILER=g++ \ -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -G Ninja && \ From e51ddacbac82a2ee051ad3a8bdbe78483b1b5af3 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:43:24 -0500 Subject: [PATCH 02/15] Fix the missing ninja-build and upgrade Kokkos version support --- .../build_and_cache_Kokkos_linux.yml | 2 +- .github/workflows/set_wheel_build_matrix.yml | 2 +- .github/workflows/tests_lkcpu_python.yml | 2 +- .github/workflows/tests_lkcuda_cpp.yml | 4 ++-- .github/workflows/tests_lkcuda_python.yml | 4 ++-- .github/workflows/tests_windows_cpp.yml | 2 +- .github/workflows/wheel_linux_aarch64.yml | 5 ++-- README.rst | 24 +++++++++---------- cmake/support_kokkos.cmake | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build_and_cache_Kokkos_linux.yml b/.github/workflows/build_and_cache_Kokkos_linux.yml index 3de3a8fa7b..62f367dec2 100644 --- a/.github/workflows/build_and_cache_Kokkos_linux.yml +++ b/.github/workflows/build_and_cache_Kokkos_linux.yml @@ -20,7 +20,7 @@ on: kokkos_version: required: false type: string - default: 4.4.01 + default: 4.5.00 outputs: exec_model: description: "The execution model for Kokkos." diff --git a/.github/workflows/set_wheel_build_matrix.yml b/.github/workflows/set_wheel_build_matrix.yml index f89f56eab8..60e299cfc7 100644 --- a/.github/workflows/set_wheel_build_matrix.yml +++ b/.github/workflows/set_wheel_build_matrix.yml @@ -52,7 +52,7 @@ jobs: - name: Kokkos version id: kokkos_version - run: echo "kokkos_version=[\"4.4.01\"]" >> $GITHUB_OUTPUT + run: echo "kokkos_version=[\"4.5.00\"]" >> $GITHUB_OUTPUT outputs: python_version: ${{ steps.pyver.outputs.python_version }} diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml index 27f1ba25ab..df633152ad 100644 --- a/.github/workflows/tests_lkcpu_python.yml +++ b/.github/workflows/tests_lkcpu_python.yml @@ -49,7 +49,7 @@ jobs: uses: ./.github/workflows/build_and_cache_Kokkos_linux.yml with: os: ubuntu-22.04 - kokkos_version: "4.4.01" + kokkos_version: "4.5.00" build_lightning_kokkos_wheels: needs: [build_and_cache_Kokkos] diff --git a/.github/workflows/tests_lkcuda_cpp.yml b/.github/workflows/tests_lkcuda_cpp.yml index 02fc3b304a..07e7c0d82d 100644 --- a/.github/workflows/tests_lkcuda_cpp.yml +++ b/.github/workflows/tests_lkcuda_cpp.yml @@ -49,7 +49,7 @@ jobs: matrix: os: [ubuntu-22.04] exec_model: ["CUDA"] - kokkos_version: ["4.4.01"] + kokkos_version: ["4.5.00"] steps: - name: Validate GPU version and installed compiler @@ -111,7 +111,7 @@ jobs: os: [ubuntu-22.04] pl_backend: ["lightning_kokkos"] exec_model: ["CUDA"] - kokkos_version: ["4.4.01"] + kokkos_version: ["4.5.00"] name: C++ Tests (${{ matrix.pl_backend }}, kokkos-${{ matrix.kokkos_version }}, model-${{ matrix.exec_model }}) runs-on: diff --git a/.github/workflows/tests_lkcuda_python.yml b/.github/workflows/tests_lkcuda_python.yml index 952a19ab90..142491a0f2 100644 --- a/.github/workflows/tests_lkcuda_python.yml +++ b/.github/workflows/tests_lkcuda_python.yml @@ -54,7 +54,7 @@ jobs: matrix: os: [ubuntu-22.04] exec_model: ["CUDA"] - kokkos_version: ["4.4.01"] + kokkos_version: ["4.5.00"] steps: - name: Validate GPU version and installed compiler @@ -116,7 +116,7 @@ jobs: os: [ubuntu-22.04] pl_backend: ["lightning_kokkos", "all"] exec_model: ["CUDA"] - kokkos_version: ["4.4.01"] + kokkos_version: ["4.5.00"] name: Python Tests (${{ matrix.pl_backend }}, kokkos-${{ matrix.kokkos_version }}, model-${{ matrix.exec_model }}) runs-on: diff --git a/.github/workflows/tests_windows_cpp.yml b/.github/workflows/tests_windows_cpp.yml index 7c346ad5ab..c239907901 100644 --- a/.github/workflows/tests_windows_cpp.yml +++ b/.github/workflows/tests_windows_cpp.yml @@ -44,7 +44,7 @@ jobs: - name: Kokkos version id: kokkos_version - run: echo "kokkos_version=[\"4.4.01\"]" >> $GITHUB_OUTPUT + run: echo "kokkos_version=[\"4.5.00\"]" >> $GITHUB_OUTPUT outputs: exec_model: ${{ steps.exec_model.outputs.exec_model }} diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 8c2c8cd372..744d933c8d 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -75,8 +75,9 @@ jobs: -i ${{ matrix.container_img }} \ bash -c "git config --global --add safe.directory /io && \ cd /io && \ - pip install ninja && \ - ln -s /opt/python/cp310-cp10/bin/ninja /usr/bin/ninja && \ + yum install -y ninja-build && \ + echo $(which ninja) && \ + echo $(ninja --version) && \ cmake -BBuild . -DCMAKE_INSTALL_PREFIX=/install \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ -DKokkos_ENABLE_SERIAL=ON \ diff --git a/README.rst b/README.rst index 3c3575ed15..909b694e96 100644 --- a/README.rst +++ b/README.rst @@ -137,7 +137,7 @@ You can also pass ``cmake`` options with ``CMAKE_ARGS`` as follows: .. code-block:: bash CMAKE_ARGS="-DENABLE_OPENMP=OFF -DENABLE_BLAS=OFF" pip install -e . --config-settings editable_mode=compat -vv - + Supported options are ``-DENABLE_WARNINGS``, ``-DENABLE_NATIVE`` (for ``-march=native``) ``-DENABLE_BLAS``, ``-DENABLE_OPENMP``, and ``-DENABLE_CLANG_TIDY``. @@ -162,7 +162,7 @@ Then a common command will work. .. code-block:: bash pip install -r requirements.txt - pip install -e . + pip install -e . Note that OpenMP and BLAS are disabled on this platform. @@ -173,7 +173,7 @@ Testing To test that a plugin is working correctly, one can check both Python and C++ unit tests for each device. Python Test -^^^^^^^^^^^ +^^^^^^^^^^^ Test the Python code with: @@ -181,16 +181,16 @@ Test the Python code with: make test-python device=${PL.DEVICE} -where ``${PL.DEVICE}`` differ from ``${PL_BACKEND}`` by replacing the underscore by a dot. And can be +where ``${PL.DEVICE}`` differ from ``${PL_BACKEND}`` by replacing the underscore by a dot. And can be -- ``lightning.qubit`` (default) -- ``lightning.gpu`` +- ``lightning.qubit`` (default) +- ``lightning.gpu`` - ``lightning.kokkos`` - ``lightning.tensor`` C++ Test ^^^^^^^^ - + The C++ code can be tested with .. code-block:: bash @@ -317,12 +317,12 @@ Install Kokkos (Optional) We suggest first installing Kokkos with the wanted configuration following the instructions found in the `Kokkos documentation `_. For example, the following will build Kokkos for NVIDIA A100 cards -Download the `Kokkos code `_. Lightning Kokkos was tested with Kokkos version <= 4.4.1 +Download the `Kokkos code `_. Lightning Kokkos was tested with Kokkos version <= 4.5.0 .. code-block:: bash # Replace x, y, and z by the correct version - wget https://github.com/kokkos/kokkos/archive/refs/tags/4.x.yz.tar.gz + wget https://github.com/kokkos/kokkos/archive/refs/tags/4.x.yz.tar.gz tar -xvf 4.x.y.z.tar.gz cd kokkos-4.x.y.z @@ -365,9 +365,9 @@ The simplest way to install Lightning-Kokkos (OpenMP backend) through ``pip``. PL_BACKEND="lightning_kokkos" python scripts/configure_pyproject_toml.py CMAKE_ARGS="-DKokkos_ENABLE_OPENMP=ON" python -m pip install -e . --config-settings editable_mode=compat -vv -The supported backend options are +The supported backend options are -.. list-table:: +.. list-table:: :align: center :width: 100 % :widths: 20 20 20 20 20 @@ -377,7 +377,7 @@ The supported backend options are - ``OPENMP`` - ``THREADS`` - ``HIP`` - - ``CUDA`` + - ``CUDA`` and the corresponding build options are ``-DKokkos_ENABLE_XXX=ON``, where ``XXX`` needs be replaced by the backend name, for instance ``OPENMP``. diff --git a/cmake/support_kokkos.cmake b/cmake/support_kokkos.cmake index 1acda9f0f8..41a9087129 100644 --- a/cmake/support_kokkos.cmake +++ b/cmake/support_kokkos.cmake @@ -5,7 +5,7 @@ # Include this file only once include_guard() -set(KOKKOS_VERSION 4.4.01) +set(KOKKOS_VERSION 4.5.00) # Macro to aid in finding Kokkos with 3 potential install options: # 1. Fully integrated Kokkos packages and CMake module files From 0c05b0bf9b035880c0efaa5d483976b974f7790d Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Tue, 26 Nov 2024 19:45:25 +0000 Subject: [PATCH 03/15] Auto update version from '0.40.0-dev17' to '0.40.0-dev18' --- pennylane_lightning/core/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index 7f2f554755..3d1e53b61d 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.40.0-dev17" +__version__ = "0.40.0-dev18" From 13501229936f7fb97c6731f698e1aab171b8c36d Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:47:16 -0500 Subject: [PATCH 04/15] Update changelog --- .github/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 70661a84a0..39fbf694e8 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -23,6 +23,9 @@ ### Improvements +* Update Kokkos version support to 4.5. + [(#1007)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1007) + * Update Kokkos version support to 4.4.1 and enable Lightning-Kokkos[CUDA] C++ tests on CI. [(#1000)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1000) @@ -45,6 +48,9 @@ ### Bug fixes +* Fix the missing `ninja` in Linux AARCH64 wheels recipe. + [(#1007)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1007) + * Fix issue with `lightning.gpu` Rot operation with adjoint. [(#1004)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1004) From d81379fbd585aff95c71b5e6f06fb9d618794eaa Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:26:41 -0500 Subject: [PATCH 05/15] Update ninja build --- .github/workflows/wheel_linux_aarch64.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 744d933c8d..7be88fd389 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -75,15 +75,14 @@ jobs: -i ${{ matrix.container_img }} \ bash -c "git config --global --add safe.directory /io && \ cd /io && \ - yum install -y ninja-build && \ - echo $(which ninja) && \ - echo $(ninja --version) && \ + echo $(which python3.10) && \ + python3.10 -m pip install ninja --verbose && \ + ln -s /opt/python/cp310-cp310/bin/ninja /usr/bin/ninja && \ cmake -BBuild . -DCMAKE_INSTALL_PREFIX=/install \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_${{ matrix.exec_model }}=ON \ -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \ - -DCMAKE_CXX_COMPILER=g++ \ -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -G Ninja && \ From 291ac3d874bba2c840e42900f2d6db6899047275 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 21:45:22 -0500 Subject: [PATCH 06/15] Update pl-device-test in wheels --- .github/workflows/wheel_linux_aarch64.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 7be88fd389..9a36aaf60a 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -124,11 +124,6 @@ jobs: mkdir Kokkos cp -rf ${{ github.workspace }}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/ - - name: Install Python 3.10 - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Install dependencies run: python3.10 -m pip install cibuildwheel~=2.20.0 tomlkit @@ -168,14 +163,15 @@ jobs: CIBW_TEST_COMMAND: | DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"` + python -c "import pennylane as qml; print(qml.about())" pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report - run: python3 -m cibuildwheel --output-dir wheelhouse + run: python3.10 -m cibuildwheel --output-dir wheelhouse - name: Validate wheels run: | - python3 -m pip install twine - python3 -m twine check ./wheelhouse/*.whl + python3.10 -m pip install twine + python3.10 -m twine check ./wheelhouse/*.whl - uses: actions-ecosystem/action-regex-match@main id: rc_build From adbfa70593615d7e29345002defbf86c081c5eb9 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:26:06 -0500 Subject: [PATCH 07/15] Skip compilation --- .github/workflows/wheel_linux_aarch64.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 9a36aaf60a..6908c1d820 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -128,7 +128,7 @@ jobs: run: python3.10 -m pip install cibuildwheel~=2.20.0 tomlkit - name: Configure pyproject.toml file - run: PL_BACKEND="${{ matrix.pl_backend }}" python scripts/configure_pyproject_toml.py + run: PL_BACKEND="${{ matrix.pl_backend }}" python3.10 scripts/configure_pyproject_toml.py - uses: docker/setup-qemu-action@v3 name: Set up QEMU @@ -157,13 +157,18 @@ jobs: python -m pip install -r requirements-tests.txt if ${{ matrix.pl_backend == 'lightning_kokkos'}} then + pip uninstall pennylane pennylane-lightning -y PL_BACKEND="lightning_qubit" python scripts/configure_pyproject_toml.py SKIP_COMPILATION=True python -m pip install . -vv + which python + which python3.10 fi CIBW_TEST_COMMAND: | DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"` python -c "import pennylane as qml; print(qml.about())" + which python + which python3.10 pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report run: python3.10 -m cibuildwheel --output-dir wheelhouse From 5c9c2598340b247813e9ca0ca1a6378fce850f53 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 26 Nov 2024 23:02:08 -0500 Subject: [PATCH 08/15] Install PL/latest --- .github/workflows/wheel_linux_aarch64.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 6908c1d820..0ce83d9e37 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -155,20 +155,17 @@ jobs: CIBW_BEFORE_TEST: | python -m pip install -r requirements-tests.txt + # FIXME: install PennyLane/latest to fix pennylane.devices.capabilities requirements + python -m pip install git+https://github.com/PennyLaneAI/pennylane.git@master if ${{ matrix.pl_backend == 'lightning_kokkos'}} then - pip uninstall pennylane pennylane-lightning -y PL_BACKEND="lightning_qubit" python scripts/configure_pyproject_toml.py SKIP_COMPILATION=True python -m pip install . -vv - which python - which python3.10 fi CIBW_TEST_COMMAND: | DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"` python -c "import pennylane as qml; print(qml.about())" - which python - which python3.10 pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report run: python3.10 -m cibuildwheel --output-dir wheelhouse From ec01d16b44fa76098bf91f0bd1bd8fb7f9215fa2 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:20:37 -0500 Subject: [PATCH 09/15] revert actions/setup-python --- .github/workflows/wheel_linux_aarch64.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 0ce83d9e37..68feef507b 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -124,6 +124,11 @@ jobs: mkdir Kokkos cp -rf ${{ github.workspace }}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/ + - name: Install Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: '3.10' + - name: Install dependencies run: python3.10 -m pip install cibuildwheel~=2.20.0 tomlkit From 0b61815c07674ffce301b9d885ee909444f6ea57 Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Wed, 27 Nov 2024 19:20:57 +0000 Subject: [PATCH 10/15] Auto update version from '0.40.0-dev18' to '0.40.0-dev21' --- pennylane_lightning/core/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index 3d1e53b61d..ced6be2cdb 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.40.0-dev18" +__version__ = "0.40.0-dev21" From 6c87b910bd4ce2aa69c25dc0cff0fc2abf518fb5 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:59:11 -0500 Subject: [PATCH 11/15] Update tests --- .github/workflows/wheel_linux_aarch64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 68feef507b..8fb75695cd 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -171,7 +171,7 @@ jobs: CIBW_TEST_COMMAND: | DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"` python -c "import pennylane as qml; print(qml.about())" - pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report + # pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report run: python3.10 -m cibuildwheel --output-dir wheelhouse From a4a04045d2a116f6e709a3c38fe2ebc112564f61 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 23:53:54 -0500 Subject: [PATCH 12/15] Up --- .github/workflows/wheel_linux_aarch64.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 8fb75695cd..2646256ecd 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -75,7 +75,6 @@ jobs: -i ${{ matrix.container_img }} \ bash -c "git config --global --add safe.directory /io && \ cd /io && \ - echo $(which python3.10) && \ python3.10 -m pip install ninja --verbose && \ ln -s /opt/python/cp310-cp310/bin/ninja /usr/bin/ninja && \ cmake -BBuild . -DCMAKE_INSTALL_PREFIX=/install \ @@ -160,7 +159,7 @@ jobs: CIBW_BEFORE_TEST: | python -m pip install -r requirements-tests.txt - # FIXME: install PennyLane/latest to fix pennylane.devices.capabilities requirements + # FIXME(v0.40.0): install PennyLane/latest to fix pennylane.devices.capabilities requirements python -m pip install git+https://github.com/PennyLaneAI/pennylane.git@master if ${{ matrix.pl_backend == 'lightning_kokkos'}} then @@ -171,7 +170,10 @@ jobs: CIBW_TEST_COMMAND: | DEVICENAME=`echo ${{ matrix.pl_backend }} | sed "s/_/./g"` python -c "import pennylane as qml; print(qml.about())" - # pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report + python -c "import pennylane as qml; dev = qml.device(\"lightning.qubit\", wires=3); print(dev); dev2 = qml.device(\"lightning.kokkos\", wires=5); print(dev2)" + which pl-device-test + ls + pl-device-test --device=${DEVICENAME} --skip-ops -x --tb=short --no-flaky-report run: python3.10 -m cibuildwheel --output-dir wheelhouse From 4af1ed9bbdce9f75b74ca8c1a850e3de86bcf8aa Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 28 Nov 2024 09:06:54 -0500 Subject: [PATCH 13/15] Up --- .github/workflows/wheel_linux_aarch64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 2646256ecd..f9a3d1208d 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -164,7 +164,7 @@ jobs: if ${{ matrix.pl_backend == 'lightning_kokkos'}} then PL_BACKEND="lightning_qubit" python scripts/configure_pyproject_toml.py - SKIP_COMPILATION=True python -m pip install . -vv + python -m pip install . -vv fi CIBW_TEST_COMMAND: | From 6e5aacde86a083106f64526ea6f9c8b96b36ad1b Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Thu, 28 Nov 2024 21:02:48 +0000 Subject: [PATCH 14/15] Auto update version from '0.40.0-dev21' to '0.40.0-dev22' --- pennylane_lightning/core/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index ced6be2cdb..706ac97c51 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.40.0-dev21" +__version__ = "0.40.0-dev22" From 57dac52762f532dddc07e198ca9a1a92473b8fac Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 28 Nov 2024 16:43:48 -0500 Subject: [PATCH 15/15] Tidy up the patch --- .github/workflows/build_and_cache_Kokkos_linux.yml | 2 +- .github/workflows/wheel_linux_aarch64.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_cache_Kokkos_linux.yml b/.github/workflows/build_and_cache_Kokkos_linux.yml index 62f367dec2..d91747e103 100644 --- a/.github/workflows/build_and_cache_Kokkos_linux.yml +++ b/.github/workflows/build_and_cache_Kokkos_linux.yml @@ -1,7 +1,7 @@ name: Build and Cache Kokkos env: - GCC_VERSION: 11 + GCC_VERSION: 13 on: workflow_call: diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index c1467808d1..979d67471a 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -78,7 +78,7 @@ jobs: -i ${{ matrix.container_img }} \ bash -c "git config --global --add safe.directory /io && \ cd /io && \ - python3.10 -m pip install ninja --verbose && \ + python3.10 -m pip install ninja && \ ln -s /opt/python/cp310-cp310/bin/ninja /usr/bin/ninja && \ cmake -BBuild . -DCMAKE_INSTALL_PREFIX=/install \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ @@ -171,7 +171,7 @@ jobs: if ${{ matrix.pl_backend == 'lightning_kokkos'}} then PL_BACKEND="lightning_qubit" python scripts/configure_pyproject_toml.py - python -m pip install . -vv + SKIP_COMPILATION=True python -m pip install . -vv fi CIBW_TEST_COMMAND: |