From 22033974382fc5142867b46543f2c04f0e996d22 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 12 Dec 2022 09:28:51 -0500 Subject: [PATCH 1/8] Create v0.28.0 RC --- .github/CHANGELOG.md | 2 +- pennylane_lightning/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index f1b8b3978b..3e18ac7171 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,4 +1,4 @@ -# Release 0.28.0-dev +# Release 0.28.0 ### New features since last release diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index cdc34420e9..97ead5eb87 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -17,4 +17,4 @@ """ -__version__ = "0.28.0-dev5" +__version__ = "0.28.0-rc0" From cdf192797afeb0e39cb8cda3f6d9c0d297e90397 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 19 Dec 2022 11:42:20 +0000 Subject: [PATCH 2/8] Create release tag --- pennylane_lightning/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 97ead5eb87..496b06410e 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -17,4 +17,4 @@ """ -__version__ = "0.28.0-rc0" +__version__ = "0.28.0" From efbded286d54391590962bc09811b9a62d6e6720 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 19 Dec 2022 11:45:20 +0000 Subject: [PATCH 3/8] Update Changelog --- .github/CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 3e18ac7171..6d91da6d40 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,7 +1,5 @@ # Release 0.28.0 -### New features since last release - ### Breaking changes * Deprecate support for Python 3.7. @@ -15,8 +13,6 @@ * Improve the stopping condition method. [(#386)](https://github.com/PennyLaneAI/pennylane-lightning/pull/386) -### Documentation - ### Bug fixes - Pin CMake to 3.24.x in wheel-builder to avoid Python not found error in CMake 3.25, when building wheels for PennyLane-Lightning-GPU. From 4391a3ee1ab81dcfc3b40c8b500883fd408a3e8c Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Wed, 11 Jan 2023 06:11:12 -0500 Subject: [PATCH 4/8] Fix Python modules and locations for Windows wheels. --- .github/CHANGELOG.md | 15 +++++++++++++++ .github/workflows/wheel_win_x86_64.yml | 25 +++++++++++++++++++++++-- pennylane_lightning/_version.py | 2 +- setup.py | 4 ++-- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 6d91da6d40..a433cf69c7 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,3 +1,18 @@ +# Release 0.28.1 + +### Bug fixes + +* Fix Pybind11 module versioning and locations for Windows wheels. +[(#)]() + +### Contributors + +This release contains contributions from (in alphabetical order): + +Lee J. O'Riordan + +--- + # Release 0.28.0 ### Breaking changes diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index c7deb9b50e..fc28c78e1b 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -135,7 +135,7 @@ jobs: -Destination "D:\a\pennylane-lightning\pennylane-lightning\Kokkos" -Recurse -Force - name: Install cibuildwheel - run: python -m pip install cibuildwheel~=2.11.0 + run: python -m pip install cibuildwheel~=2.11.0 wheel - name: Build wheels env: @@ -145,7 +145,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - pip install pybind11 cmake~=3.24.0 + pip install pybind11 cmake~=3.24.0 build # Testing of built wheels CIBW_TEST_REQUIRES: numpy~=1.21 scipy pytest pytest-cov pytest-mock flaky @@ -154,14 +154,35 @@ jobs: pip install git+https://github.com/PennyLaneAI/pennylane.git@master CIBW_TEST_COMMAND: | + python -m pip install -e . pl-device-test --device=lightning.qubit --skip-ops -x --tb=short --no-flaky-report CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_BUILD_VERBOSITY: 3 + CIBW_BUILD_FRONTEND: build + run: python -m cibuildwheel --output-dir wheelhouse + - name: Patch wheels + run: | + cd wheelhouse + $wheels = Get-ChildItem "./" -Filter *.whl + foreach ($i in $wheels){ + python -m wheel unpack $i.Name + $name = $i.Name + $dirName = python -c "s = '$name'; print('-'.join(s.split('-')[0:2]))" + if (Test-Path -Path $dirName\pennylane_lightning\RelWithDebInfo) { + Move-Item -Path $dirName\pennylane_lightning\RelWithDebInfo\* -Destination $dirName\pennylane_lightning + Remove-Item $dirName\pennylane_lightning\RelWithDebInfo -Recurse + python -m wheel pack $dirName + echo "Patched $name" + } + Remove-Item $dirName -Recurse + } + cd .. + - uses: actions-ecosystem/action-regex-match@v2 id: rc_build with: diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 496b06410e..f473fe58d6 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -17,4 +17,4 @@ """ -__version__ = "0.28.0" +__version__ = "0.28.1_rc0" diff --git a/setup.py b/setup.py index 63399387b4..4c1c001dce 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def build_extension(self, ext: CMakeExtension): # Set Python_EXECUTABLE instead if you use PYBIND11_FINDPYTHON configure_args = [ f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}", - f"-DPYTHON_EXECUTABLE={sys.executable}", + f"-DPython_EXECUTABLE={sys.executable}", "-DENABLE_WARNINGS=OFF", # Ignore warnings ] @@ -115,7 +115,7 @@ def build_extension(self, ext: CMakeExtension): requirements = [ "ninja", "numpy", - "pennylane>=0.19", + "pennylane>=0.28", ] info = { From 2ab66c5afcf60c83fb1c269fdffef49f678a7ddc Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Wed, 11 Jan 2023 06:46:39 -0500 Subject: [PATCH 5/8] Remove local pip install --- .github/workflows/wheel_win_x86_64.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index fc28c78e1b..dc9a11ca56 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -154,7 +154,6 @@ jobs: pip install git+https://github.com/PennyLaneAI/pennylane.git@master CIBW_TEST_COMMAND: | - python -m pip install -e . pl-device-test --device=lightning.qubit --skip-ops -x --tb=short --no-flaky-report CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 From 20a09ffea02aac0e1c3ce8d321e7e927dbfe34b4 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Wed, 11 Jan 2023 16:05:18 +0000 Subject: [PATCH 6/8] Temp enable wheel cahcing for Windows --- .github/workflows/wheel_win_x86_64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index dc9a11ca56..07b6a3568b 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -189,7 +189,7 @@ jobs: regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+' - uses: actions/upload-artifact@v2 - if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}} + #if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}} with: name: ${{ runner.os }}-wheels-${{ matrix.arch }}.zip path: ./wheelhouse/*.whl From cd65694006b04d36558c21f5ec1b95b5e3874306 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Wed, 11 Jan 2023 16:29:32 +0000 Subject: [PATCH 7/8] Update for release [no ci] --- .github/workflows/post_release_version_bump.yml | 2 +- .github/workflows/wheel_win_x86_64.yml | 2 +- pennylane_lightning/_version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/post_release_version_bump.yml b/.github/workflows/post_release_version_bump.yml index a1ef9e31ba..4b85edebaf 100644 --- a/.github/workflows/post_release_version_bump.yml +++ b/.github/workflows/post_release_version_bump.yml @@ -35,5 +35,5 @@ jobs: title: Version Bump body: updated changelog and _version.py branch: post-release-version-bump - reviewers: antalszava + reviewers: mlxd base: master diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index 07b6a3568b..dc9a11ca56 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -189,7 +189,7 @@ jobs: regex: '.*[0-9]+.[0-9]+.[0-9]+[-_]?rc[0-9]+' - uses: actions/upload-artifact@v2 - #if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}} + if: ${{ github.event_name == 'release' || github.ref == 'refs/heads/master' || steps.rc_build.outputs.match != ''}} with: name: ${{ runner.os }}-wheels-${{ matrix.arch }}.zip path: ./wheelhouse/*.whl diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 529e765dfb..06e3f8c53f 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.28.1_rc0" +__version__ = "0.28.1" From 65db86fa7cb53114ccd3a8c0956a4e7f2443b01b Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Wed, 11 Jan 2023 17:03:06 +0000 Subject: [PATCH 8/8] Modify for merging to master --- .github/CHANGELOG.md | 16 ++++++++++++++++ pennylane_lightning/_version.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index d4ff21d4a1..9564e5d248 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,3 +1,19 @@ +# Release 0.29.0-dev + +### New features since last release + +### Breaking changes + +### Improvements + +### Documentation + +### Bug fixes + +### Contributors + +--- + # Release 0.28.1 ### Bug fixes diff --git a/pennylane_lightning/_version.py b/pennylane_lightning/_version.py index 06e3f8c53f..78c22e4cbc 100644 --- a/pennylane_lightning/_version.py +++ b/pennylane_lightning/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.28.1" +__version__ = "0.29.0-dev0"