From c352689c9866e898c39e9afe8bf510286dc91622 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 15:38:34 -0400 Subject: [PATCH 01/12] Update Pybind11 again --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d53f2d75c3..21fb8e2429 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ if(ENABLE_PYTHON) find_package(Python COMPONENTS Interpreter Development) FetchContent_Declare(pybind11 GIT_REPOSITORY https://github.com/pybind/pybind11.git - GIT_TAG v2.11.1 + GIT_TAG v2.13.5 ) FetchContent_MakeAvailable(pybind11) endif() From 33dcdfd9ff8e9375964d27587189d25919c09aa7 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 15:43:38 -0400 Subject: [PATCH 02/12] Update changelog --- .github/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index fd7f2ec2b3..09879e0749 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -15,6 +15,9 @@ ### Improvements +* Update Pybind11 2o 2.13.5. + [(#901)](https://github.com/PennyLaneAI/pennylane-lightning/pull/901) + * Prefer `tomlkit` over `toml` for building Lightning wheels, and choose `tomli` and `tomllib` over `toml` when installing the package. [(#857)](https://github.com/PennyLaneAI/pennylane-lightning/pull/857) From 900e8282f0515abb8fd04ff0909ca83df7d86f99 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 16:11:12 -0400 Subject: [PATCH 03/12] Report import exception with LQ --- pennylane_lightning/lightning_qubit/lightning_qubit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pennylane_lightning/lightning_qubit/lightning_qubit.py b/pennylane_lightning/lightning_qubit/lightning_qubit.py index 5fd958f031..6f3c9fe2c0 100644 --- a/pennylane_lightning/lightning_qubit/lightning_qubit.py +++ b/pennylane_lightning/lightning_qubit/lightning_qubit.py @@ -55,7 +55,7 @@ from pennylane_lightning.lightning_qubit_ops import backend_info LQ_CPP_BINARY_AVAILABLE = True -except ImportError: +except ImportError as ex: LQ_CPP_BINARY_AVAILABLE = False # The set of supported operations. @@ -342,6 +342,7 @@ def __init__( # pylint: disable=too-many-arguments ): if not self._CPP_BINARY_AVAILABLE: raise ImportError( + f"Encountered import error: {ex}" "Pre-compiled binaries for lightning.qubit are not available. " "To manually compile from source, follow the instructions at " "https://docs.pennylane.ai/projects/lightning/en/stable/dev/installation.html." From 95389c6d068d87ff7d6afc1d59f01ca0102ef83b Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 16:17:44 -0400 Subject: [PATCH 04/12] Enabling CPP binary import to report as warnings --- pennylane_lightning/lightning_gpu/lightning_gpu.py | 7 ++++--- pennylane_lightning/lightning_kokkos/lightning_kokkos.py | 4 +++- pennylane_lightning/lightning_qubit/lightning_qubit.py | 3 ++- pennylane_lightning/lightning_tensor/lightning_tensor.py | 5 ++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pennylane_lightning/lightning_gpu/lightning_gpu.py b/pennylane_lightning/lightning_gpu/lightning_gpu.py index 0e55c5c9e1..a7b14839c7 100644 --- a/pennylane_lightning/lightning_gpu/lightning_gpu.py +++ b/pennylane_lightning/lightning_gpu/lightning_gpu.py @@ -74,7 +74,8 @@ ) MPI_SUPPORT = True - except ImportError: + except ImportError as ex: + warn(str(ex), UserWarning) MPI_SUPPORT = False if find_library("custatevec") is None and not imp_util.find_spec( @@ -90,8 +91,8 @@ raise ValueError(f"CUDA device is an unsupported version: {get_gpu_arch()}") LGPU_CPP_BINARY_AVAILABLE = True -except (ImportError, ValueError) as e: - warn(str(e), UserWarning) +except (ImportError, ValueError) as ex: + warn(str(ex), UserWarning) backend_info = None LGPU_CPP_BINARY_AVAILABLE = False diff --git a/pennylane_lightning/lightning_kokkos/lightning_kokkos.py b/pennylane_lightning/lightning_kokkos/lightning_kokkos.py index 47f5014463..961e59b603 100644 --- a/pennylane_lightning/lightning_kokkos/lightning_kokkos.py +++ b/pennylane_lightning/lightning_kokkos/lightning_kokkos.py @@ -20,6 +20,7 @@ from dataclasses import replace from pathlib import Path from typing import Optional +from warnings import warn import numpy as np import pennylane as qml @@ -56,7 +57,8 @@ from pennylane_lightning.lightning_kokkos_ops import backend_info, print_configuration LK_CPP_BINARY_AVAILABLE = True -except ImportError: +except ImportError as ex: + warn(str(ex), UserWarning) LK_CPP_BINARY_AVAILABLE = False backend_info = None diff --git a/pennylane_lightning/lightning_qubit/lightning_qubit.py b/pennylane_lightning/lightning_qubit/lightning_qubit.py index 6f3c9fe2c0..5340d1bada 100644 --- a/pennylane_lightning/lightning_qubit/lightning_qubit.py +++ b/pennylane_lightning/lightning_qubit/lightning_qubit.py @@ -19,6 +19,7 @@ from functools import reduce from pathlib import Path from typing import Optional, Sequence +from warnings import warn import numpy as np import pennylane as qml @@ -56,6 +57,7 @@ LQ_CPP_BINARY_AVAILABLE = True except ImportError as ex: + warn(str(ex), UserWarning) LQ_CPP_BINARY_AVAILABLE = False # The set of supported operations. @@ -342,7 +344,6 @@ def __init__( # pylint: disable=too-many-arguments ): if not self._CPP_BINARY_AVAILABLE: raise ImportError( - f"Encountered import error: {ex}" "Pre-compiled binaries for lightning.qubit are not available. " "To manually compile from source, follow the instructions at " "https://docs.pennylane.ai/projects/lightning/en/stable/dev/installation.html." diff --git a/pennylane_lightning/lightning_tensor/lightning_tensor.py b/pennylane_lightning/lightning_tensor/lightning_tensor.py index 2029b20faa..4920d1f1da 100644 --- a/pennylane_lightning/lightning_tensor/lightning_tensor.py +++ b/pennylane_lightning/lightning_tensor/lightning_tensor.py @@ -18,6 +18,7 @@ from dataclasses import replace from numbers import Number from typing import Callable, Optional, Sequence, Tuple, Union +from warnings import warn import numpy as np import pennylane as qml @@ -49,7 +50,9 @@ raise ValueError(f"CUDA device is an unsupported version: {get_gpu_arch()}") LT_CPP_BINARY_AVAILABLE = True -except ImportError: + +except ImportError as ex: + warn(str(ex), UserWarning) LT_CPP_BINARY_AVAILABLE = False Result_or_ResultBatch = Union[Result, ResultBatch] From 06d04ee862dd163b0512a709efacce3a80e13149 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 16:19:00 -0400 Subject: [PATCH 05/12] Fix failed merge on changelog --- .github/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 3d9b9f8c85..6cd76a3a1f 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -44,7 +44,7 @@ This release contains contributions from (in alphabetical order): -Amintor Dusko, Luis Alfredo Nuñez Meneses, Vincent Michaud-Rioux, Lee J. O'Riordan, Shuli Shu +Ali Asadi, Amintor Dusko, Luis Alfredo Nuñez Meneses, Vincent Michaud-Rioux, Lee J. O'Riordan, Shuli Shu --- From 1ab3ea416913912b1a5d2790ce88cd101958888b Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 16:57:53 -0400 Subject: [PATCH 06/12] Upgrade CIBW --- .github/workflows/wheel_linux_aarch64.yml | 2 +- .github/workflows/wheel_linux_aarch64_cuda.yml | 2 +- .github/workflows/wheel_linux_ppc64le.yml | 2 +- .github/workflows/wheel_linux_x86_64.yml | 2 +- .github/workflows/wheel_linux_x86_64_cuda.yml | 2 +- .github/workflows/wheel_macos_arm64.yml | 2 +- .github/workflows/wheel_macos_x86_64.yml | 2 +- .github/workflows/wheel_win_x86_64.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 3265c9cbbf..6e9ba2c35c 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -125,7 +125,7 @@ jobs: cp -rf ${{ github.workspace }}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/ - name: Install dependencies - run: python -m pip install cibuildwheel~=2.16.0 tomlkit + run: python -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 diff --git a/.github/workflows/wheel_linux_aarch64_cuda.yml b/.github/workflows/wheel_linux_aarch64_cuda.yml index 4069c1b3a4..7b063ee7eb 100644 --- a/.github/workflows/wheel_linux_aarch64_cuda.yml +++ b/.github/workflows/wheel_linux_aarch64_cuda.yml @@ -49,7 +49,7 @@ jobs: uses: actions/checkout@v4 - name: Install cibuildwheel - run: python -m pip install cibuildwheel~=2.16.0 tomlkit + run: python -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 diff --git a/.github/workflows/wheel_linux_ppc64le.yml b/.github/workflows/wheel_linux_ppc64le.yml index aae010adf2..2bbd4c0b51 100644 --- a/.github/workflows/wheel_linux_ppc64le.yml +++ b/.github/workflows/wheel_linux_ppc64le.yml @@ -124,7 +124,7 @@ jobs: cp -rf ${{ github.workspace }}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/ - name: Install dependencies - run: python -m pip install cibuildwheel~=2.16.0 tomlkit + run: python -m pip install cibuildwheel~=2.20.0 tomlkit - uses: docker/setup-qemu-action@v3 name: Set up QEMU diff --git a/.github/workflows/wheel_linux_x86_64.yml b/.github/workflows/wheel_linux_x86_64.yml index 9324432845..641a2ddfbd 100644 --- a/.github/workflows/wheel_linux_x86_64.yml +++ b/.github/workflows/wheel_linux_x86_64.yml @@ -141,7 +141,7 @@ jobs: dnf update -y && dnf install -y podman - name: Install dependencies - run: python3.10 -m pip install cibuildwheel~=2.16.0 tomlkit + run: python3.10 -m pip install cibuildwheel~=2.20.0 tomlkit - name: Configure pyproject.toml file run: PL_BACKEND="${{ matrix.pl_backend }}" python3.10 scripts/configure_pyproject_toml.py diff --git a/.github/workflows/wheel_linux_x86_64_cuda.yml b/.github/workflows/wheel_linux_x86_64_cuda.yml index 1f161faaa2..d4f6af4428 100644 --- a/.github/workflows/wheel_linux_x86_64_cuda.yml +++ b/.github/workflows/wheel_linux_x86_64_cuda.yml @@ -68,7 +68,7 @@ jobs: dnf update -y && dnf install -y podman - name: Install dependencies - run: python3.10 -m pip install cibuildwheel~=2.16.0 tomlkit + run: python3.10 -m pip install cibuildwheel~=2.20.0 tomlkit - name: Configure pyproject.toml file run: PL_BACKEND="${{ matrix.pl_backend }}" python3.10 scripts/configure_pyproject_toml.py diff --git a/.github/workflows/wheel_macos_arm64.yml b/.github/workflows/wheel_macos_arm64.yml index ae10e9b996..8932af11db 100644 --- a/.github/workflows/wheel_macos_arm64.yml +++ b/.github/workflows/wheel_macos_arm64.yml @@ -81,7 +81,7 @@ jobs: python-version: '3.10' - name: Install dependencies - run: python -m pip install cibuildwheel~=2.16.0 tomlkit + run: python -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 diff --git a/.github/workflows/wheel_macos_x86_64.yml b/.github/workflows/wheel_macos_x86_64.yml index 7777406d12..e133dabb19 100644 --- a/.github/workflows/wheel_macos_x86_64.yml +++ b/.github/workflows/wheel_macos_x86_64.yml @@ -130,7 +130,7 @@ jobs: python-version: '3.10' - name: Install dependencies - run: python -m pip install cibuildwheel~=2.16.0 tomlkit + run: python -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 diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index eca482677f..68aa203f22 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -119,7 +119,7 @@ jobs: -Destination "D:\a\pennylane-lightning\pennylane-lightning\Kokkos" -Recurse -Force - name: Install dependencies - run: python -m pip install cibuildwheel~=2.16.0 wheel toml + run: python -m pip install cibuildwheel~=2.20.0 wheel toml - name: Configure pyproject.toml file env: From 56b659a94ee3e0b88c8bfba3f7d40b4575ed9039 Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Mon, 9 Sep 2024 17:44:59 -0400 Subject: [PATCH 07/12] Update PB build args for Python and deps --- .github/workflows/wheel_linux_aarch64.yml | 2 +- .github/workflows/wheel_linux_aarch64_cuda.yml | 2 +- .github/workflows/wheel_linux_ppc64le.yml | 2 +- .github/workflows/wheel_linux_x86_64.yml | 2 +- .github/workflows/wheel_linux_x86_64_cuda.yml | 2 +- .github/workflows/wheel_macos_arm64.yml | 2 +- .github/workflows/wheel_macos_x86_64.yml | 2 +- .github/workflows/wheel_win_x86_64.yml | 2 +- pyproject.toml | 2 +- scripts/configure_pyproject_toml.py | 2 +- setup.py | 4 +--- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/wheel_linux_aarch64.yml b/.github/workflows/wheel_linux_aarch64.yml index 6e9ba2c35c..a15c51831e 100644 --- a/.github/workflows/wheel_linux_aarch64.yml +++ b/.github/workflows/wheel_linux_aarch64.yml @@ -144,7 +144,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | cat /etc/yum.conf | sed "s/\[main\]/\[main\]\ntimeout=5/g" > /etc/yum.conf - python -m pip install ninja cmake~=3.24.0 + python -m pip install ninja cmake~=3.27.0 CIBW_ENVIRONMENT: CMAKE_ARGS="-DENABLE_LAPACK=OFF" diff --git a/.github/workflows/wheel_linux_aarch64_cuda.yml b/.github/workflows/wheel_linux_aarch64_cuda.yml index 7b063ee7eb..a7d333534d 100644 --- a/.github/workflows/wheel_linux_aarch64_cuda.yml +++ b/.github/workflows/wheel_linux_aarch64_cuda.yml @@ -67,7 +67,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - python -m pip install ninja cmake~=3.24.3 auditwheel~=5.0 custatevec-cu${{ matrix.cuda_version }} + python -m pip install ninja cmake~=3.27.0 auditwheel~=5.0 custatevec-cu${{ matrix.cuda_version }} dnf clean all -y dnf install gcc-toolset-12 dnf-utils -y source /opt/rh/gcc-toolset-12/enable -y diff --git a/.github/workflows/wheel_linux_ppc64le.yml b/.github/workflows/wheel_linux_ppc64le.yml index 2bbd4c0b51..caaa7d4226 100644 --- a/.github/workflows/wheel_linux_ppc64le.yml +++ b/.github/workflows/wheel_linux_ppc64le.yml @@ -143,7 +143,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | cat /etc/yum.conf | sed "s/\[main\]/\[main\]\ntimeout=5/g" > /etc/yum.conf - python -m pip install ninja cmake~=3.24.0 + python -m pip install ninja cmake~=3.27.0 CIBW_ENVIRONMENT: CMAKE_ARGS="-DENABLE_LAPACK=OFF" diff --git a/.github/workflows/wheel_linux_x86_64.yml b/.github/workflows/wheel_linux_x86_64.yml index 641a2ddfbd..5d498dd37e 100644 --- a/.github/workflows/wheel_linux_x86_64.yml +++ b/.github/workflows/wheel_linux_x86_64.yml @@ -159,7 +159,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | cat /etc/dnf.conf | sed "s/\[main\]/\[main\]\ntimeout=5/g" > /etc/dnf.conf - python -m pip install ninja cmake~=3.24.0 scipy + python -m pip install ninja cmake~=3.27.0 scipy dnf clean all -y dnf install gcc-toolset-13 -y source /opt/rh/gcc-toolset-13/enable -y diff --git a/.github/workflows/wheel_linux_x86_64_cuda.yml b/.github/workflows/wheel_linux_x86_64_cuda.yml index d4f6af4428..ae3b50355f 100644 --- a/.github/workflows/wheel_linux_x86_64_cuda.yml +++ b/.github/workflows/wheel_linux_x86_64_cuda.yml @@ -87,7 +87,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - python -m pip install ninja cmake~=3.24.3 auditwheel~=5.0 custatevec-cu${{ matrix.cuda_version }} scipy + python -m pip install ninja cmake~=3.27.0 auditwheel~=5.0 custatevec-cu${{ matrix.cuda_version }} scipy dnf clean all -y dnf install gcc-toolset-12 dnf-utils -y source /opt/rh/gcc-toolset-12/enable -y diff --git a/.github/workflows/wheel_macos_arm64.yml b/.github/workflows/wheel_macos_arm64.yml index 8932af11db..eb7314f78b 100644 --- a/.github/workflows/wheel_macos_arm64.yml +++ b/.github/workflows/wheel_macos_arm64.yml @@ -96,7 +96,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - python -m pip install pybind11 ninja cmake~=3.24.0 setuptools scipy + python -m pip install pybind11 ninja cmake~=3.27.0 setuptools scipy CIBW_ENVIRONMENT: | CMAKE_ARGS="-DCMAKE_CXX_COMPILER_TARGET=arm64-apple-macos11 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=ARM64 -DENABLE_OPENMP=OFF" diff --git a/.github/workflows/wheel_macos_x86_64.yml b/.github/workflows/wheel_macos_x86_64.yml index e133dabb19..a431700b9f 100644 --- a/.github/workflows/wheel_macos_x86_64.yml +++ b/.github/workflows/wheel_macos_x86_64.yml @@ -146,7 +146,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - python -m pip install pybind11 ninja cmake~=3.24.0 setuptools scipy + python -m pip install pybind11 ninja cmake~=3.27.0 setuptools scipy PL_BACKEND: ${{ matrix.pl_backend }} diff --git a/.github/workflows/wheel_win_x86_64.yml b/.github/workflows/wheel_win_x86_64.yml index 68aa203f22..4bf3a11847 100644 --- a/.github/workflows/wheel_win_x86_64.yml +++ b/.github/workflows/wheel_win_x86_64.yml @@ -134,7 +134,7 @@ jobs: # Python build settings CIBW_BEFORE_BUILD: | - python -m pip install pybind11 cmake~=3.24.0 build + python -m pip install pybind11 cmake~=3.27.0 build CIBW_ENVIRONMENT: | CMAKE_ARGS="-DENABLE_LAPACK=OFF" diff --git a/pyproject.toml b/pyproject.toml index 2a0fbf63f0..3f8dc9077f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["cmake~=3.24.0", "ninja; platform_system!='Windows'", "setuptools>=42", "tomli"] +requires = ["cmake~=3.27.0", "ninja; platform_system!='Windows'", "setuptools>=42", "tomli"] build-backend = "setuptools.build_meta" [project] diff --git a/scripts/configure_pyproject_toml.py b/scripts/configure_pyproject_toml.py index 56510fc6cb..b53df0e039 100755 --- a/scripts/configure_pyproject_toml.py +++ b/scripts/configure_pyproject_toml.py @@ -89,7 +89,7 @@ def parse_args(): # Configure Build. # ------------------------ requires = [ - "cmake~=3.24.0", + "cmake~=3.27.0", "ninja; platform_system!='Windows'", "setuptools>=42", "tomli", diff --git a/setup.py b/setup.py index 039cc5e6e0..47d7b2386b 100644 --- a/setup.py +++ b/setup.py @@ -93,9 +93,7 @@ def build_extension(self, ext: CMakeExtension): "-DENABLE_WARNINGS=OFF", # Ignore warnings ] configure_args += ( - [f"-DPYTHON_EXECUTABLE={sys.executable}"] - if platform.system() == "Linux" - else [f"-DPython_EXECUTABLE={sys.executable}"] + [f"-DPYTHON_EXECUTABLE={sys.executable}", "-DPYBIND11_FINDPYTHON=ON"] ) if platform.system() == "Windows": From fdcfec8c1ab7a70dd795be54d79f3699a4c16fcc Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Tue, 10 Sep 2024 09:03:00 -0400 Subject: [PATCH 08/12] Bump MacOS min version to 12.0 in wheel builds --- .github/workflows/wheel_macos_arm64.yml | 1 + .github/workflows/wheel_macos_x86_64.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheel_macos_arm64.yml b/.github/workflows/wheel_macos_arm64.yml index eb7314f78b..c040a8e792 100644 --- a/.github/workflows/wheel_macos_arm64.yml +++ b/.github/workflows/wheel_macos_arm64.yml @@ -24,6 +24,7 @@ env: ARCHS: 'arm64' PYTHON3_MIN_VERSION: "10" PYTHON3_MAX_VERSION: "12" + MACOSX_DEPLOYMENT_TARGET: 12.0 concurrency: group: wheel_macos_arm64-${{ github.ref }} diff --git a/.github/workflows/wheel_macos_x86_64.yml b/.github/workflows/wheel_macos_x86_64.yml index a431700b9f..85157499ca 100644 --- a/.github/workflows/wheel_macos_x86_64.yml +++ b/.github/workflows/wheel_macos_x86_64.yml @@ -21,7 +21,7 @@ on: workflow_dispatch: env: - MACOSX_DEPLOYMENT_TARGET: 10.15 + MACOSX_DEPLOYMENT_TARGET: 12.0 concurrency: group: wheel_macos_x86_64-${{ github.ref }} From f52e2e287cf45a0834482cc3a5c3bd71885c167a Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Tue, 10 Sep 2024 13:03:26 +0000 Subject: [PATCH 09/12] Auto update version from '0.39.0-dev10' to '0.39.0-dev12' --- 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 bc9075b0d4..1f7bd4c08f 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.39.0-dev10" +__version__ = "0.39.0-dev12" From f535b3eab480c03e8cd147a47a267c06ee65955b Mon Sep 17 00:00:00 2001 From: "Lee J. O'Riordan" Date: Tue, 10 Sep 2024 09:28:45 -0400 Subject: [PATCH 10/12] Re-add multicase Python executable argument for CMake on MacOS --- .github/CHANGELOG.md | 3 +++ setup.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 6cd76a3a1f..8744ead497 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -10,6 +10,9 @@ ### Breaking changes +* Update MacOS wheel builds to require Monterey (12.0) or greater for x86_64 and ARM. + [(#901)](https://github.com/PennyLaneAI/pennylane-lightning/pull/901) + * Remove support for Python 3.9. [#891](https://github.com/PennyLaneAI/pennylane-lightning/pull/891) diff --git a/setup.py b/setup.py index 47d7b2386b..a326a90a2d 100644 --- a/setup.py +++ b/setup.py @@ -93,8 +93,11 @@ def build_extension(self, ext: CMakeExtension): "-DENABLE_WARNINGS=OFF", # Ignore warnings ] configure_args += ( - [f"-DPYTHON_EXECUTABLE={sys.executable}", "-DPYBIND11_FINDPYTHON=ON"] + [f"-DPYTHON_EXECUTABLE={sys.executable}"] + if platform.system() != "Darwin" + else [f"-DPython_EXECUTABLE={sys.executable}"] ) + configure_args += ["-DPYBIND11_FINDPYTHON=ON"] if platform.system() == "Windows": # As Ninja does not support long path for windows yet: From f6d45c3583592b0752ebe8a48495b0df02a1af14 Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Tue, 10 Sep 2024 15:16:25 +0000 Subject: [PATCH 11/12] Auto update version from '0.39.0-dev12' to '0.39.0-dev13' --- 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 1f7bd4c08f..361397236c 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.39.0-dev12" +__version__ = "0.39.0-dev13" From ee29c1bcce2d86925956ef081d7bf8b642fac1d4 Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Tue, 10 Sep 2024 15:25:32 +0000 Subject: [PATCH 12/12] Auto update version from '0.39.0-dev13' to '0.39.0-dev14' --- 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 361397236c..9b4b442069 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.39.0-dev13" +__version__ = "0.39.0-dev14"