From f0733e7a506084bfa0584b66b919a9a99e0a22df Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 10 Jan 2024 15:06:50 -0500 Subject: [PATCH 001/120] add more tests --- runtime/lib/backend/lightning/CMakeLists.txt | 6 +- runtime/tests/Test_LightningMeasures.cpp | 141 +++++++++++++++---- 2 files changed, 119 insertions(+), 28 deletions(-) diff --git a/runtime/lib/backend/lightning/CMakeLists.txt b/runtime/lib/backend/lightning/CMakeLists.txt index 4aee24fddd..dcc2ebc2f5 100644 --- a/runtime/lib/backend/lightning/CMakeLists.txt +++ b/runtime/lib/backend/lightning/CMakeLists.txt @@ -18,16 +18,20 @@ set(LIGHTNING_GIT_TAG "master" CACHE STRING "GIT_TAG value to build Lightning") FetchContent_Declare( pennylane_lightning GIT_REPOSITORY https://github.com/PennyLaneAI/pennylane-lightning.git - GIT_TAG ${LIGHTNING_GIT_TAG} + #GIT_TAG ${LIGHTNING_GIT_TAG} + GIT_TAG "c46a0de" ) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # build with -fPIC if(ENABLE_LIGHTNING AND ENABLE_LIGHTNING_KOKKOS) set(PL_BACKEND "lightning_qubit;lightning_kokkos" CACHE STRING "PennyLane Lightning backend") + set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") elseif(ENABLE_LIGHTNING) set(PL_BACKEND "lightning_qubit" CACHE STRING "PennyLane Lightning backend") + set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") elseif(ENABLE_LIGHTNING_KOKKOS) set(PL_BACKEND "lightning_kokkos" CACHE STRING "PennyLane Lightning backend") + set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") endif() set(ENABLE_PYTHON OFF CACHE BOOL "Enable compilation of the Python module") diff --git a/runtime/tests/Test_LightningMeasures.cpp b/runtime/tests/Test_LightningMeasures.cpp index 415d6cc6ec..9e436525c4 100644 --- a/runtime/tests/Test_LightningMeasures.cpp +++ b/runtime/tests/Test_LightningMeasures.cpp @@ -248,35 +248,12 @@ TEMPLATE_LIST_TEST_CASE("Expval(HermitianObs) shots test", "[Measures]", SimType sim->NamedOperation("PauliY", {}, {Qs[1]}, false); std::vector> mat1(16, {0, 0}); + mat1[1] = {1, 0}; ObsIdType h1 = sim->Observable(ObsId::Hermitian, mat1, {Qs[0], Qs[1]}); - REQUIRE_THROWS_WITH(sim->Expval(h1), - Catch::Contains("Hermitian observables do not support shot measurement.")); -} - -TEMPLATE_LIST_TEST_CASE("Var(HermitianObs) shots test", "[Measures]", SimTypes) -{ - std::unique_ptr sim = std::make_unique(); - - // state-vector with #qubits = n - constexpr size_t n = 2; - std::vector Qs; - Qs.reserve(n); - for (size_t i = 0; i < n; i++) { - Qs.push_back(sim->AllocateQubit()); - } - - constexpr size_t num_shots = 10000; - sim->SetDeviceShots(num_shots); - - sim->NamedOperation("Hadamard", {}, {Qs[0]}, false); - sim->NamedOperation("PauliY", {}, {Qs[1]}, false); - - std::vector> mat1(16, {0, 0}); - - ObsIdType h1 = sim->Observable(ObsId::Hermitian, mat1, {Qs[0], Qs[1]}); - REQUIRE_THROWS_WITH(sim->Var(h1), - Catch::Contains("Hermitian observables do not support shot measurement.")); + REQUIRE_THROWS_WITH( + sim->Expval(h1), + Catch::Contains("The matrix passed to HermitianObs is not a Hermitian matrix.")); } TEMPLATE_LIST_TEST_CASE("Expval(TensorProd(NamedObs)) test", "[Measures]", SimTypes) @@ -643,6 +620,36 @@ TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian(Hermitian[])) test", "[Measures]", S CHECK(sim->Expval(hxhz) == Approx(0.5).margin(1e-5)); } +TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian(Hermitian[])) shots test", "[Measures]", SimTypes) +{ + std::unique_ptr sim = std::make_unique(); + + // state-vector with #qubits = n + constexpr size_t n = 4; + std::vector Qs; + Qs.reserve(n); + for (size_t i = 0; i < n; i++) { + Qs.push_back(sim->AllocateQubit()); + } + + sim->NamedOperation("PauliX", {}, {Qs[0]}, false); + sim->NamedOperation("PauliY", {}, {Qs[1]}, false); + sim->NamedOperation("Hadamard", {}, {Qs[2]}, false); + sim->NamedOperation("PauliZ", {}, {Qs[3]}, false); + + ObsIdType px = sim->Observable(ObsId::PauliX, {}, {Qs[2]}); + ObsIdType pz = sim->Observable(ObsId::PauliZ, {}, {Qs[1]}); + + std::vector> mat2{{1.0, 0.0}, {2.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}}; + ObsIdType h = sim->Observable(ObsId::Hermitian, mat2, {Qs[0]}); + ObsIdType hxhz = sim->HamiltonianObservable({0.2, 0.3, 0.6}, {px, h, pz}); + + constexpr size_t num_shots = 10000; + sim->SetDeviceShots(num_shots); + + CHECK(sim->Expval(hxhz) == Approx(0.5).margin(5e-2)); +} + TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian({TensorProd, Hermitian}[])) test", "[Measures]", SimTypes) { @@ -672,6 +679,38 @@ TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian({TensorProd, Hermitian}[])) test", " CHECK(sim->Expval(hhtp) == Approx(1.2).margin(1e-5)); } +TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian({TensorProd, Hermitian}[])) shots test", "[Measures]", + SimTypes) +{ + std::unique_ptr sim = std::make_unique(); + + // state-vector with #qubits = n + constexpr size_t n = 4; + std::vector Qs; + Qs.reserve(n); + for (size_t i = 0; i < n; i++) { + Qs.push_back(sim->AllocateQubit()); + } + + sim->NamedOperation("PauliX", {}, {Qs[0]}, false); + sim->NamedOperation("PauliY", {}, {Qs[1]}, false); + sim->NamedOperation("Hadamard", {}, {Qs[2]}, false); + sim->NamedOperation("PauliZ", {}, {Qs[3]}, false); + + ObsIdType px = sim->Observable(ObsId::PauliX, {}, {Qs[2]}); + ObsIdType pz = sim->Observable(ObsId::PauliZ, {}, {Qs[1]}); + ObsIdType tp = sim->TensorObservable({px, pz}); + + std::vector> mat2{{1.0, 0.0}, {-1.0, 0.0}, {-1.0, 0.0}, {3.0, 0.0}}; + ObsIdType h = sim->Observable(ObsId::Hermitian, mat2, {Qs[0]}); + ObsIdType hhtp = sim->HamiltonianObservable({0.5, 0.3}, {h, tp}); + + constexpr size_t num_shots = 10000; + sim->SetDeviceShots(num_shots); + + CHECK(sim->Expval(hhtp) == Approx(1.2).margin(5e-2)); +} + TEMPLATE_LIST_TEST_CASE("Expval(Hamiltonian({Hamiltonian, Hermitian}[])) test", "[Measures]", SimTypes) { @@ -805,6 +844,31 @@ TEMPLATE_LIST_TEST_CASE("Var(HermitianObs) test", "[Measures]", SimTypes) CHECK(sim->Var(h2) == Approx(1.0).margin(1e-5)); } +TEMPLATE_LIST_TEST_CASE("Var(HermitianObs) shots test", "[Measures]", SimTypes) +{ + std::unique_ptr sim = std::make_unique(); + + // state-vector with #qubits = n + constexpr size_t n = 2; + std::vector Qs; + Qs.reserve(n); + for (size_t i = 0; i < n; i++) { + Qs.push_back(sim->AllocateQubit()); + } + + sim->NamedOperation("Hadamard", {}, {Qs[0]}, false); + sim->NamedOperation("PauliY", {}, {Qs[1]}, false); + + std::vector> mat2{{1.0, 0.0}, {0.0, 0.0}, {0.0, 0.0}, {-1.0, 0.0}}; + + ObsIdType h2 = sim->Observable(ObsId::Hermitian, mat2, {Qs[0]}); + + constexpr size_t num_shots = 10000; + sim->SetDeviceShots(num_shots); + + CHECK(sim->Var(h2) == Approx(1.0).margin(5e-2)); +} + TEMPLATE_LIST_TEST_CASE("Var(TensorProd(NamedObs)) test", "[Measures]", SimTypes) { std::unique_ptr sim = std::make_unique(); @@ -917,6 +981,29 @@ TEMPLATE_LIST_TEST_CASE("Var(TensorProd(HermitianObs)) test", "[Measures]", SimT CHECK(sim->Var(tph2) == Approx(1.0).margin(1e-5)); } +TEMPLATE_LIST_TEST_CASE("Var(TensorProd(HermitianObs)) shot test", "[Measures]", SimTypes) +{ + std::unique_ptr sim = std::make_unique(); + + // state-vector with #qubits = n + constexpr size_t n = 2; + std::vector Qs; + Qs.reserve(n); + for (size_t i = 0; i < n; i++) { + Qs.push_back(sim->AllocateQubit()); + } + + sim->NamedOperation("Hadamard", {}, {Qs[0]}, false); + sim->NamedOperation("PauliY", {}, {Qs[1]}, false); + + std::vector> mat2{{1.0, 0.0}, {0.0, 0.0}, {0.0, 0.0}, {-1.0, 0.0}}; + + ObsIdType h2 = sim->Observable(ObsId::Hermitian, mat2, {Qs[0]}); + ObsIdType tph2 = sim->TensorObservable({h2}); + + CHECK(sim->Var(tph2) == Approx(1.0).margin(5e-2)); +} + TEMPLATE_LIST_TEST_CASE("Var(TensorProd(HermitianObs[])) test", "[Measures]", SimTypes) { std::unique_ptr sim = std::make_unique(); From 043bd0a2e03133d33f41432ecd0d161c4a95e26b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 10 Jan 2024 15:14:23 -0500 Subject: [PATCH 002/120] add lapack installation in ci --- .github/workflows/check-pl-compat.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-pl-compat.yaml b/.github/workflows/check-pl-compat.yaml index 7101cdc3e8..58cd171a01 100644 --- a/.github/workflows/check-pl-compat.yaml +++ b/.github/workflows/check-pl-compat.yaml @@ -38,7 +38,7 @@ jobs: - name: Install deps run: | - sudo apt-get install -y cmake ninja-build ccache libomp-dev libasan6 + sudo apt-get install -y cmake ninja-build ccache libomp-dev liblapack-dev libasan6 python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} python3 -m pip install -r requirements.txt pip install amazon-braket-pennylane-plugin From 19b7976752c84998194082d3cb8cb2d29914ed3a Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 10 Jan 2024 15:25:05 -0500 Subject: [PATCH 003/120] update README.rst --- runtime/README.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/README.rst b/runtime/README.rst index f79d10cf56..1eb911fd28 100644 --- a/runtime/README.rst +++ b/runtime/README.rst @@ -70,16 +70,16 @@ The following table shows the available devices along with supported features: - ``Identity``, ``PauliX``, ``PauliY``, ``PauliZ``, ``Hadamard``, ``Hermitian``, ``Hamiltonian``, and Tensor Product of Observables - ``Identity``, ``PauliX``, ``PauliY``, ``PauliZ``, ``Hadamard``, ``Hermitian``, and Tensor Product of Observables * - Expectation Value - - All observables; Finite-shots supported except for ``Hermitian`` - - All observables; Finite-shots supported except for ``Hermitian`` + - All observables; Finite-shots supported + - All observables; Finite-shots supported - All observables; Finite-shots supported * - Variance - - All observables; Finite-shots supported except for ``Hermitian`` - - All observables; Finite-shots supported except for ``Hermitian`` + - All observables; Finite-shots supported + - All observables; Finite-shots supported - All observables; Finite-shots supported * - Probability - - Only for the computational basis on the supplied qubits; Finite-shots supported except for ``Hermitian`` - - Only for the computational basis on the supplied qubits; Finite-shots supported except for ``Hermitian`` + - Only for the computational basis on the supplied qubits; Finite-shots supported + - Only for the computational basis on the supplied qubits; Finite-shots supported - The computational basis on all active qubits; Finite-shots supported * - Sampling - Only for the computational basis on the supplied qubits From 0025b728646bf14fb48823671997cecf7b267331 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 11 Jan 2024 10:31:42 -0500 Subject: [PATCH 004/120] use latest lightning branch --- doc/changelog.md | 6 ++++++ runtime/lib/backend/lightning/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index 35e69e2c96..9d2c102791 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -4,6 +4,10 @@

Improvements

+* Add Hermitian support for finite-shot measurement statistics (`expval`, `var`, and `probs`) + for `lightning.qubit` and `lightning.kokkos` devices. + [(#451)](https://github.com/PennyLaneAI/catalyst/pull/451) +

Breaking changes

Bug fixes

@@ -12,6 +16,8 @@ This release contains contributions from (in alphabetical order): +Shuli Shu + # Release 0.4.0 diff --git a/runtime/lib/backend/lightning/CMakeLists.txt b/runtime/lib/backend/lightning/CMakeLists.txt index dcc2ebc2f5..337c3464ea 100644 --- a/runtime/lib/backend/lightning/CMakeLists.txt +++ b/runtime/lib/backend/lightning/CMakeLists.txt @@ -19,7 +19,7 @@ FetchContent_Declare( pennylane_lightning GIT_REPOSITORY https://github.com/PennyLaneAI/pennylane-lightning.git #GIT_TAG ${LIGHTNING_GIT_TAG} - GIT_TAG "c46a0de" + GIT_TAG "c9808a7" ) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # build with -fPIC From 4a4ba179c841a5e6afcb1ae93fa4833d0de3698a Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 11 Jan 2024 14:47:47 -0500 Subject: [PATCH 005/120] add frontend test --- .../pytest/test_measurements_shots_results.py | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/frontend/test/pytest/test_measurements_shots_results.py b/frontend/test/pytest/test_measurements_shots_results.py index 9c4f929757..fbcd17ffd2 100644 --- a/frontend/test/pytest/test_measurements_shots_results.py +++ b/frontend/test/pytest/test_measurements_shots_results.py @@ -124,11 +124,13 @@ def circuit(): result = qjit(circuit)() assert np.allclose(result, expected, atol=tol_stochastic, rtol=tol_stochastic) - def test_hermitian(self, backend): + def test_hermitian(self, backend, tol_stochastic): """Test expval Hermitian observables with shots.""" + n_wires = 3 + n_shots = 10000 + dev = qml.device(backend, wires=n_wires, shots=n_shots) - @qjit - @qml.qnode(qml.device(backend, wires=3, shots=10000)) + @qml.qnode(dev) def circuit(x, y): qml.RX(x, wires=0) qml.RX(y, wires=1) @@ -138,11 +140,10 @@ def circuit(x, y): ) return qml.expval(qml.Hermitian(A, wires=2) + qml.PauliX(0) + qml.Hermitian(A, wires=1)) - with pytest.raises( - RuntimeError, - match="Hermitian observables do not support shot measurement", - ): - circuit(np.pi / 4, np.pi / 4) + expected = circuit(np.pi / 4, np.pi / 4) + result = qjit(circuit)(np.pi / 4, np.pi / 4) + + assert np.allclose(result, expected, atol=tol_stochastic, rtol=tol_stochastic) def test_paulix_pauliy(self, backend, tol_stochastic): """Test that a tensor product involving PauliX and PauliY works correctly""" @@ -332,11 +333,13 @@ def circuit(): result = qjit(circuit)() assert np.allclose(result, expected, atol=tol_stochastic, rtol=tol_stochastic) - def test_hermitian_shots(self, backend): + def test_hermitian_shots(self, backend, tol_stochastic): """Test var Hermitian observables with shots.""" + n_wires = 3 + n_shots = 10000 + dev = qml.device(backend, wires=n_wires, shots=n_shots) - @qjit - @qml.qnode(qml.device(backend, wires=3, shots=10000)) + @qml.qnode(dev) def circuit(x, y): qml.RX(x, wires=0) qml.RX(y, wires=1) @@ -346,11 +349,10 @@ def circuit(x, y): ) return qml.var(qml.Hermitian(A, wires=2) + qml.PauliX(0) + qml.Hermitian(A, wires=1)) - with pytest.raises( - RuntimeError, - match="Hermitian observables do not support shot measurement", - ): - circuit(np.pi / 4, np.pi / 4) + expected = circuit(np.pi / 4, np.pi / 4) + result = qjit(circuit)(np.pi / 4, np.pi / 4) + + assert np.allclose(result, expected, atol=tol_stochastic, rtol=tol_stochastic) def test_paulix_pauliy(self, backend, tol_stochastic): """Test that a tensor product involving PauliX and PauliY works correctly""" From 8a7c804c44d65678e5f0929cb677c0ba8bc85662 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 11 Jan 2024 14:58:45 -0500 Subject: [PATCH 006/120] quick fix --- frontend/test/pytest/test_measurements_shots_results.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/test/pytest/test_measurements_shots_results.py b/frontend/test/pytest/test_measurements_shots_results.py index fbcd17ffd2..922547ac36 100644 --- a/frontend/test/pytest/test_measurements_shots_results.py +++ b/frontend/test/pytest/test_measurements_shots_results.py @@ -138,7 +138,7 @@ def circuit(x, y): A = np.array( [[complex(1.0, 0.0), complex(2.0, 0.0)], [complex(2.0, 0.0), complex(1.0, 0.0)]] ) - return qml.expval(qml.Hermitian(A, wires=2) + qml.PauliX(0) + qml.Hermitian(A, wires=1)) + return qml.expval(qml.Hermitian(A, wires=2)) expected = circuit(np.pi / 4, np.pi / 4) result = qjit(circuit)(np.pi / 4, np.pi / 4) @@ -347,7 +347,7 @@ def circuit(x, y): A = np.array( [[complex(1.0, 0.0), complex(2.0, 0.0)], [complex(2.0, 0.0), complex(1.0, 0.0)]] ) - return qml.var(qml.Hermitian(A, wires=2) + qml.PauliX(0) + qml.Hermitian(A, wires=1)) + return qml.var(qml.Hermitian(A, wires=2)) expected = circuit(np.pi / 4, np.pi / 4) result = qjit(circuit)(np.pi / 4, np.pi / 4) From d2a369fab36448b011afaa97fbca1572f6fc2c8c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 12 Jan 2024 13:43:55 -0500 Subject: [PATCH 007/120] test against PL master branch --- runtime/lib/backend/lightning/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runtime/lib/backend/lightning/CMakeLists.txt b/runtime/lib/backend/lightning/CMakeLists.txt index 337c3464ea..3665762d8f 100644 --- a/runtime/lib/backend/lightning/CMakeLists.txt +++ b/runtime/lib/backend/lightning/CMakeLists.txt @@ -18,8 +18,7 @@ set(LIGHTNING_GIT_TAG "master" CACHE STRING "GIT_TAG value to build Lightning") FetchContent_Declare( pennylane_lightning GIT_REPOSITORY https://github.com/PennyLaneAI/pennylane-lightning.git - #GIT_TAG ${LIGHTNING_GIT_TAG} - GIT_TAG "c9808a7" + GIT_TAG ${LIGHTNING_GIT_TAG} ) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # build with -fPIC From 300ff893e3d75758a2fb08f48ef8ed5f81099a36 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 16 Jan 2024 10:21:54 -0500 Subject: [PATCH 008/120] test against master --- runtime/Makefile | 3 ++- runtime/lib/backend/lightning/CMakeLists.txt | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/runtime/Makefile b/runtime/Makefile index 4c52dea67d..d4e2102162 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,8 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=OFF ENABLE_OPENQASM?=OFF ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="v0.34.0" +ENABLE_LAPACK?=ON +LIGHTNING_GIT_TAG_VALUE?="master" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") ifeq ($(shell uname), Darwin) diff --git a/runtime/lib/backend/lightning/CMakeLists.txt b/runtime/lib/backend/lightning/CMakeLists.txt index 3665762d8f..731943032d 100644 --- a/runtime/lib/backend/lightning/CMakeLists.txt +++ b/runtime/lib/backend/lightning/CMakeLists.txt @@ -24,14 +24,12 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # build with -fPIC if(ENABLE_LIGHTNING AND ENABLE_LIGHTNING_KOKKOS) set(PL_BACKEND "lightning_qubit;lightning_kokkos" CACHE STRING "PennyLane Lightning backend") - set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") elseif(ENABLE_LIGHTNING) set(PL_BACKEND "lightning_qubit" CACHE STRING "PennyLane Lightning backend") - set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") elseif(ENABLE_LIGHTNING_KOKKOS) set(PL_BACKEND "lightning_kokkos" CACHE STRING "PennyLane Lightning backend") - set(ENABLE_LAPACK "ON" CACHE STRING "Enable Lapack for PennyLane Lightning backend") endif() +set(ENABLE_LAPACK ON CACHE BOOL "Enable LAPACK for PennyLane Lightning backend") set(ENABLE_PYTHON OFF CACHE BOOL "Enable compilation of the Python module") FetchContent_MakeAvailable(pennylane_lightning) From 116b4b30543fb6efc0a8e47bf7d55e37d423150d Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 21 Mar 2024 15:32:09 -0400 Subject: [PATCH 009/120] test with bbee87b Lightning --- runtime/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/runtime/Makefile b/runtime/Makefile index d4e2102162..dbf243b24b 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,8 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=OFF ENABLE_OPENQASM?=OFF ENABLE_ASAN?=OFF -ENABLE_LAPACK?=ON -LIGHTNING_GIT_TAG_VALUE?="master" +LIGHTNING_GIT_TAG_VALUE?="bbee87b" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") ifeq ($(shell uname), Darwin) From 9db1bc1d4ad57893f2c98fb4360c1adf47217aec Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 21 Mar 2024 19:45:43 -0400 Subject: [PATCH 010/120] update lightnng testing commit --- runtime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/Makefile b/runtime/Makefile index be4d3e1008..489a3be6cb 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="bbee87b" +LIGHTNING_GIT_TAG_VALUE?="c9fba49" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From e4426cd24eee369334328f9134dff85887c93598 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 21 Mar 2024 20:17:48 -0400 Subject: [PATCH 011/120] wheel built with c9fba49 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/lib/backend/lightning/CMakeLists.txt | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index ab9ca48df7..be8f5060c2 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="v0.35.0" \ + -DLIGHTNING_GIT_TAG="c9fba49" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 4bdb6b5fe9..e512e2402c 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="v0.35.0" \ + -DLIGHTNING_GIT_TAG="c9fba49" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index b9e58cdf08..480355e833 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="v0.35.0" \ + -DLIGHTNING_GIT_TAG="c9fba49" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/lib/backend/lightning/CMakeLists.txt b/runtime/lib/backend/lightning/CMakeLists.txt index 731943032d..4aee24fddd 100644 --- a/runtime/lib/backend/lightning/CMakeLists.txt +++ b/runtime/lib/backend/lightning/CMakeLists.txt @@ -29,7 +29,6 @@ elseif(ENABLE_LIGHTNING) elseif(ENABLE_LIGHTNING_KOKKOS) set(PL_BACKEND "lightning_kokkos" CACHE STRING "PennyLane Lightning backend") endif() -set(ENABLE_LAPACK ON CACHE BOOL "Enable LAPACK for PennyLane Lightning backend") set(ENABLE_PYTHON OFF CACHE BOOL "Enable compilation of the Python module") FetchContent_MakeAvailable(pennylane_lightning) From 009044281806c387e4aeaf13fe841fde645d7055 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 22 Mar 2024 23:11:03 -0400 Subject: [PATCH 012/120] test against 18231b5 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index be8f5060c2..3902e1bed7 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="c9fba49" \ + -DLIGHTNING_GIT_TAG="18231b5" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index e512e2402c..842dea832e 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="c9fba49" \ + -DLIGHTNING_GIT_TAG="18231b5" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 480355e833..a36e6df443 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="c9fba49" \ + -DLIGHTNING_GIT_TAG="18231b5" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 489a3be6cb..668d3dddb5 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="c9fba49" +LIGHTNING_GIT_TAG_VALUE?="18231b5" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From d83f283158c88be2c0c608142cf1ee03c0ca9969 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 22 Mar 2024 23:41:12 -0400 Subject: [PATCH 013/120] test against 18231b5 --- .github/workflows/build-wheel-linux-x86_64.yaml | 17 ++++++++++++++++- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3902e1bed7..d6aaa3862b 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -43,6 +43,11 @@ jobs: if: needs.check_if_wheel_build_required.outputs.build-wheels == 'true' steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -219,6 +224,11 @@ jobs: container: ${{ matrix.container_img }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -291,7 +301,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="18231b5" \ + -DLIGHTNING_GIT_TAG="8fa1367" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ @@ -357,6 +367,11 @@ jobs: runs-on: ${{ matrix.os }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 842dea832e..9220095f76 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="18231b5" \ + -DLIGHTNING_GIT_TAG="8fa1367" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index a36e6df443..1f5189f928 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="18231b5" \ + -DLIGHTNING_GIT_TAG="8fa1367" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 668d3dddb5..7fa78e7209 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="18231b5" +LIGHTNING_GIT_TAG_VALUE?="8fa1367" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 93b6054e4adc1a2f56ce18a08413418a7bf29d44 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 22 Mar 2024 23:42:19 -0400 Subject: [PATCH 014/120] test with 8fa1367 From 89da0eebed8b96f140820d2dce310a3792c9692b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 09:05:01 -0400 Subject: [PATCH 015/120] test against bec4b4e --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index d6aaa3862b..5971bc155f 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -301,7 +301,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="8fa1367" \ + -DLIGHTNING_GIT_TAG="bec4b4e" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 9220095f76..6b367c52a9 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="8fa1367" \ + -DLIGHTNING_GIT_TAG="bec4b4e" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 1f5189f928..f560f4567d 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="8fa1367" \ + -DLIGHTNING_GIT_TAG="bec4b4e" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 7fa78e7209..2ffc9d5783 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="8fa1367" +LIGHTNING_GIT_TAG_VALUE?="bec4b4e" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 819e8896e07b00ea05c9af0f9e0a7aef83d79c91 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 09:16:59 -0400 Subject: [PATCH 016/120] update workflow with py env and preinstalled scipy --- .github/workflows/check-catalyst.yaml | 53 +++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 4eb14a2ad6..811e72d6e5 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -26,6 +26,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -33,6 +38,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install ninja-build make cmake clang libomp-dev + python -m pip install scipy - name: Build Catalyst-Runtime run: | @@ -71,6 +77,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -132,6 +143,11 @@ jobs: steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 + + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' - name: Cache MHLO Source id: cache-mhlo-source @@ -200,6 +216,12 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -270,6 +292,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -278,7 +305,7 @@ jobs: sudo apt-get update sudo apt-get install -y python3 python3-pip cmake ninja-build ccache clang lld python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 + python3 -m pip install numpy pybind11 scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -372,6 +399,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -445,6 +477,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -455,7 +492,7 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y python3 python3-pip libomp-dev libasan6 make + sudo apt-get install -y libomp-dev libasan6 make python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} python3 -m pip install -r requirements.txt make frontend @@ -499,13 +536,18 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y python3 python3-pip libomp-dev libasan6 make + sudo apt-get install -y libomp-dev libasan6 make python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} python3 -m pip install -r requirements.txt make frontend @@ -558,6 +600,10 @@ jobs: steps: # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' - name: Checkout the repo uses: actions/checkout@v3 @@ -566,6 +612,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan5 + python -m pip install scipy - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} From 35b553381e8de07060c62b4570185103122ae0b7 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 10:37:45 -0400 Subject: [PATCH 017/120] update yml work flow --- .../workflows/build-wheel-linux-x86_64.yaml | 23 ++++--------------- .../workflows/build-wheel-macos-arm64.yaml | 6 ++--- .../workflows/build-wheel-macos-x86_64.yaml | 4 ++-- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 5971bc155f..1398dc71a1 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -43,11 +43,6 @@ jobs: if: needs.check_if_wheel_build_required.outputs.build-wheels == 'true' steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -141,7 +136,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML + python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML scipy # Required for MHLO and building MLIR with protected symbols. # (Don't forget to add the build directory to PATH in subsequent steps, so @@ -224,11 +219,6 @@ jobs: container: ${{ matrix.container_img }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -240,7 +230,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML + python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -366,12 +356,7 @@ jobs: name: Test Wheels (Python ${{ matrix.python_version }}) on ${{ matrix.os }} runs-on: ${{ matrix.os }} - steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - + steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -388,7 +373,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist + python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy - name: Install PennyLane Plugins run: | diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 6b367c52a9..56f462502f 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -153,7 +153,7 @@ jobs: key: ${{ runner.os }}-${{ runner.arch }}-enzyme-${{ needs.constants.outputs.llvm_version }}-${{ needs.constants.outputs.enzyme_version }}-generic-build - name: Install Dependencies (Python) - run: python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja + run: python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja scipy - name: Build LLVM / MLIR if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -227,7 +227,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja delocate + python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja delocate scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -382,7 +382,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist + python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy - name: Install PennyLane Plugins run: | diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index f560f4567d..456e92df10 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -199,7 +199,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja delocate + python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML cmake ninja delocate scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -352,7 +352,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist + python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy - name: Install PennyLane Plugins run: | From a91c893f0957de76f06abf3afa29aa49e9fdf706 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 10:38:50 -0400 Subject: [PATCH 018/120] update check-catalyst --- .github/workflows/check-catalyst.yaml | 51 ++------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 811e72d6e5..18e00b0402 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -26,11 +26,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -38,7 +33,6 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - python -m pip install scipy - name: Build Catalyst-Runtime run: | @@ -77,11 +71,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -117,7 +106,7 @@ jobs: sudo apt-get update sudo apt-get install -y python3 python3-pip cmake ninja-build clang lld python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 + python3 -m pip install numpy pybind11 scipy - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -143,12 +132,7 @@ jobs: steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 - - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - + - name: Cache MHLO Source id: cache-mhlo-source uses: actions/cache@v3 @@ -216,12 +200,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -292,11 +270,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -399,11 +372,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -477,11 +445,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -536,11 +499,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -600,11 +558,6 @@ jobs: steps: # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout the repo uses: actions/checkout@v3 From a868802e7bec39ab36f8eb502640db495d45ab95 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 10:41:20 -0400 Subject: [PATCH 019/120] revert changes in catalyst --- .github/workflows/check-catalyst.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 18e00b0402..8433f524a5 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -455,7 +455,7 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make + 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 make frontend @@ -505,7 +505,7 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make + 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 make frontend @@ -565,7 +565,6 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan5 - python -m pip install scipy - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} From ed64d036dff0b7a7125d58f383a3b4bfaec28190 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 10:52:51 -0400 Subject: [PATCH 020/120] add scipy to build depencies --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7f5370df15..ab8566ed4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ pip>=22.3 # Due to a bug in `pip install -e .` vs read-only system-wide site-pac numpy pybind11>=2.8.0 PyYAML +scipy # formatting/linting black From 446702416847826482a6d38fd9cbb58c17bfe6e2 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 11:08:17 -0400 Subject: [PATCH 021/120] test against 3f9b6a5 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 1398dc71a1..9ca894fa58 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="bec4b4e" \ + -DLIGHTNING_GIT_TAG="3f9b6a5" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 56f462502f..db531ff695 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="bec4b4e" \ + -DLIGHTNING_GIT_TAG="3f9b6a5" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 456e92df10..91196ae189 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="bec4b4e" \ + -DLIGHTNING_GIT_TAG="3f9b6a5" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 2ffc9d5783..ad7ddde458 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="bec4b4e" +LIGHTNING_GIT_TAG_VALUE?="3f9b6a5" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 4cff4fe05d808c26983fc75f62da173a05da3dde Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 11:16:27 -0400 Subject: [PATCH 022/120] install scipy for lightning backend cpp test --- .github/workflows/check-catalyst.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 8433f524a5..24c006da36 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -571,6 +571,11 @@ jobs: run: | pip install numpy amazon-braket-sdk echo "AWS_DEFAULT_REGION=us-east-1" >> $GITHUB_ENV + + - name: Install additional dependencies (lightning device) + if: ${{ matrix.backend != 'openqasm' }} + run: | + pip install scipy - name: Build Runtime test suite for Lightning simulator if: ${{ matrix.backend == 'lightning' }} From 6999037411538990af4f3620a0f13277a5bdae7b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 12:03:27 -0400 Subject: [PATCH 023/120] test against f71de3b --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 9ca894fa58..1d51ea0ce9 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="3f9b6a5" \ + -DLIGHTNING_GIT_TAG="f71de3b" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index db531ff695..a41698bc16 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="3f9b6a5" \ + -DLIGHTNING_GIT_TAG="f71de3b" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 91196ae189..1a382f0f29 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="3f9b6a5" \ + -DLIGHTNING_GIT_TAG="f71de3b" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index ad7ddde458..351db6cfac 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="3f9b6a5" +LIGHTNING_GIT_TAG_VALUE?="f71de3b" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From a8ac1bde2b2cb2f4e33805c1c0eb8e584646247b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 12:07:41 -0400 Subject: [PATCH 024/120] add scipy install for Catalyst-Runtime Build --- .github/workflows/check-catalyst.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 24c006da36..81714b4e7e 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -32,7 +32,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install ninja-build make cmake clang libomp-dev + sudo apt-get -y -q install ninja-build make cmake clang libomp-dev python3 python3-pip + python3 -m pip install scipy - name: Build Catalyst-Runtime run: | From 6fbf6e63a4084f82b8a5f5242dc5bea9aa581c03 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 12:14:04 -0400 Subject: [PATCH 025/120] install scipy for Runtime Code Coverage --- .github/workflows/check-catalyst.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 81714b4e7e..1938b0c51b 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -630,7 +630,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov + sudo apt-get -y -q install cmake ninja-build libomp-dev lcov python3 python3-pip + python3 -m pip install scipy - name: Build Runtime test suite for Lightning simulator run: | From 89ab8735b3666efdda52c7669236b3bc986b999f Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 23 Mar 2024 13:10:36 -0400 Subject: [PATCH 026/120] test against 8c1d354 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 1d51ea0ce9..20b5e52c42 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="f71de3b" \ + -DLIGHTNING_GIT_TAG="8c1d354" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index a41698bc16..14f076f960 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="f71de3b" \ + -DLIGHTNING_GIT_TAG="8c1d354" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 1a382f0f29..2c54ea2767 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="f71de3b" \ + -DLIGHTNING_GIT_TAG="8c1d354" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 351db6cfac..715ae9432d 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="f71de3b" +LIGHTNING_GIT_TAG_VALUE?="8c1d354" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 7c97813d74d31bf781762b275bcf0028b5a9345c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 19:45:22 -0400 Subject: [PATCH 027/120] test against 57be532 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 20b5e52c42..804d57c804 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="8c1d354" \ + -DLIGHTNING_GIT_TAG="57be532" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 14f076f960..3b8108a3e6 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="8c1d354" \ + -DLIGHTNING_GIT_TAG="57be532" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 2c54ea2767..8230de7354 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="8c1d354" \ + -DLIGHTNING_GIT_TAG="57be532" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 715ae9432d..a9e5f3b97a 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="8c1d354" +LIGHTNING_GIT_TAG_VALUE?="57be532" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 11326af90d76d1230799ad7e048c31bba3f93f84 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 19:58:18 -0400 Subject: [PATCH 028/120] add venv for ci --- .github/workflows/check-catalyst.yaml | 43 +++++++++++++++++++-------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 1938b0c51b..4c8a9dde13 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -26,14 +26,19 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install ninja-build make cmake clang libomp-dev python3 python3-pip - python3 -m pip install scipy + sudo apt-get -y -q install ninja-build make cmake clang libomp-dev + python -m pip install scipy - name: Build Catalyst-Runtime run: | @@ -107,7 +112,7 @@ jobs: sudo apt-get update sudo apt-get install -y python3 python3-pip cmake ninja-build clang lld python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 scipy + python3 -m pip install numpy pybind11 - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -279,7 +284,7 @@ jobs: sudo apt-get update sudo apt-get install -y python3 python3-pip cmake ninja-build ccache clang lld python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 scipy + python3 -m pip install numpy pybind11 - name: Get Cached LLVM Source id: cache-llvm-source @@ -373,20 +378,25 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install Deps run: | sudo apt-get update - 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 + sudo apt-get install -y libomp-dev libasan6 make + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python3 -m pip install cuda-quantum==0.6.0 - python3 -m pip install oqc-qcaas-client + python -m pip install cuda-quantum==0.6.0 + python -m pip install oqc-qcaas-client make frontend - name: Get Cached LLVM Build @@ -446,6 +456,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -456,9 +471,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - 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 + sudo apt-get install -y libomp-dev libasan6 make + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt make frontend - name: Get Cached LLVM Build @@ -557,6 +572,10 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 - name: Checkout the repo From c8ded02fb5c4e00bcc240044875c124666bdfdd1 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:01:24 -0400 Subject: [PATCH 029/120] fix typo check-catalyst --- .github/workflows/check-catalyst.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 4c8a9dde13..432b42a5ad 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -379,9 +379,9 @@ jobs: steps: - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' + name: Install Python + with: + python-version: '3.9' - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -457,9 +457,9 @@ jobs: steps: - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' + name: Install Python + with: + python-version: '3.9' - name: Checkout Catalyst repo uses: actions/checkout@v3 From c365730b4b51db202d1d8801beeb7c322ffdc4b5 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:07:51 -0400 Subject: [PATCH 030/120] add virtual env for Runtime Code Coverage --- .github/workflows/check-catalyst.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 432b42a5ad..8153efe07f 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -643,14 +643,19 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout the repo uses: actions/checkout@v3 - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov python3 python3-pip - python3 -m pip install scipy + sudo apt-get -y -q install cmake ninja-build libomp-dev lcov + python -m pip install scipy - name: Build Runtime test suite for Lightning simulator run: | From a68789301cb4221724c48f1d36fbb7a4664d45ed Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:17:23 -0400 Subject: [PATCH 031/120] remove virtual env for frontend test --- .github/workflows/check-catalyst.yaml | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 8153efe07f..9fd7d0e425 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -378,25 +378,20 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install -r requirements.txt + 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 scipy # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python -m pip install cuda-quantum==0.6.0 - python -m pip install oqc-qcaas-client + python3 -m pip install cuda-quantum==0.6.0 + python3 -m pip install oqc-qcaas-client make frontend - name: Get Cached LLVM Build @@ -455,12 +450,6 @@ jobs: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} - steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -471,9 +460,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install -r requirements.txt + 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 scipy make frontend - name: Get Cached LLVM Build From 4891bc508064c4c032bb4956bf52c9ac31c0b0a2 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:23:12 -0400 Subject: [PATCH 032/120] frontend test only From bd305d99006b021387f7ecf217c2e64c13e1b4e8 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:25:38 -0400 Subject: [PATCH 033/120] frontend test only From 14fd068a77b5264af1a804e364f6cf2bf7dda53e Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:26:18 -0400 Subject: [PATCH 034/120] frontend test only From d1343ac4520b1f448597306decbdd97f37d4f934 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 26 Mar 2024 20:46:20 -0400 Subject: [PATCH 035/120] Trigger CI From 68d52e2a1f118c5a914c032ffb29b5eec81b9a38 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 07:29:02 -0400 Subject: [PATCH 036/120] test linux wheels build --- .../workflows/build-wheel-linux-x86_64.yaml | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 804d57c804..3dc506ba0c 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -219,6 +219,11 @@ jobs: container: ${{ matrix.container_img }} steps: + - name: Set up Python ${{ matrix.python_version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python_version }} + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -230,7 +235,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML scipy + python -m pip install wheel numpy pybind11 PyYAML scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -288,8 +293,8 @@ jobs: cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -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())") \ + -DPYTHON_EXECUTABLE=$(which python \ + -Dpybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG="57be532" \ -DKokkos_ENABLE_SERIAL=ON \ @@ -309,8 +314,8 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DQUANTUM_ENABLE_BINDINGS_PYTHON=ON \ - -DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \ - -DPython3_NumPy_INCLUDE_DIRS=$(python${{ matrix.python_version }} -c "import numpy as np; print(np.get_include())") \ + -DPython3_EXECUTABLE=$(which python) \ + -DPython3_NumPy_INCLUDE_DIRS=$(python} -c "import numpy as np; print(np.get_include())") \ -DMLIR_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/mlir \ -DMHLO_DIR=$GITHUB_WORKSPACE/mhlo-build/lib/cmake/mlir-hlo \ -DMHLO_BINARY_DIR=$GITHUB_WORKSPACE/mhlo-build/bin \ @@ -356,7 +361,12 @@ jobs: name: Test Wheels (Python ${{ matrix.python_version }}) on ${{ matrix.os }} runs-on: ${{ matrix.os }} - steps: + steps: + - name: Set up Python ${{ matrix.python_version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python_version }} + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -366,27 +376,22 @@ jobs: name: catalyst-manylinux2014_x86_64-wheel-py-${{ matrix.python_version }}.zip path: dist - - name: Set up Python ${{ matrix.python_version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python_version }} - - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy + python -m pip install pytest pytest-xdist scipy - name: Install PennyLane Plugins run: | - python${{ matrix.python_version }} -m pip install PennyLane-Lightning-Kokkos - python${{ matrix.python_version }} -m pip install amazon-braket-pennylane-plugin "boto3==1.26" + python -m pip install PennyLane-Lightning-Kokkos + python -m pip install amazon-braket-pennylane-plugin "boto3==1.26" - name: Install Catalyst run: | - python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple + python -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple - name: Run Python Pytest Tests run: | - python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest -n auto - python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --backend="lightning.kokkos" -n auto - python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/async_tests - python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --runbraket=LOCAL -n auto + python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest -n auto + python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --backend="lightning.kokkos" -n auto + python -m pytest $GITHUB_WORKSPACE/frontend/test/async_tests + python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --runbraket=LOCAL -n auto From 0b6b438027ccab534c83e116bc673f421494dd90 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 07:32:48 -0400 Subject: [PATCH 037/120] test 3.9 for debug --- .github/workflows/constants.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/constants.yaml b/.github/workflows/constants.yaml index 9fb8eb02a6..f8a52a30f4 100644 --- a/.github/workflows/constants.yaml +++ b/.github/workflows/constants.yaml @@ -70,7 +70,8 @@ jobs: - name: Python versions id: python_versions run: | - echo 'python_versions=["3.9", "3.10", "3.11", "3.12"]' >> $GITHUB_OUTPUT +#echo 'python_versions=["3.9", "3.10", "3.11", "3.12"]' >> $GITHUB_OUTPUT + echo 'python_versions=["3.9"]' >> $GITHUB_OUTPUT - name: Primary Python version id: primary_python_version From f1bb78df17ec89ebc627b1c615dfb13474961eac Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 07:33:57 -0400 Subject: [PATCH 038/120] update --- .github/workflows/constants.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/constants.yaml b/.github/workflows/constants.yaml index f8a52a30f4..22835fe07a 100644 --- a/.github/workflows/constants.yaml +++ b/.github/workflows/constants.yaml @@ -70,7 +70,6 @@ jobs: - name: Python versions id: python_versions run: | -#echo 'python_versions=["3.9", "3.10", "3.11", "3.12"]' >> $GITHUB_OUTPUT echo 'python_versions=["3.9"]' >> $GITHUB_OUTPUT - name: Primary Python version From 1ff7f1e8b7db353b441b0bc7e321403173e4c4b7 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 13:47:17 -0400 Subject: [PATCH 039/120] test against 97830a3 --- .github/workflows/build-wheel-linux-x86_64.yaml | 6 +++--- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3dc506ba0c..4c04ce5565 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -293,10 +293,10 @@ jobs: cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ - -DPYTHON_EXECUTABLE=$(which python \ + -DPYTHON_EXECUTABLE=$(which python) \ -Dpybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG="57be532" \ + -DLIGHTNING_GIT_TAG="97830a3" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ @@ -315,7 +315,7 @@ jobs: -DLLVM_ENABLE_ASSERTIONS=ON \ -DQUANTUM_ENABLE_BINDINGS_PYTHON=ON \ -DPython3_EXECUTABLE=$(which python) \ - -DPython3_NumPy_INCLUDE_DIRS=$(python} -c "import numpy as np; print(np.get_include())") \ + -DPython3_NumPy_INCLUDE_DIRS=$(python -c "import numpy as np; print(np.get_include())") \ -DMLIR_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/mlir \ -DMHLO_DIR=$GITHUB_WORKSPACE/mhlo-build/lib/cmake/mlir-hlo \ -DMHLO_BINARY_DIR=$GITHUB_WORKSPACE/mhlo-build/bin \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 3b8108a3e6..aa72e19113 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="57be532" \ + -DLIGHTNING_GIT_TAG="97830a3" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 8230de7354..0b2354222d 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="57be532" \ + -DLIGHTNING_GIT_TAG="97830a3" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index a9e5f3b97a..7909be41ce 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="57be532" +LIGHTNING_GIT_TAG_VALUE?="97830a3" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From c71e26d9797ccaa9ebe8d1a3f815168096a131fb Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 13:54:41 -0400 Subject: [PATCH 040/120] revert changes in linux wheels build --- .../workflows/build-wheel-linux-x86_64.yaml | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 4c04ce5565..15b36fb1ae 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -219,11 +219,6 @@ jobs: container: ${{ matrix.container_img }} steps: - - name: Set up Python ${{ matrix.python_version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python_version }} - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -235,7 +230,7 @@ jobs: - name: Install Dependencies (Python) run: | - python -m pip install wheel numpy pybind11 PyYAML scipy + python${{ matrix.python_version }} -m pip install wheel numpy pybind11 PyYAML scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -293,8 +288,8 @@ jobs: cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ - -DPYTHON_EXECUTABLE=$(which python) \ - -Dpybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())") \ + -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="97830a3" \ -DKokkos_ENABLE_SERIAL=ON \ @@ -314,8 +309,8 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DQUANTUM_ENABLE_BINDINGS_PYTHON=ON \ - -DPython3_EXECUTABLE=$(which python) \ - -DPython3_NumPy_INCLUDE_DIRS=$(python -c "import numpy as np; print(np.get_include())") \ + -DPython3_EXECUTABLE=$(which python${{ matrix.python_version }}) \ + -DPython3_NumPy_INCLUDE_DIRS=$(python${{ matrix.python_version }} -c "import numpy as np; print(np.get_include())") \ -DMLIR_DIR=$GITHUB_WORKSPACE/llvm-build/lib/cmake/mlir \ -DMHLO_DIR=$GITHUB_WORKSPACE/mhlo-build/lib/cmake/mlir-hlo \ -DMHLO_BINARY_DIR=$GITHUB_WORKSPACE/mhlo-build/bin \ @@ -378,20 +373,20 @@ jobs: - name: Install Python dependencies run: | - python -m pip install pytest pytest-xdist scipy + python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy - name: Install PennyLane Plugins run: | - python -m pip install PennyLane-Lightning-Kokkos - python -m pip install amazon-braket-pennylane-plugin "boto3==1.26" + python${{ matrix.python_version }} -m pip install PennyLane-Lightning-Kokkos + python${{ matrix.python_version }} -m pip install amazon-braket-pennylane-plugin "boto3==1.26" - name: Install Catalyst run: | - python -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple + python${{ matrix.python_version }} -m pip install $GITHUB_WORKSPACE/dist/*.whl --extra-index-url https://test.pypi.org/simple - name: Run Python Pytest Tests run: | - python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest -n auto - python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --backend="lightning.kokkos" -n auto - python -m pytest $GITHUB_WORKSPACE/frontend/test/async_tests - python -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --runbraket=LOCAL -n auto + python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest -n auto + python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --backend="lightning.kokkos" -n auto + python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/async_tests + python${{ matrix.python_version }} -m pytest $GITHUB_WORKSPACE/frontend/test/pytest --runbraket=LOCAL -n auto From 4287394a1f0b6f5d56e5ec3f7613f1e9cf23f693 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 14:23:47 -0400 Subject: [PATCH 041/120] test against a0db3f0 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 15b36fb1ae..3f4d8e996f 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="97830a3" \ + -DLIGHTNING_GIT_TAG="a0db3f0" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index aa72e19113..dd72c1f6b3 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="97830a3" \ + -DLIGHTNING_GIT_TAG="a0db3f0" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 0b2354222d..d56f4cdafc 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="97830a3" \ + -DLIGHTNING_GIT_TAG="a0db3f0" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 7909be41ce..c4a8bf9ad5 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="97830a3" +LIGHTNING_GIT_TAG_VALUE?="a0db3f0" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From a1bcef8a7e15a512753517dbe2d857238c248fd3 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 14:55:44 -0400 Subject: [PATCH 042/120] add python3.10-12 test --- .github/workflows/constants.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/constants.yaml b/.github/workflows/constants.yaml index 22835fe07a..9fb8eb02a6 100644 --- a/.github/workflows/constants.yaml +++ b/.github/workflows/constants.yaml @@ -70,7 +70,7 @@ jobs: - name: Python versions id: python_versions run: | - echo 'python_versions=["3.9"]' >> $GITHUB_OUTPUT + echo 'python_versions=["3.9", "3.10", "3.11", "3.12"]' >> $GITHUB_OUTPUT - name: Primary Python version id: primary_python_version From 279e9013bcfb3a72441b50b605f3204c3eb637ba Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 15:54:37 -0400 Subject: [PATCH 043/120] fix check-catalyst yaml --- .github/workflows/check-catalyst.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 9fd7d0e425..0e222d5841 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -449,7 +449,8 @@ jobs: strategy: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} - + + steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 From c00438bd4faed62a91ad2fde797321cd9022c082 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 16:16:17 -0400 Subject: [PATCH 044/120] use venv to install scipy --- .github/workflows/check-catalyst.yaml | 28 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 0e222d5841..115bf25dc4 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -378,20 +378,24 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install Deps run: | sudo apt-get update - 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 scipy + sudo apt-get install -y libomp-dev libasan6 make + python -m pip install -r requirements.txt scipy # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python3 -m pip install cuda-quantum==0.6.0 - python3 -m pip install oqc-qcaas-client + python -m pip install cuda-quantum==0.6.0 + python -m pip install oqc-qcaas-client make frontend - name: Get Cached LLVM Build @@ -451,6 +455,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -461,9 +470,8 @@ jobs: - name: Install Deps run: | sudo apt-get update - 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 scipy + sudo apt-get install -y libomp-dev libasan6 make + python -m pip install -r requirements.txt scipy make frontend - name: Get Cached LLVM Build @@ -512,8 +520,8 @@ jobs: run: | sudo apt-get update 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 + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt make frontend - name: Get Cached LLVM Build From 8f87ac4daff8d942b89f8c837cca4f33e2e3296b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 16:23:25 -0400 Subject: [PATCH 045/120] fix typo --- .github/workflows/check-catalyst.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 115bf25dc4..3c27a45d2f 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -379,9 +379,9 @@ jobs: steps: - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' + name: Install Python + with: + python-version: '3.9' - name: Checkout Catalyst repo uses: actions/checkout@v3 From 1115b0267d29554d728f7e854b7288b91f393974 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 16:25:04 -0400 Subject: [PATCH 046/120] fix typo --- .github/workflows/check-catalyst.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3c27a45d2f..9eb71a3d77 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -456,9 +456,9 @@ jobs: steps: - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.9' + name: Install Python + with: + python-version: '3.9' - name: Checkout Catalyst repo uses: actions/checkout@v3 From 7444ee40698b88b44e13e50b1120bcda5c80cd39 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 16:53:50 -0400 Subject: [PATCH 047/120] use py3.10 for test --- .github/workflows/check-catalyst.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 9eb71a3d77..5de0a1fa37 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.9' + python-version: '3.10' - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -381,7 +381,7 @@ jobs: - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.9' + python-version: '3.10' - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -458,7 +458,7 @@ jobs: - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.9' + python-version: '3.10' - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -573,7 +573,7 @@ jobs: - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.9' + python-version: '3.10' # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 - name: Checkout the repo @@ -644,7 +644,7 @@ jobs: - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.9' + python-version: '3.10' - name: Checkout the repo uses: actions/checkout@v3 From c3f9b36aa264fc2a6cf38abd95fb6376cf81c602 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 17:11:49 -0400 Subject: [PATCH 048/120] revert changes in Frontend tests gcc workflow --- .github/workflows/check-catalyst.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 5de0a1fa37..80c81bd32a 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -378,24 +378,20 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.10' - - name: Checkout Catalyst repo uses: actions/checkout@v3 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python -m pip install -r requirements.txt scipy + 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 # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python -m pip install cuda-quantum==0.6.0 - python -m pip install oqc-qcaas-client + python3 -m pip install cuda-quantum==0.6.0 + python3 -m pip install oqc-qcaas-client make frontend - name: Get Cached LLVM Build From eb04c77f610a557308a8e0e6de1f8169361e2383 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Wed, 27 Mar 2024 17:21:47 -0400 Subject: [PATCH 049/120] add scipy to gcc frontend tests --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 80c81bd32a..9a8b851ae6 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -390,7 +390,7 @@ jobs: # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python3 -m pip install cuda-quantum==0.6.0 + python3 -m pip install cuda-quantum==0.6.0 scipy python3 -m pip install oqc-qcaas-client make frontend From d53517b45bd671e437e9704a4f173a7a29ac2535 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 28 Mar 2024 11:36:56 -0400 Subject: [PATCH 050/120] test for lightning frontend --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5dd8a78c7a..47afee1639 100644 --- a/Makefile +++ b/Makefile @@ -205,6 +205,7 @@ coverage: coverage-frontend coverage-runtime coverage-frontend: @echo "Generating coverage report for the frontend" + $(ASAN_COMMAND) $(PYTHON) -m pip install scipy $(ASAN_COMMAND) $(PYTHON) -m pytest frontend/test/pytest $(PARALLELIZE) --cov=catalyst --tb=native --cov-report=$(COVERAGE_REPORT) $(ASAN_COMMAND) $(PYTHON) -m pytest frontend/catalyst/oqc/test/ $(PARALLELIZE) --cov=catalyst --cov-append --tb=native --cov-report=$(COVERAGE_REPORT) ifeq ($(TEST_BRAKET), NONE) From a32ccdfbe0ea50e4661a049f7d3788fee8ddc8d3 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 1 Apr 2024 08:09:06 -0400 Subject: [PATCH 051/120] target at 5bcae01 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3f4d8e996f..4e60f522f5 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -291,7 +291,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="a0db3f0" \ + -DLIGHTNING_GIT_TAG="5bcae01" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index dd72c1f6b3..1b2918f588 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -288,7 +288,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="a0db3f0" \ + -DLIGHTNING_GIT_TAG="5bcae01" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index d56f4cdafc..26b1771f7e 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -260,7 +260,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="a0db3f0" \ + -DLIGHTNING_GIT_TAG="5bcae01" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index c4a8bf9ad5..1e1a7f53d9 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="a0db3f0" +LIGHTNING_GIT_TAG_VALUE?="5bcae01" NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 2abcd3d72041be92afa7be69f70f7aa4a93da294 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 1 Apr 2024 09:48:00 -0400 Subject: [PATCH 052/120] install scipy with python in virtual env --- .github/workflows/check-catalyst.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 9a8b851ae6..3a6d39a804 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -390,8 +390,9 @@ jobs: # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python3 -m pip install cuda-quantum==0.6.0 scipy + python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client + /opt/hostedtoolcache/Python/3.10.14/python3 -m pip install scipy make frontend - name: Get Cached LLVM Build From 7c5ae4097d0eb6c697f955011ee09622d86194bc Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 1 Apr 2024 09:56:15 -0400 Subject: [PATCH 053/120] fix path --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3a6d39a804..978eccf8b6 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -392,7 +392,7 @@ jobs: # macOS requirements.txt python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client - /opt/hostedtoolcache/Python/3.10.14/python3 -m pip install scipy + /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy make frontend - name: Get Cached LLVM Build From 9bb29e14d2ec49002606b3af905a3dfd2c12b08f Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 1 Apr 2024 10:07:53 -0400 Subject: [PATCH 054/120] force install scipy to default venv --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 978eccf8b6..83f168644c 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -392,7 +392,7 @@ jobs: # macOS requirements.txt python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client - /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy + /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall make frontend - name: Get Cached LLVM Build From 343b2ba384fc39a40f685feaa2d1788da8e13b2e Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:12:03 -0400 Subject: [PATCH 055/120] trigger ci From b4b553acabfa34ceb45c40a01df01a6a79c8ef7f Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 4 Apr 2024 10:59:17 -0400 Subject: [PATCH 056/120] Update lq tags --- .github/workflows/build-wheel-linux-x86_64.yaml | 3 ++- .github/workflows/build-wheel-macos-arm64.yaml | 3 ++- .github/workflows/build-wheel-macos-x86_64.yaml | 3 ++- runtime/Makefile | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 4e60f522f5..74ca33f51c 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -285,13 +285,14 @@ jobs: # Build Catalyst-Runtime - name: Build Catalyst-Runtime run: | + # TODO: Remove tmp tag 'add_dldso' before merge cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -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())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG="5bcae01" \ + -DLIGHTNING_GIT_TAG="add_dldso" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 1b2918f588..8814371652 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -282,13 +282,14 @@ jobs: # Build Catalyst-Runtime - name: Build Catalyst-Runtime run: | + # TODO: Remove tmp tag 'add_dldso' before merge cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -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())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG="5bcae01" \ + -DLIGHTNING_GIT_TAG="add_dldso" \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 26b1771f7e..21e10c0151 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -255,12 +255,13 @@ jobs: - name: Build Catalyst-Runtime run: | # Segfaults in computing Lightning's adjoint-jacobian when building with OMP + # TODO: Remove tmp tag 'add_dldso' before merge cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -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="5bcae01" \ + -DLIGHTNING_GIT_TAG="add_dldso" \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 1e1a7f53d9..168142bf87 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?="5bcae01" +LIGHTNING_GIT_TAG_VALUE?="add_dldso" # TODO: Remove tmp tag 'add_dldso' before merge NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 9d8553014a229e9037879ee7d3834cc0b1545241 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:13:55 -0400 Subject: [PATCH 057/120] Add changelog --- doc/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/changelog.md b/doc/changelog.md index 0bb84e5a6e..4cf9bb6758 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -44,6 +44,10 @@ `DIAGNOSTICS_RESULTS_PATH=/path/to/file.yml`. [(#528)](https://github.com/PennyLaneAI/catalyst/pull/528) +* Catalyst now supports `qml.expval` and `qml.var` of `qml.Hermitian` observables + when finite shots are specified. + [(#451)](https://github.com/PennyLaneAI/catalyst/pull/451) +

Improvements

* An updated quantum device specification format is now supported by Catalyst. The toml schema 2 From 8aa5a04348d8a483e9b4461673b0e83334c66062 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:20:06 -0400 Subject: [PATCH 058/120] Update tests --- .../pytest/test_measurements_shots_results.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/frontend/test/pytest/test_measurements_shots_results.py b/frontend/test/pytest/test_measurements_shots_results.py index 922547ac36..655b1bfdad 100644 --- a/frontend/test/pytest/test_measurements_shots_results.py +++ b/frontend/test/pytest/test_measurements_shots_results.py @@ -474,6 +474,23 @@ def circuit(theta): result = qjit(circuit)(0.432) assert np.allclose(result, expected, atol=tol_stochastic, rtol=tol_stochastic) + # TODO: Support probs with observables + def test_probs_obs(self, backend): + """Test probs with an observable""" + + n_wires = 1 + n_shots = 10000 + dev = qml.device(backend, wires=n_wires, shots=n_shots) + + matrix = 1 / np.sqrt(2) * np.array([[1, 1], [1, -1]]) + + @qml.qnode(dev) + def circuit(theta): + qml.RX(theta, wires=[0]) + return qml.probs(op=qml.Hermitian(matrix, wires=0)) + + with pytest.raises(AssertionError): + qjit(circuit)(0.432) class TestOtherMeasurements: """Test other measurement processes.""" From 934c80b92c11e63132f762fd48bdb7fc3d263ffd Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:29:45 -0400 Subject: [PATCH 059/120] trigger ci --- frontend/test/pytest/test_measurements_shots_results.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/test/pytest/test_measurements_shots_results.py b/frontend/test/pytest/test_measurements_shots_results.py index 655b1bfdad..8838ad7329 100644 --- a/frontend/test/pytest/test_measurements_shots_results.py +++ b/frontend/test/pytest/test_measurements_shots_results.py @@ -492,6 +492,7 @@ def circuit(theta): with pytest.raises(AssertionError): qjit(circuit)(0.432) + class TestOtherMeasurements: """Test other measurement processes.""" From 5c4d9a2e8dd8f90bad1738276069e8e8f5f0c1c6 Mon Sep 17 00:00:00 2001 From: Ali Asadi <10773383+maliasadi@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:47:58 -0400 Subject: [PATCH 060/120] Update check-catalyst --- .github/workflows/check-catalyst.yaml | 39 +++++---------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3498d769f4..bed964f76b 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -26,11 +26,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.10' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -38,7 +33,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - python -m pip install scipy + python3 -m pip install scipy - name: Build Catalyst-Runtime run: | @@ -408,7 +403,7 @@ jobs: # macOS requirements.txt python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client - /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall + # /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall make frontend - name: Get Cached LLVM Build @@ -467,12 +462,6 @@ jobs: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} - steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.10' - - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -483,8 +472,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python -m pip install -r requirements.txt scipy + 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 make frontend - name: Get Cached LLVM Build @@ -533,8 +523,8 @@ jobs: run: | sudo apt-get update sudo apt-get install -y python3 python3-pip libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install -r requirements.txt + python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} + python3 -m pip install -r requirements.txt make frontend - name: Get Cached LLVM Build @@ -583,10 +573,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.10' # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 - name: Checkout the repo @@ -602,11 +588,6 @@ jobs: run: | pip install numpy amazon-braket-sdk echo "AWS_DEFAULT_REGION=us-east-1" >> $GITHUB_ENV - - - name: Install additional dependencies (lightning device) - if: ${{ matrix.backend != 'openqasm' }} - run: | - pip install scipy - name: Download Catalyst-Runtime Artifact uses: actions/download-artifact@v3 @@ -669,11 +650,6 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 - name: Install Python - with: - python-version: '3.10' - - name: Checkout the repo uses: actions/checkout@v3 @@ -681,7 +657,6 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install cmake ninja-build libomp-dev lcov - python -m pip install scipy - name: Build Runtime test suite for Lightning simulator run: | From 6c1ae4b2de1effd31c829f0111a9ab779e30a8e1 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 14:24:48 -0400 Subject: [PATCH 061/120] avoid explicitly install scipy --- .github/workflows/build-wheel-linux-x86_64.yaml | 6 +++--- .github/workflows/build-wheel-macos-arm64.yaml | 6 +++--- .github/workflows/build-wheel-macos-x86_64.yaml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 300c2cb159..08dfa00250 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -136,7 +136,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML scipy + python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML # Required for MHLO and building MLIR with protected symbols. # (Don't forget to add the build directory to PATH in subsequent steps, so @@ -231,7 +231,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML scipy + python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML - name: Get Cached LLVM Source id: cache-llvm-source @@ -384,7 +384,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy + python${{ matrix.python_version }} -m pip install pytest pytest-xdist - name: Install PennyLane Plugins run: | diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index c21c803d3f..3c1fb3ab8f 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -153,7 +153,7 @@ jobs: key: ${{ runner.os }}-${{ runner.arch }}-enzyme-${{ needs.constants.outputs.llvm_version }}-${{ needs.constants.outputs.enzyme_version }}-generic-build - name: Install Dependencies (Python) - run: python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja scipy + run: python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja - name: Build LLVM / MLIR if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -228,7 +228,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja delocate scipy + python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja delocate - name: Get Cached LLVM Source id: cache-llvm-source @@ -392,7 +392,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy + python${{ matrix.python_version }} -m pip install pytest pytest-xdist - name: Install PennyLane Plugins run: | diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 53cc9877c0..bef93097f6 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -200,7 +200,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja delocate scipy + python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja delocate - name: Get Cached LLVM Source id: cache-llvm-source @@ -363,7 +363,7 @@ jobs: - name: Install Python dependencies run: | - python${{ matrix.python_version }} -m pip install pytest pytest-xdist scipy + python${{ matrix.python_version }} -m pip install pytest pytest-xdist - name: Install PennyLane Plugins run: | From 490f7c23d082ab608c93382d6e38cbb016147118 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 16:41:06 -0400 Subject: [PATCH 062/120] enable_lapack for macos x86-64 wheel --- .github/workflows/build-wheel-macos-x86_64.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index bef93097f6..d8cf141803 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -264,7 +264,6 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DLIGHTNING_GIT_TAG= master \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DENABLE_LAPACK=OFF \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ From d999dd34ca7bdc8f816de51bacef8d7268b6a610 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 16:46:26 -0400 Subject: [PATCH 063/120] update workflow --- .github/workflows/build-wheel-macos-arm64.yaml | 1 - .github/workflows/build-wheel-macos-x86_64.yaml | 1 - .github/workflows/check-catalyst.yaml | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 3c1fb3ab8f..5bdeb1a838 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -283,7 +283,6 @@ jobs: # Build Catalyst-Runtime - name: Build Catalyst-Runtime run: | - # TODO: Remove tmp tag 'add_dldso' before merge cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index d8cf141803..193463d64e 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -256,7 +256,6 @@ jobs: - name: Build Catalyst-Runtime run: | # Segfaults in computing Lightning's adjoint-jacobian when building with OMP - # TODO: Remove tmp tag 'add_dldso' before merge cmake -S runtime -B runtime-build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index ceac8ced8f..6888fe1249 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -149,7 +149,7 @@ jobs: steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 - + - name: Cache MHLO Source id: cache-mhlo-source uses: actions/cache@v3 @@ -461,7 +461,6 @@ jobs: strategy: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} - - name: Checkout Catalyst repo uses: actions/checkout@v3 From 63f6bb934de0aabbbc53c2fc0229eb50fc2a549a Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 16:49:26 -0400 Subject: [PATCH 064/120] update check-catalyst --- .github/workflows/check-catalyst.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 6888fe1249..b6b2d39cd9 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -461,6 +461,8 @@ jobs: strategy: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} + + steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 @@ -574,6 +576,7 @@ jobs: steps: # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 + - name: Checkout the repo uses: actions/checkout@v3 From a35da013804c978a8b0683dc2de7accba405ce67 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 16:50:26 -0400 Subject: [PATCH 065/120] remove blanks --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index b6b2d39cd9..1ecc6614e4 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -461,7 +461,7 @@ jobs: strategy: matrix: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} - + steps: - name: Checkout Catalyst repo uses: actions/checkout@v3 From ba4bae5a4447c352ea23003cb25b7c2da789e236 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 25 Apr 2024 17:07:35 -0400 Subject: [PATCH 066/120] ensure scipy is installed --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 1ecc6614e4..4d6f2f13b6 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -403,7 +403,7 @@ jobs: # macOS requirements.txt python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client - # /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall + /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall make frontend - name: Get Cached LLVM Build From 4fe8806a8b979b34f31588b20d0dfc5cc870e39f Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 19:19:01 -0400 Subject: [PATCH 067/120] test against e91975e --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 02f07a737b..74e26d15d3 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -305,7 +305,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= master \ + -DLIGHTNING_GIT_TAG= e91975e \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 95bb7bf3a2..dc72f79d28 100644 --- 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= master \ + -DLIGHTNING_GIT_TAG= e91975e \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 2678331bd3..bda59ce31b 100644 --- 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= master \ + -DLIGHTNING_GIT_TAG= e91975e \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 46a02e97e2..79473f36fe 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=ON -LIGHTNING_GIT_TAG_VALUE?=master +LIGHTNING_GIT_TAG_VALUE?=e91975e NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From b2ec3b50a394d95114848bb21356a8f8addd28f9 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 21:50:05 -0400 Subject: [PATCH 068/120] test against c813e21 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 74e26d15d3..1bcda0a7cf 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -305,7 +305,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= e91975e \ + -DLIGHTNING_GIT_TAG= c813e21 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index dc72f79d28..86f7be5589 100644 --- 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= e91975e \ + -DLIGHTNING_GIT_TAG= c813e21 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index bda59ce31b..226334e201 100644 --- 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= e91975e \ + -DLIGHTNING_GIT_TAG= c813e21 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 79473f36fe..05492366d2 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=ON -LIGHTNING_GIT_TAG_VALUE?=e91975e +LIGHTNING_GIT_TAG_VALUE?=c813e21 NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 64f505db1eb56a628a7502203145afd886e3d109 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 22:54:25 -0400 Subject: [PATCH 069/120] test against 951e231 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/check-catalyst.yaml | 1 - runtime/Makefile | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 1bcda0a7cf..2f2896d1e5 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -305,7 +305,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= c813e21 \ + -DLIGHTNING_GIT_TAG= 951e231 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 86f7be5589..bf36042365 100644 --- 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= c813e21 \ + -DLIGHTNING_GIT_TAG= 951e231 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 226334e201..c3990483ee 100644 --- 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= c813e21 \ + -DLIGHTNING_GIT_TAG= 951e231 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 5e64494c84..4a12cf3908 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -411,7 +411,6 @@ jobs: # macOS requirements.txt python3 -m pip install cuda-quantum==0.6.0 python3 -m pip install oqc-qcaas-client - /opt/hostedtoolcache/Python/3.10.14/x64/bin/python -m pip install scipy --force-reinstall make frontend - name: Get Cached LLVM Build diff --git a/runtime/Makefile b/runtime/Makefile index 05492366d2..8626ca2231 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=ON -LIGHTNING_GIT_TAG_VALUE?=c813e21 +LIGHTNING_GIT_TAG_VALUE?=951e231 NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From b2ee43dfd2643916a45beb0d0a8af5b39afca9ab Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 23:20:23 -0400 Subject: [PATCH 070/120] test def8a26 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 2f2896d1e5..7b9270ef50 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -305,7 +305,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= 951e231 \ + -DLIGHTNING_GIT_TAG= def8a26 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index bf36042365..161b91ed95 100644 --- 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= 951e231 \ + -DLIGHTNING_GIT_TAG= def8a26 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index c3990483ee..054b4e0714 100644 --- 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= 951e231 \ + -DLIGHTNING_GIT_TAG= def8a26 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 8626ca2231..7f8153ce9f 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=ON -LIGHTNING_GIT_TAG_VALUE?=951e231 +LIGHTNING_GIT_TAG_VALUE?=def8a26 NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi From 5922f2191d4c9d13e5a0e277191a913e25fc42b4 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 23:29:19 -0400 Subject: [PATCH 071/120] add pybind_Dir --- runtime/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/Makefile b/runtime/Makefile index 7f8153ce9f..e7ee58d292 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -86,6 +86,7 @@ configure: -DPython_EXECUTABLE=$(PYTHON) \ -DENABLE_ADDRESS_SANITIZER=$(ENABLE_ASAN) \ -DLIGHTNING_GIT_TAG=$(LIGHTNING_GIT_TAG_VALUE) \ + -Dpybind11_DIR=$(python3 -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LAPACK=$(ENABLE_LAPACK) \ $(CMAKE_ARGS) From cc427d100afd91f3a6dcd2c4c494f8bafbbb6052 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 26 Apr 2024 23:32:44 -0400 Subject: [PATCH 072/120] test --- runtime/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/Makefile b/runtime/Makefile index e7ee58d292..97cbae7184 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -16,6 +16,7 @@ ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=ON LIGHTNING_GIT_TAG_VALUE?=def8a26 +PYBIND11_DIR=$(shell python3 -c "import pybind11; print(pybind11.get_cmake_dir())") NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") BUILD_TARGETS := rt_capi @@ -86,7 +87,7 @@ configure: -DPython_EXECUTABLE=$(PYTHON) \ -DENABLE_ADDRESS_SANITIZER=$(ENABLE_ASAN) \ -DLIGHTNING_GIT_TAG=$(LIGHTNING_GIT_TAG_VALUE) \ - -Dpybind11_DIR=$(python3 -c "import pybind11; print(pybind11.get_cmake_dir())") \ + -Dpybind11_DIR=$(PYBIND11_DIR) \ -DENABLE_LAPACK=$(ENABLE_LAPACK) \ $(CMAKE_ARGS) From ea4fbf71acfd0b73bdd059f3ea919da3184a756e Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 17:58:45 -0400 Subject: [PATCH 073/120] add venv --- .github/workflows/check-catalyst.yaml | 76 ++++++++++++++++++++------- 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 4a12cf3908..e10d069887 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -34,6 +34,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -41,7 +46,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - python3 -m pip install scipy + python -m pip install scipy - name: Build Catalyst-Runtime run: | @@ -96,6 +101,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -129,9 +139,9 @@ jobs: if: steps.cache-llvm-build.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y python3 python3-pip cmake ninja-build clang lld - python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 + sudo apt-get install -y cmake ninja-build clang lld + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install numpy pybind11 - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -225,6 +235,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -295,15 +310,20 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y python3 python3-pip cmake ninja-build ccache clang lld - python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} - python3 -m pip install numpy pybind11 + sudo apt-get install -y cmake ninja-build ccache clang lld + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install numpy pybind11 - name: Get Cached LLVM Source id: cache-llvm-source @@ -397,20 +417,25 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install Deps run: | sudo apt-get update - 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 + sudo apt-get install -y libomp-dev libasan6 make + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python3 -m pip install cuda-quantum==0.6.0 - python3 -m pip install oqc-qcaas-client + python -m pip install cuda-quantum==0.6.0 + python -m pip install oqc-qcaas-client make frontend - name: Get Cached LLVM Build @@ -472,6 +497,11 @@ jobs: steps: - name: Checkout Catalyst repo uses: actions/checkout@v4 + + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' - name: Install lightning.kokkos used in Python tests run: | @@ -480,9 +510,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - 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 + sudo apt-get install -y libomp-dev libasan6 make + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt make frontend - name: Get Cached LLVM Build @@ -524,15 +554,20 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install Deps run: | sudo apt-get update - 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 + sudo apt-get install -y libomp-dev libasan6 make + python --version | grep ${{ needs.constants.outputs.primary_python_version }} + python -m pip install -r requirements.txt make frontend - name: Get Cached LLVM Build @@ -583,6 +618,11 @@ jobs: steps: # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 + + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' - name: Checkout the repo uses: actions/checkout@v4 From ade3aa210713e38a05542aea9e56ef99831266f4 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 18:11:49 -0400 Subject: [PATCH 074/120] quick test --- .github/workflows/check-catalyst.yaml | 34 +++++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index e10d069887..e32613d1fb 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -45,8 +45,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - python -m pip install scipy + sudo apt-get -y -q install make clang libomp-dev + python -m pip install cmake scipy ninja - name: Build Catalyst-Runtime run: | @@ -139,9 +139,9 @@ jobs: if: steps.cache-llvm-build.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y cmake ninja-build clang lld + sudo apt-get install -y clang lld python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install numpy pybind11 + python -m pip install cmake ninja numpy pybind11 - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -165,6 +165,11 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -214,7 +219,8 @@ jobs: if: steps.cache-mhlo.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y cmake ninja-build clang lld + sudo apt-get install -y clang lld + python -m pip install cmake ninja - name: Build MHLO Dialect if: steps.cache-mhlo.outputs.cache-hit != 'true' @@ -289,7 +295,8 @@ jobs: if: steps.cache-enzyme-build.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y cmake ninja-build clang lld + sudo apt-get install -y clang lld + python -m pip install cmake ninja - name: Build Enzyme if: steps.cache-enzyme-build.outputs.cache-hit != 'true' @@ -321,9 +328,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y cmake ninja-build ccache clang lld + sudo apt-get install -y ccache clang lld python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install numpy pybind11 + python -m pip install cmake numpy pybind11 ninja - name: Get Cached LLVM Source id: cache-llvm-source @@ -630,7 +637,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan5 + sudo apt-get -y -q install libomp-dev lcov libasan5 + python -m pip install cmake ninja - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -699,13 +707,19 @@ jobs: runs-on: ${{ needs.determine_runner.outputs.runner_group }} steps: + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Checkout the repo uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov + sudo apt-get -y -q install libomp-dev lcov + python -m pip install cmake ninja - name: Build Runtime test suite for Lightning simulator run: | From cf832ff3f9df2365ef091950125534219c8d1930 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 18:17:06 -0400 Subject: [PATCH 075/120] add pybind11 as dependency --- .github/workflows/check-catalyst.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index e32613d1fb..f208100380 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -46,7 +46,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install make clang libomp-dev - python -m pip install cmake scipy ninja + python -m pip install cmake scipy ninja pybind11 - name: Build Catalyst-Runtime run: | @@ -220,7 +220,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang lld - python -m pip install cmake ninja + python -m pip install cmake ninja pybind11 - name: Build MHLO Dialect if: steps.cache-mhlo.outputs.cache-hit != 'true' @@ -296,7 +296,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang lld - python -m pip install cmake ninja + python -m pip install cmake ninja pybind11 - name: Build Enzyme if: steps.cache-enzyme-build.outputs.cache-hit != 'true' @@ -638,7 +638,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install libomp-dev lcov libasan5 - python -m pip install cmake ninja + python -m pip install cmake ninja pybind11 - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -719,7 +719,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install libomp-dev lcov - python -m pip install cmake ninja + python -m pip install cmake ninja pybind11 - name: Build Runtime test suite for Lightning simulator run: | From d089593e5cb0ecb532495d67db48cd9094db4e94 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 18:27:28 -0400 Subject: [PATCH 076/120] check python --- runtime/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/Makefile b/runtime/Makefile index d69aa48c40..08b145a1ac 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -1,8 +1,8 @@ -PYTHON := $(shell which python3) +PYTHON := $(shell which python) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) COMPILER_LAUNCHER?=$(shell which ccache) -NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") +NPROC?=$(shell python -c "import os; print(os.cpu_count())") MK_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST))) MK_DIR := $(dir $(MK_ABSPATH)) From b401d642eb120dc352b1e83d168b637597529234 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 18:35:36 -0400 Subject: [PATCH 077/120] python3->python --- Makefile | 2 +- frontend/catalyst/oqc/src/Makefile | 4 ++-- mlir/Makefile | 12 ++++++------ runtime/Makefile | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c394a47e53..be35ddef29 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= $(shell which python3) +PYTHON ?= $(shell which python) C_COMPILER ?= $(shell which clang) CXX_COMPILER ?= $(shell which clang++) BLACKVERSIONMAJOR := $(shell black --version 2> /dev/null | head -n1 | awk '{ print $$2 }' | cut -d. -f1) diff --git a/frontend/catalyst/oqc/src/Makefile b/frontend/catalyst/oqc/src/Makefile index c38bf0ccf2..427078fa58 100644 --- a/frontend/catalyst/oqc/src/Makefile +++ b/frontend/catalyst/oqc/src/Makefile @@ -1,7 +1,7 @@ -PYTHON?=$(shell which python3) +PYTHON?=$(shell which python) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) -NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") +NPROC?=$(shell python -c "import os; print(os.cpu_count())") MK_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST))) MK_DIR := $(dir $(MK_ABSPATH)) diff --git a/mlir/Makefile b/mlir/Makefile index 57ad47ab87..710a340782 100644 --- a/mlir/Makefile +++ b/mlir/Makefile @@ -1,4 +1,4 @@ -PYTHON?=$(shell which python3) +PYTHON?=$(shell which python) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) COMPILER_LAUNCHER?=$(shell which ccache) @@ -59,8 +59,8 @@ llvm: -DLLVM_ENABLE_PROJECTS="mlir" \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ - -DPython3_EXECUTABLE=$(PYTHON) \ - -DPython3_NumPy_INCLUDE_DIRS=$$($(PYTHON) -c "import numpy as np; print(np.get_include())") \ + -DPython_EXECUTABLE=$(PYTHON) \ + -DPython_NumPy_INCLUDE_DIRS=$$($(PYTHON) -c "import numpy as np; print(np.get_include())") \ -DCMAKE_C_COMPILER=$(C_COMPILER) \ -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) \ -DCMAKE_C_COMPILER_LAUNCHER=$(COMPILER_LAUNCHER) \ @@ -82,7 +82,7 @@ mhlo: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DMLIR_DIR=$(LLVM_BUILD_DIR)/lib/cmake/mlir \ - -DPython3_EXECUTABLE=$(PYTHON) \ + -DPython_EXECUTABLE=$(PYTHON) \ -DCMAKE_C_COMPILER=$(C_COMPILER) \ -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) \ -DCMAKE_C_COMPILER_LAUNCHER=$(COMPILER_LAUNCHER) \ @@ -119,8 +119,8 @@ dialects: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DQUANTUM_ENABLE_BINDINGS_PYTHON=ON \ - -DPython3_EXECUTABLE=$(PYTHON) \ - -DPython3_NumPy_INCLUDE_DIRS=$(shell $(PYTHON) -c "import numpy as np; print(np.get_include())") \ + -DPython_EXECUTABLE=$(PYTHON) \ + -DPython_NumPy_INCLUDE_DIRS=$(shell $(PYTHON) -c "import numpy as np; print(np.get_include())") \ -DEnzyme_DIR=$(ENZYME_BUILD_DIR) \ -DENZYME_SRC_DIR=$(MK_DIR)/Enzyme \ -DMLIR_DIR=$(LLVM_BUILD_DIR)/lib/cmake/mlir \ diff --git a/runtime/Makefile b/runtime/Makefile index 08b145a1ac..b09deee7cf 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -86,7 +86,6 @@ configure: -Dpybind11_DIR=$(shell $(PYTHON) -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_ADDRESS_SANITIZER=$(ENABLE_ASAN) \ -DLIGHTNING_GIT_TAG=$(LIGHTNING_GIT_TAG_VALUE) \ - -Dpybind11_DIR=$(PYBIND11_DIR) \ -DENABLE_LAPACK=$(ENABLE_LAPACK) \ $(CMAKE_ARGS) From f8e106c450df23278eda1b46fd6339d3bef6d525 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 18:40:21 -0400 Subject: [PATCH 078/120] install scipy --- .github/workflows/check-catalyst.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index f208100380..723a95d88a 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -46,7 +46,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install make clang libomp-dev - python -m pip install cmake scipy ninja pybind11 + python -m pip install cmake scipy ninja pybind11 scipy - name: Build Catalyst-Runtime run: | @@ -141,7 +141,7 @@ jobs: sudo apt-get update sudo apt-get install -y clang lld python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install cmake ninja numpy pybind11 + python -m pip install cmake ninja numpy pybind11 scipy - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -220,7 +220,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang lld - python -m pip install cmake ninja pybind11 + python -m pip install cmake ninja pybind11 scipy - name: Build MHLO Dialect if: steps.cache-mhlo.outputs.cache-hit != 'true' @@ -296,7 +296,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang lld - python -m pip install cmake ninja pybind11 + python -m pip install cmake ninja pybind11 scipy - name: Build Enzyme if: steps.cache-enzyme-build.outputs.cache-hit != 'true' @@ -330,7 +330,7 @@ jobs: sudo apt-get update sudo apt-get install -y ccache clang lld python --version | grep ${{ needs.constants.outputs.primary_python_version }} - python -m pip install cmake numpy pybind11 ninja + python -m pip install cmake numpy pybind11 ninja scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -638,7 +638,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install libomp-dev lcov libasan5 - python -m pip install cmake ninja pybind11 + python -m pip install cmake ninja pybind11 scipy - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -719,7 +719,7 @@ jobs: run: | sudo apt-get update sudo apt-get -y -q install libomp-dev lcov - python -m pip install cmake ninja pybind11 + python -m pip install cmake ninja pybind11 scipy - name: Build Runtime test suite for Lightning simulator run: | From 3f9fb3ccbae374bdf05c6c7ae2e9fc6024d002df Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 22:06:04 -0400 Subject: [PATCH 079/120] tests --- .github/workflows/check-catalyst.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 723a95d88a..3f6ed4d94a 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -329,7 +329,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y ccache clang lld - python --version | grep ${{ needs.constants.outputs.primary_python_version }} python -m pip install cmake numpy pybind11 ninja scipy - name: Get Cached LLVM Source From d94ec96f13aacb1032426f2b8a8c598e74c1229a Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 22:15:20 -0400 Subject: [PATCH 080/120] remove grep --- .github/workflows/check-catalyst.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3f6ed4d94a..9cb22f41e5 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -140,7 +140,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang lld - python --version | grep ${{ needs.constants.outputs.primary_python_version }} python -m pip install cmake ninja numpy pybind11 scipy - name: Build LLVM @@ -435,7 +434,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} python -m pip install -r requirements.txt # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break @@ -517,7 +515,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} python -m pip install -r requirements.txt make frontend @@ -572,7 +569,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libomp-dev libasan6 make - python --version | grep ${{ needs.constants.outputs.primary_python_version }} python -m pip install -r requirements.txt make frontend From ccecc1ff1976f35cd3d98b709f0806a8b624da62 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 9 May 2024 22:28:57 -0400 Subject: [PATCH 081/120] add lit --- .github/workflows/check-catalyst.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 9cb22f41e5..0d5a83cd97 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -440,6 +440,7 @@ jobs: # macOS requirements.txt python -m pip install cuda-quantum==0.6.0 python -m pip install oqc-qcaas-client + python -m pip install lit make frontend - name: Get Cached LLVM Build From 921dee188e62dadd6a4f36f7f7a39949be089140 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 11:36:59 -0400 Subject: [PATCH 082/120] enable_lapack --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 80fb23efda..a86008855b 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -310,7 +310,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG= def8a26 \ - -DENABLE_LAPACK=OFF \ + -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 8f23a80793..3b41a5d377 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -290,7 +290,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG= def8a26 \ - -DENABLE_LAPACK=OFF \ + -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ From 165f9dad17c2dda40fa93795a05ea9c206012d7c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 11:51:06 -0400 Subject: [PATCH 083/120] llvm-lit->lit --- .github/workflows/check-catalyst.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 0d5a83cd97..b3c757d68a 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -440,7 +440,6 @@ jobs: # macOS requirements.txt python -m pip install cuda-quantum==0.6.0 python -m pip install oqc-qcaas-client - python -m pip install lit make frontend - name: Get Cached LLVM Build @@ -472,7 +471,8 @@ jobs: - name: Run Python Lit Tests run: | - llvm-lit -sv frontend/test/lit -j$(nproc) + python -m pip install lit + lit -sv frontend/test/lit -j$(nproc) - name: Run Python Pytest Tests run: | From bf9492d848deb7fa8acc9041223edc3fb80f4e29 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 12:07:14 -0400 Subject: [PATCH 084/120] specify python when make frontend --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index b3c757d68a..82876ef240 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -440,7 +440,7 @@ jobs: # macOS requirements.txt python -m pip install cuda-quantum==0.6.0 python -m pip install oqc-qcaas-client - make frontend + PYTHON=$(which python3) make frontend - name: Get Cached LLVM Build id: cache-llvm-build From 12df432cc3a9f1db827974c0bdf79da1f9940ad1 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 13:43:09 -0400 Subject: [PATCH 085/120] python_executable -> "python" --- mlir/test/lit.cfg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py index e51e78992b..a56cf78a64 100644 --- a/mlir/test/lit.cfg.py +++ b/mlir/test/lit.cfg.py @@ -17,7 +17,8 @@ config.test_exec_root = getattr(config, "quantum_test_dir", ".lit") # Define substitutions used at the top of lit test files, e.g. %PYTHON. -python_executable = getattr(config, "python_executable", "python3.10") +#python_executable = getattr(config, "python_executable", "python3.10") +python_executable = "python" if "Address" in getattr(config, "llvm_use_sanitizer", ""): # With sanitized builds, Python tests require some preloading magic to run. From f2a66e194e98caa7b7549c35e1b69c581a9bbe8a Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 14:00:03 -0400 Subject: [PATCH 086/120] change python --- frontend/test/lit/lit.cfg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/test/lit/lit.cfg.py b/frontend/test/lit/lit.cfg.py index b1845dcc01..3f581303de 100644 --- a/frontend/test/lit/lit.cfg.py +++ b/frontend/test/lit/lit.cfg.py @@ -36,7 +36,8 @@ config.environment["ASAN_OPTIONS"] = "detect_leaks=0,detect_container_overflow=0" # Define substitutions used at the top of lit test files, e.g. %PYTHON. -python_executable = getattr(config, "python_executable", "python3.10") +#python_executable = getattr(config, "python_executable", "python3.10") +python_executable = "python" if "Address" in getattr(config, "llvm_use_sanitizer", ""): # With sanitized builds, Python tests require some preloading magic to run. From 7f7da4fbbcac2e10c81083fea889e73fe6e6bfc4 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 14:12:00 -0400 Subject: [PATCH 087/120] update make coverage-frontend --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 82876ef240..a965bc89bd 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -477,7 +477,7 @@ jobs: - name: Run Python Pytest Tests run: | COVERAGE_REPORT="xml:coverage.xml -p no:warnings" \ - make coverage-frontend + PYTHON=$(which python) make coverage-frontend mv coverage.xml coverage-${{ github.job }}.xml - name: Upload to Codecov From 71ec99bcebb4a61477bc1ff828eb870cddeb9f2e Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 14:25:49 -0400 Subject: [PATCH 088/120] install attrs --- .github/workflows/check-catalyst.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index a965bc89bd..dee3161296 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -476,6 +476,7 @@ jobs: - name: Run Python Pytest Tests run: | + python -m pip install attrs COVERAGE_REPORT="xml:coverage.xml -p no:warnings" \ PYTHON=$(which python) make coverage-frontend mv coverage.xml coverage-${{ github.job }}.xml From 017c5671f49f469d58534d469fa8c2c52f26b557 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 10 May 2024 14:43:56 -0400 Subject: [PATCH 089/120] install --upgrade attrs --- .github/workflows/check-catalyst.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index dee3161296..5f350db49d 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -476,7 +476,7 @@ jobs: - name: Run Python Pytest Tests run: | - python -m pip install attrs + python -m pip install --upgrade attrs COVERAGE_REPORT="xml:coverage.xml -p no:warnings" \ PYTHON=$(which python) make coverage-frontend mv coverage.xml coverage-${{ github.job }}.xml From 05a7052162b484af0e90976692cb6f2184b469d7 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 13 May 2024 14:51:37 -0400 Subject: [PATCH 090/120] test against dd3bafb --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index a86008855b..9567e5a179 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -309,7 +309,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= def8a26 \ + -DLIGHTNING_GIT_TAG= dd3bafb \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 3b41a5d377..16e501a809 100644 --- 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= def8a26 \ + -DLIGHTNING_GIT_TAG= dd3bafb \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 843eef1dfa..d393d79593 100644 --- 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= def8a26 \ + -DLIGHTNING_GIT_TAG= dd3bafb \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index b09deee7cf..0f946afe13 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF ENABLE_LAPACK?=On -LIGHTNING_GIT_TAG_VALUE?=def8a26 +LIGHTNING_GIT_TAG_VALUE?=dd3bafb BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 71af0cf82a16e05630a0836a9d0b8289103bc2c9 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Tue, 9 Jul 2024 13:49:56 -0400 Subject: [PATCH 091/120] enable_lapack --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3d9b590637..528d23d6e4 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -315,7 +315,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 \ - -DENABLE_LAPACK=OFF \ + -DENABLE_LAPACK=ON \ -DLIGHTNING_GIT_TAG=476cac2e39f79c122b8751a77aad8139b39296db \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 95db00a6af..64484ef3ae 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -290,7 +290,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG=476cac2e39f79c122b8751a77aad8139b39296db \ - -DENABLE_LAPACK=OFF \ + -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index d5b29837df..b7ef63a3d4 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -47,7 +47,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG=latest_release \ - -DENABLE_LAPACK=OFF \ + -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 8e65f85189..dabcf2e992 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF LIGHTNING_GIT_TAG_VALUE?=476cac2e39f79c122b8751a77aad8139b39296db -ENABLE_LAPACK?=OFF +ENABLE_LAPACK?=ON BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 832657cde67b66ad8aa310dad2b26f3e729bc8e0 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 11 Jul 2024 08:32:14 -0400 Subject: [PATCH 092/120] test against recent changes --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 528d23d6e4..df7bc4d9e8 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -316,7 +316,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=476cac2e39f79c122b8751a77aad8139b39296db \ + -DLIGHTNING_GIT_TAG=2e1760c \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 64484ef3ae..7db10bf8e4 100644 --- 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=476cac2e39f79c122b8751a77aad8139b39296db \ + -DLIGHTNING_GIT_TAG=2e1760c \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 11b681592f..b376fa9e9f 100644 --- 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=476cac2e39f79c122b8751a77aad8139b39296db \ + -DLIGHTNING_GIT_TAG=2e1760c \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index dabcf2e992..2df8d9e220 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=476cac2e39f79c122b8751a77aad8139b39296db +LIGHTNING_GIT_TAG_VALUE?=2e1760c ENABLE_LAPACK?=ON BUILD_TARGETS := rt_capi rtd_dummy From 66720a530fa7b715af9b678674da34bc9f778210 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Thu, 15 Aug 2024 11:43:33 -0400 Subject: [PATCH 093/120] test against 48da2c2 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index acc08a52f0..f953fbe4b9 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -316,7 +316,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=8b36022 \ + -DLIGHTNING_GIT_TAG=48da2c2 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index bfc673e356..c228164927 100644 --- 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=8b36022 \ + -DLIGHTNING_GIT_TAG=48da2c2 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 5cd8059ec2..a02ae6554f 100644 --- 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=8b36022 \ + -DLIGHTNING_GIT_TAG=48da2c2 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 4b642d5ace..5d17e16860 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=8b36022 +LIGHTNING_GIT_TAG_VALUE?=48da2c2 ENABLE_LAPACK?=ON BUILD_TARGETS := rt_capi rtd_dummy From d84f9ba5defd9fc06e0ebad61a077829da3252ff Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 09:16:52 -0400 Subject: [PATCH 094/120] test against dcb2e79 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- runtime/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index f953fbe4b9..63d2c02139 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -316,7 +316,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=48da2c2 \ + -DLIGHTNING_GIT_TAG=dcb2e79 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index c228164927..fe0187c3e1 100644 --- 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=48da2c2 \ + -DLIGHTNING_GIT_TAG=dcb2e79 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index a02ae6554f..bb86443d25 100644 --- 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=48da2c2 \ + -DLIGHTNING_GIT_TAG=dcb2e79 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 5d17e16860..2e90a0839e 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=48da2c2 +LIGHTNING_GIT_TAG_VALUE?=dcb2e79 ENABLE_LAPACK?=ON BUILD_TARGETS := rt_capi rtd_dummy From 27b21c93a5208aa41914e928cc56fd5eb360937c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 14:06:42 -0400 Subject: [PATCH 095/120] test against 5097351 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 9271667bf6..3a4e086e41 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -343,7 +343,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=dcb2e79 \ + -DLIGHTNING_GIT_TAG=5097351 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index d699b9501d..b8c62dff2f 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -302,7 +302,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=dcb2e79 \ + -DLIGHTNING_GIT_TAG=5097351 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 2b34478cf1..de4e173add 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=dcb2e79 \ + -DLIGHTNING_GIT_TAG=5097351 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 55a11db683..d751df18a3 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -46,7 +46,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG=dcb2e79 \ + -DLIGHTNING_GIT_TAG=5097351 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/runtime/Makefile b/runtime/Makefile index 3a53eb8d12..533a7de1dc 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=dcb2e79 +LIGHTNING_GIT_TAG_VALUE?=5097351 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From f8fb90cd7217b3dde9622b2a9012b22b1004e568 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 15:25:10 -0400 Subject: [PATCH 096/120] test against b1b2d60 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3a4e086e41..349e25a83f 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -343,7 +343,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=5097351 \ + -DLIGHTNING_GIT_TAG=b1b2d60 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index b8c62dff2f..7027b2dc5c 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -302,7 +302,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=5097351 \ + -DLIGHTNING_GIT_TAG=b1b2d60 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index de4e173add..0189640289 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=5097351 \ + -DLIGHTNING_GIT_TAG=b1b2d60 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index d751df18a3..ac4d817651 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -46,7 +46,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG=5097351 \ + -DLIGHTNING_GIT_TAG=b1b2d60 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/runtime/Makefile b/runtime/Makefile index 533a7de1dc..05110ddbc1 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=5097351 +LIGHTNING_GIT_TAG_VALUE?=b1b2d60 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 9c694d0730450e5d26a7a33f1c4e52ffc42e92fc Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 16:03:49 -0400 Subject: [PATCH 097/120] test against 6c50b77 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 349e25a83f..49560d0c90 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -343,7 +343,7 @@ jobs: -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DENABLE_LAPACK=ON \ - -DLIGHTNING_GIT_TAG=b1b2d60 \ + -DLIGHTNING_GIT_TAG=6c50b77 \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 7027b2dc5c..a7d0a09ba2 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -302,7 +302,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=b1b2d60 \ + -DLIGHTNING_GIT_TAG=6c50b77 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 0189640289..14128b7242 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=b1b2d60 \ + -DLIGHTNING_GIT_TAG=6c50b77 \ -DENABLE_LIGHTNING_KOKKOS=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index ac4d817651..49d2eb3f11 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -46,7 +46,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ -DENABLE_LIGHTNING_KOKKOS=ON \ - -DLIGHTNING_GIT_TAG=b1b2d60 \ + -DLIGHTNING_GIT_TAG=6c50b77 \ -DENABLE_LAPACK=ON \ -DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_OPENMP=ON \ diff --git a/runtime/Makefile b/runtime/Makefile index 05110ddbc1..9079f26fe5 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=b1b2d60 +LIGHTNING_GIT_TAG_VALUE?=6c50b77 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 9b73fd01c8459d42f606efcdde2588f9429178c3 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 16:33:05 -0400 Subject: [PATCH 098/120] revert some changes --- .../workflows/build-wheel-linux-x86_64.yaml | 11 +- .../workflows/build-wheel-macos-arm64.yaml | 5 - .../workflows/build-wheel-macos-x86_64.yaml | 5 - .github/workflows/check-catalyst.yaml | 103 +++++------------- .../scripts/linux_arm64/rh8/build_catalyst.sh | 5 - .../catalyst/third_party/oqc/src/Makefile | 4 +- frontend/test/lit/lit.cfg.py | 3 +- mlir/Makefile | 12 +- mlir/test/lit.cfg.py | 3 +- 9 files changed, 37 insertions(+), 114 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 49560d0c90..dbb45c8110 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,11 +341,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())") \ - -DENABLE_LIGHTNING_KOKKOS=ON \ - -DENABLE_LAPACK=ON \ -DLIGHTNING_GIT_TAG=6c50b77 \ - -DKokkos_ENABLE_SERIAL=ON \ - -DKokkos_ENABLE_OPENMP=ON \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ @@ -418,12 +414,7 @@ jobs: name: Test Wheels (Python ${{ matrix.python_version }}) on Linux x86 runs-on: ${{ needs.determine_runner.outputs.runner_group }} - steps: - - name: Set up Python ${{ matrix.python_version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python_version }} - + steps: - name: Checkout Catalyst repo uses: actions/checkout@v4 diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index a7d0a09ba2..17fa11d83c 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,12 +301,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())") \ - -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG=6c50b77 \ - -DENABLE_LAPACK=ON \ - -DKokkos_ENABLE_SERIAL=ON \ - -DKokkos_ENABLE_OPENMP=ON \ - -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 14128b7242..52964a0120 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -293,11 +293,6 @@ jobs: -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DLIGHTNING_GIT_TAG=6c50b77 \ - -DENABLE_LIGHTNING_KOKKOS=ON \ - -DKokkos_ENABLE_SERIAL=ON \ - -DKokkos_ENABLE_OPENMP=OFF \ - -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ - -DKokkos_ENABLE_DEPRECATION_WARNINGS=OFF \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 46b6e06cab..cc6f7f566b 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -40,19 +40,14 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install make clang libomp-dev - python -m pip install cmake scipy ninja pybind11 scipy + sudo apt-get -y -q install ninja-build make cmake clang libomp-dev + python -m pip install scipy pybind11 - name: Build Catalyst-Runtime run: | @@ -107,11 +102,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -145,8 +135,9 @@ jobs: if: steps.cache-llvm-build.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y clang lld - python -m pip install cmake ninja numpy pybind11 scipy + sudo apt-get install -y python3 python3-pip cmake ninja-build clang lld + python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} + python3 -m pip install numpy pybind11 scipy - name: Build LLVM if: steps.cache-llvm-build.outputs.cache-hit != 'true' @@ -170,11 +161,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -224,8 +210,7 @@ jobs: if: steps.cache-mhlo.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y clang lld - python -m pip install cmake ninja pybind11 scipy + sudo apt-get install -y cmake ninja-build clang lld - name: Build MHLO Dialect if: steps.cache-mhlo.outputs.cache-hit != 'true' @@ -246,11 +231,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -300,8 +280,7 @@ jobs: if: steps.cache-enzyme-build.outputs.cache-hit != 'true' run: | sudo apt-get update - sudo apt-get install -y clang lld - python -m pip install cmake ninja pybind11 scipy + sudo apt-get install -y cmake ninja-build clang lld - name: Build Enzyme if: steps.cache-enzyme-build.outputs.cache-hit != 'true' @@ -322,19 +301,15 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y ccache clang lld - python -m pip install cmake numpy pybind11 ninja scipy + sudo apt-get install -y python3 python3-pip cmake ninja-build ccache clang lld + python3 --version | grep ${{ needs.constants.outputs.primary_python_version }} + python3 -m pip install numpy pybind11 scipy - name: Get Cached LLVM Source id: cache-llvm-source @@ -433,25 +408,21 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python -m pip install -r requirements.txt + 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 # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt - python -m pip install cuda-quantum==0.6.0 - python -m pip install oqc-qcaas-client - PYTHON=$(which python3) make frontend + python3 -m pip install cuda-quantum==0.6.0 + python3 -m pip install oqc-qcaas-client + make frontend - name: Get Cached LLVM Build id: cache-llvm-build @@ -482,14 +453,12 @@ jobs: - name: Run Python Lit Tests run: | - python -m pip install lit - lit -sv frontend/test/lit -j$(nproc) + llvm-lit -sv frontend/test/lit -j$(nproc) - name: Run Python Pytest Tests run: | - python -m pip install --upgrade attrs COVERAGE_REPORT="xml:coverage.xml -p no:warnings" \ - PYTHON=$(which python) make coverage-frontend + make coverage-frontend mv coverage.xml coverage-${{ github.job }}.xml - name: Upload to Codecov @@ -514,11 +483,6 @@ jobs: steps: - name: Checkout Catalyst repo uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - name: Install lightning.kokkos used in Python tests run: | @@ -527,8 +491,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python -m pip install -r requirements.txt + 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 make frontend - name: Get Cached LLVM Build @@ -570,11 +535,6 @@ jobs: compiler: ${{ fromJson(needs.constants.outputs.compilers) }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout Catalyst repo uses: actions/checkout@v4 @@ -586,8 +546,9 @@ jobs: - name: Install Deps run: | sudo apt-get update - sudo apt-get install -y libomp-dev libasan6 make - python -m pip install -r requirements.txt + 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 make frontend - name: Get Cached LLVM Build @@ -633,11 +594,6 @@ jobs: steps: # - name: Collect Workflow Telemetry # uses: catchpoint/workflow-telemetry-action@v2 - - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - name: Checkout the repo uses: actions/checkout@v4 @@ -645,8 +601,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install libomp-dev lcov libasan5 - python -m pip install cmake ninja pybind11 scipy + sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan6 - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -713,19 +668,13 @@ jobs: runs-on: ${{ needs.determine_runner.outputs.runner_group }} steps: - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Checkout the repo uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install libomp-dev lcov - python -m pip install cmake ninja pybind11 scipy + sudo apt-get -y -q install cmake ninja-build libomp-dev lcov - name: Build Runtime test suite for Lightning simulator run: | diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 49d2eb3f11..407ca208b3 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,12 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DENABLE_LIGHTNING_KOKKOS=ON \ -DLIGHTNING_GIT_TAG=6c50b77 \ - -DENABLE_LAPACK=ON \ - -DKokkos_ENABLE_SERIAL=ON \ - -DKokkos_ENABLE_OPENMP=ON \ - -DKokkos_ENABLE_COMPLEX_ALIGN=OFF \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/frontend/catalyst/third_party/oqc/src/Makefile b/frontend/catalyst/third_party/oqc/src/Makefile index de1701e2e7..91b26a406a 100644 --- a/frontend/catalyst/third_party/oqc/src/Makefile +++ b/frontend/catalyst/third_party/oqc/src/Makefile @@ -1,7 +1,7 @@ -PYTHON?=$(shell which python) +PYTHON?=$(shell which python3) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) -NPROC?=$(shell python -c "import os; print(os.cpu_count())") +NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") MK_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST))) MK_DIR := $(dir $(MK_ABSPATH)) diff --git a/frontend/test/lit/lit.cfg.py b/frontend/test/lit/lit.cfg.py index 3f581303de..b1845dcc01 100644 --- a/frontend/test/lit/lit.cfg.py +++ b/frontend/test/lit/lit.cfg.py @@ -36,8 +36,7 @@ config.environment["ASAN_OPTIONS"] = "detect_leaks=0,detect_container_overflow=0" # Define substitutions used at the top of lit test files, e.g. %PYTHON. -#python_executable = getattr(config, "python_executable", "python3.10") -python_executable = "python" +python_executable = getattr(config, "python_executable", "python3.10") if "Address" in getattr(config, "llvm_use_sanitizer", ""): # With sanitized builds, Python tests require some preloading magic to run. diff --git a/mlir/Makefile b/mlir/Makefile index 68b0fc0b58..1d5a126ef6 100644 --- a/mlir/Makefile +++ b/mlir/Makefile @@ -1,4 +1,4 @@ -PYTHON?=$(shell which python) +PYTHON?=$(shell which python3) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) COMPILER_LAUNCHER?=$(shell which ccache) @@ -61,8 +61,8 @@ llvm: -DLLVM_ENABLE_PROJECTS="mlir" \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DMLIR_ENABLE_BINDINGS_PYTHON=ON \ - -DPython_EXECUTABLE=$(PYTHON) \ - -DPython_NumPy_INCLUDE_DIRS=$$($(PYTHON) -c "import numpy as np; print(np.get_include())") \ + -DPython3_EXECUTABLE=$(PYTHON) \ + -DPython3_NumPy_INCLUDE_DIRS=$$($(PYTHON) -c "import numpy as np; print(np.get_include())") \ -DCMAKE_C_COMPILER=$(C_COMPILER) \ -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) \ -DCMAKE_C_COMPILER_LAUNCHER=$(COMPILER_LAUNCHER) \ @@ -89,7 +89,7 @@ mhlo: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DMLIR_DIR=$(LLVM_BUILD_DIR)/lib/cmake/mlir \ - -DPython_EXECUTABLE=$(PYTHON) \ + -DPython3_EXECUTABLE=$(PYTHON) \ -DCMAKE_C_COMPILER=$(C_COMPILER) \ -DCMAKE_CXX_COMPILER=$(CXX_COMPILER) \ -DCMAKE_C_COMPILER_LAUNCHER=$(COMPILER_LAUNCHER) \ @@ -128,8 +128,8 @@ dialects: -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DQUANTUM_ENABLE_BINDINGS_PYTHON=ON \ - -DPython_EXECUTABLE=$(PYTHON) \ - -DPython_NumPy_INCLUDE_DIRS=$(shell $(PYTHON) -c "import numpy as np; print(np.get_include())") \ + -DPython3_EXECUTABLE=$(PYTHON) \ + -DPython3_NumPy_INCLUDE_DIRS=$(shell $(PYTHON) -c "import numpy as np; print(np.get_include())") \ -DEnzyme_DIR=$(ENZYME_BUILD_DIR) \ -DENZYME_SRC_DIR=$(MK_DIR)/Enzyme \ -DMLIR_DIR=$(LLVM_BUILD_DIR)/lib/cmake/mlir \ diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py index a56cf78a64..e51e78992b 100644 --- a/mlir/test/lit.cfg.py +++ b/mlir/test/lit.cfg.py @@ -17,8 +17,7 @@ config.test_exec_root = getattr(config, "quantum_test_dir", ".lit") # Define substitutions used at the top of lit test files, e.g. %PYTHON. -#python_executable = getattr(config, "python_executable", "python3.10") -python_executable = "python" +python_executable = getattr(config, "python_executable", "python3.10") if "Address" in getattr(config, "llvm_use_sanitizer", ""): # With sanitized builds, Python tests require some preloading magic to run. From 504f9fea143d3b283f62129ffb3b538bf4fd46ab Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 16:50:26 -0400 Subject: [PATCH 099/120] test against 352e7d1 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index dbb45c8110..3fa3c25ea7 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=6c50b77 \ + -DLIGHTNING_GIT_TAG=352e7d1 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 17fa11d83c..0def8c1d36 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=6c50b77 \ + -DLIGHTNING_GIT_TAG=352e7d1 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 52964a0120..e47e08693f 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=6c50b77 \ + -DLIGHTNING_GIT_TAG=352e7d1 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 407ca208b3..91a2ef0eec 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=6c50b77 \ + -DLIGHTNING_GIT_TAG=352e7d1 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 9079f26fe5..240eaa6175 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -1,8 +1,8 @@ -PYTHON := $(shell which python) +PYTHON?=$(shell which python3) C_COMPILER?=$(shell which clang) CXX_COMPILER?=$(shell which clang++) COMPILER_LAUNCHER?=$(shell which ccache) -NPROC?=$(shell python -c "import os; print(os.cpu_count())") +NPROC?=$(shell python3 -c "import os; print(os.cpu_count())") MK_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST))) MK_DIR := $(dir $(MK_ABSPATH)) @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=6c50b77 +LIGHTNING_GIT_TAG_VALUE?=352e7d1 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From e9be89ac7816942040092851b2f5de9aad676d65 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 17:01:58 -0400 Subject: [PATCH 100/120] test for runtime-code-cov --- .github/workflows/check-catalyst.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index cc6f7f566b..53fd59844e 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -671,10 +671,16 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Install dependencies run: | sudo apt-get update sudo apt-get -y -q install cmake ninja-build libomp-dev lcov + python -m pip install scipy pybind11 - name: Build Runtime test suite for Lightning simulator run: | From 0decf3518d098e48274598a2948dfa498dd859df Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 17:03:59 -0400 Subject: [PATCH 101/120] install scipy --- .github/workflows/check-catalyst.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 53fd59844e..3f28bb0eb6 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -598,10 +598,16 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Install dependencies run: | sudo apt-get update sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan6 + python -m pip install scipy pybind11 - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} From bc64e1a7b519c0e00a22784ffe12d6b232c7499c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Fri, 16 Aug 2024 17:17:22 -0400 Subject: [PATCH 102/120] build python venv --- .github/workflows/build-wheel-linux-x86_64.yaml | 5 +++++ .github/workflows/build-wheel-macos-arm64.yaml | 5 +++++ .github/workflows/build-wheel-macos-x86_64.yaml | 5 +++++ .github/workflows/check-catalyst.yaml | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3fa3c25ea7..7ddc6ef358 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -56,6 +56,11 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Set Ownership in Container run: | # To fix the git issue with the owner of the checkout dir diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 0def8c1d36..dff72b8ec1 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -48,6 +48,11 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + # Cache external project sources # Hopefully these can be shared with the main check-catalyst action since we don't run this # build in a container. diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index e47e08693f..4498d6dfd3 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -48,6 +48,11 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + # Cache external project sources - name: Cache LLVM Source id: cache-llvm-source diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3f28bb0eb6..cc55f9cabb 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -43,6 +43,11 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + name: Install Python + with: + python-version: '3.9' + - name: Install dependencies run: | sudo apt-get update From 41b7d858a11eadaa83fc39703d19c5d3af50ab81 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 13:18:50 -0400 Subject: [PATCH 103/120] update check-catalyst --- .github/workflows/check-catalyst.yaml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index cc55f9cabb..dd4da93490 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -43,16 +43,11 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - python -m pip install scipy pybind11 + sudo apt-get -y -q install python3 ninja-build make cmake clang libomp-dev + python3 -m pip install pybind11 scipy - name: Build Catalyst-Runtime run: | @@ -603,16 +598,11 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov libasan6 - python -m pip install scipy pybind11 + sudo apt-get -y -q install python3 cmake ninja-build libomp-dev lcov libasan6 + python3 -m pip pybind11 scipy - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -682,16 +672,11 @@ jobs: - name: Checkout the repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install cmake ninja-build libomp-dev lcov - python -m pip install scipy pybind11 + sudo apt-get -y -q install python3 cmake ninja-build libomp-dev lcov + python3 -m pip pybind11 scipy - name: Build Runtime test suite for Lightning simulator run: | From 0b0c0c4f206c1b4683aa2f1baa539ee85e485764 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 13:27:01 -0400 Subject: [PATCH 104/120] quick test --- .github/workflows/build-wheel-linux-x86_64.yaml | 7 +------ .github/workflows/build-wheel-macos-arm64.yaml | 7 +------ .github/workflows/build-wheel-macos-x86_64.yaml | 7 +------ .github/workflows/check-catalyst.yaml | 6 +++--- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 7ddc6ef358..89357c9d39 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -56,11 +56,6 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - - name: Set Ownership in Container run: | # To fix the git issue with the owner of the checkout dir @@ -282,7 +277,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja + python${{ matrix.python_version }} -m pip install numpy pybind11 scipy PyYAML cmake ninja # Add cmake and ninja to the PATH env var PYTHON_BINS=$(find /opt/_internal/cpython-${{ matrix.python_version }}.*/bin -maxdepth 1 -type d | tr '\n' ':' | sed 's/:$//') echo $PYTHON_BINS >> $GITHUB_PATH diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index dff72b8ec1..a5bd77c4e7 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -48,11 +48,6 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - # Cache external project sources # Hopefully these can be shared with the main check-catalyst action since we don't run this # build in a container. @@ -137,7 +132,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja + python${{ matrix.python_version }} -m pip install numpy pybind11 scipy PyYAML cmake ninja - name: Build LLVM / MLIR if: steps.cache-llvm-build.outputs.cache-hit != 'true' diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 4498d6dfd3..3ad2f066d2 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -48,11 +48,6 @@ jobs: - name: Checkout Catalyst repo uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.9' - # Cache external project sources - name: Cache LLVM Source id: cache-llvm-source @@ -235,7 +230,7 @@ jobs: - name: Install Dependencies (Python) run: | - python${{ matrix.python_version }} -m pip install numpy pybind11 PyYAML cmake ninja delocate + python${{ matrix.python_version }} -m pip install numpy pybind11 scipy PyYAML cmake ninja delocate - name: Get Cached LLVM Source id: cache-llvm-source diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index dd4da93490..2612e44de2 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -46,7 +46,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 ninja-build make cmake clang libomp-dev + sudo apt-get -y -q install python3 python3-pip ninja-build make cmake clang libomp-dev python3 -m pip install pybind11 scipy - name: Build Catalyst-Runtime @@ -601,7 +601,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 cmake ninja-build libomp-dev lcov libasan6 + sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov libasan6 python3 -m pip pybind11 scipy - name: Install additional dependencies (OpenQasm device) @@ -675,7 +675,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 cmake ninja-build libomp-dev lcov + sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov python3 -m pip pybind11 scipy - name: Build Runtime test suite for Lightning simulator From 17a61e8a0ef15dacc8f81d7c369bd88c8d62f2c7 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 13:34:32 -0400 Subject: [PATCH 105/120] update --- .github/workflows/check-catalyst.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 2612e44de2..3a1a1eda12 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -46,8 +46,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-pip ninja-build make cmake clang libomp-dev - python3 -m pip install pybind11 scipy + sudo apt-get -y -q install python3 python3-scipy ninja-build make cmake clang libomp-dev - name: Build Catalyst-Runtime run: | @@ -601,8 +600,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov libasan6 - python3 -m pip pybind11 scipy + sudo apt-get -y -q install python3 python3-pip python3-scipy cmake ninja-build libomp-dev lcov libasan6 - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} @@ -675,8 +673,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov - python3 -m pip pybind11 scipy + sudo apt-get -y -q install python3 python3-pip python3-scipy cmake ninja-build libomp-dev lcov - name: Build Runtime test suite for Lightning simulator run: | From b5cbc1afdac984127215aa90252f4b0db2255864 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 13:44:59 -0400 Subject: [PATCH 106/120] check --- .github/workflows/check-catalyst.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 3a1a1eda12..5e52d87ce9 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -46,7 +46,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-scipy ninja-build make cmake clang libomp-dev + sudo apt-get -y -q install ninja-build make cmake clang libomp-dev - name: Build Catalyst-Runtime run: | @@ -416,6 +416,7 @@ 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 + python3 -m pip install scipy # cuda-quantum is added manually here. # It can't be in requirements.txt as that will break # macOS requirements.txt @@ -600,7 +601,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-pip python3-scipy cmake ninja-build libomp-dev lcov libasan6 + sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov libasan6 + python3 -m pip install scipy - name: Install additional dependencies (OpenQasm device) if: ${{ matrix.backend == 'openqasm' }} From 04dca150528089c23935bc15deada46e06ffcd70 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 13:59:50 -0400 Subject: [PATCH 107/120] test against 2355a0a --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 89357c9d39..aea045bf51 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=352e7d1 \ + -DLIGHTNING_GIT_TAG=2355a0a \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index a5bd77c4e7..676e9b5758 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=352e7d1 \ + -DLIGHTNING_GIT_TAG=2355a0a \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 3ad2f066d2..7abc3bcaf1 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=352e7d1 \ + -DLIGHTNING_GIT_TAG=2355a0a \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 91a2ef0eec..df1fc832f1 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=352e7d1 \ + -DLIGHTNING_GIT_TAG=2355a0a \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 240eaa6175..fa81d3f933 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=352e7d1 +LIGHTNING_GIT_TAG_VALUE?=2355a0a BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 02be098d797ffcb89991d6620e0249d703b33d8b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 14:06:05 -0400 Subject: [PATCH 108/120] update Runtime Code Coverage --- .github/workflows/check-catalyst.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-catalyst.yaml b/.github/workflows/check-catalyst.yaml index 5e52d87ce9..2657bc0cf4 100644 --- a/.github/workflows/check-catalyst.yaml +++ b/.github/workflows/check-catalyst.yaml @@ -675,7 +675,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get -y -q install python3 python3-pip python3-scipy cmake ninja-build libomp-dev lcov + sudo apt-get -y -q install python3 python3-pip cmake ninja-build libomp-dev lcov + python3 -m pip install scipy - name: Build Runtime test suite for Lightning simulator run: | From 708068dd87303bc7656834c1aa66f9caf77a8e5b Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 14:25:27 -0400 Subject: [PATCH 109/120] test against 7d47297 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index aea045bf51..974d026207 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=2355a0a \ + -DLIGHTNING_GIT_TAG=7d47297 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 676e9b5758..04199e8359 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=2355a0a \ + -DLIGHTNING_GIT_TAG=7d47297 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 7abc3bcaf1..17db4d1c6e 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=2355a0a \ + -DLIGHTNING_GIT_TAG=7d47297 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index df1fc832f1..774e77c6a7 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=2355a0a \ + -DLIGHTNING_GIT_TAG=7d47297 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index fa81d3f933..cabb50e3df 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=2355a0a +LIGHTNING_GIT_TAG_VALUE?=7d47297 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From ddfaba955ba952f679059759d701ff950d98c4f9 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 14:39:53 -0400 Subject: [PATCH 110/120] test against a599094 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 974d026207..864a23b251 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=7d47297 \ + -DLIGHTNING_GIT_TAG=a599094 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 04199e8359..c99b58cde4 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=7d47297 \ + -DLIGHTNING_GIT_TAG=a599094 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 17db4d1c6e..6e33c7c6b8 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=7d47297 \ + -DLIGHTNING_GIT_TAG=a599094 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 774e77c6a7..e182e027f0 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=7d47297 \ + -DLIGHTNING_GIT_TAG=a599094 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index cabb50e3df..278d7f8025 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=7d47297 +LIGHTNING_GIT_TAG_VALUE?=a599094 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 360607c57a56e9c21f2ba7a23d455b9d382e86d3 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 15:29:25 -0400 Subject: [PATCH 111/120] test against 05d9e4d --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 864a23b251..3e053b0d30 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=a599094 \ + -DLIGHTNING_GIT_TAG=05d9e4d \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index c99b58cde4..6c2a9b4365 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=a599094 \ + -DLIGHTNING_GIT_TAG=05d9e4d \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 6e33c7c6b8..753b58136b 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=a599094 \ + -DLIGHTNING_GIT_TAG=05d9e4d \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index e182e027f0..8adf5d6d46 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=a599094 \ + -DLIGHTNING_GIT_TAG=05d9e4d \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 278d7f8025..4747389e1b 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=a599094 +LIGHTNING_GIT_TAG_VALUE?=05d9e4d BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 030f472faabc8a5bf77e6867840882777113c090 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 15:46:15 -0400 Subject: [PATCH 112/120] test against a3bef4c --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 3e053b0d30..f81356265a 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -341,7 +341,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=05d9e4d \ + -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 6c2a9b4365..0c27f83dd9 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=05d9e4d \ + -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 753b58136b..e79d7fe165 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=05d9e4d \ + -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 8adf5d6d46..086b7cf0b8 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=05d9e4d \ + -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 4747389e1b..99a3e7cd31 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=05d9e4d +LIGHTNING_GIT_TAG_VALUE?=a3bef4c BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 329611273e57d5c1324b55208e6884ba9c49b4b5 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 15:59:39 -0400 Subject: [PATCH 113/120] Add PYTHON_LIBRARY option --- .github/workflows/build-wheel-linux-x86_64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index f81356265a..a1ca7de1d7 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -340,6 +340,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \ + -PYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ From cdd02b48fa8159c495be860f26b9f020fb781f7c Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 16:03:56 -0400 Subject: [PATCH 114/120] quick fix --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index a1ca7de1d7..2dd621f416 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -340,7 +340,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \ - -PYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ + -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ -DLIGHTNING_GIT_TAG=a3bef4c \ -DENABLE_WARNINGS=OFF \ From d9c39217929ede829d22b4ed6a94a1b844519037 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 18:50:19 -0400 Subject: [PATCH 115/120] test against 35c3bd4 --- .github/workflows/build-wheel-linux-x86_64.yaml | 3 ++- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 2dd621f416..1047e0853d 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -340,9 +340,10 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \ + -DPYTHON_INCLUDE_DIR=$(python${{ matrix.python_version }} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ - -DLIGHTNING_GIT_TAG=a3bef4c \ + -DLIGHTNING_GIT_TAG=35c3bd4 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 0c27f83dd9..51f940f324 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=a3bef4c \ + -DLIGHTNING_GIT_TAG=35c3bd4 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index e79d7fe165..8dc20e14eb 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=a3bef4c \ + -DLIGHTNING_GIT_TAG=35c3bd4 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 086b7cf0b8..6ac829f230 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=a3bef4c \ + -DLIGHTNING_GIT_TAG=35c3bd4 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 99a3e7cd31..aac2812a62 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=a3bef4c +LIGHTNING_GIT_TAG_VALUE?=35c3bd4 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From 25fe0b7435415375db0454aaf1fc37126741f245 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 18:53:53 -0400 Subject: [PATCH 116/120] test 07626e5 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 1047e0853d..5b20b62ec7 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -343,7 +343,7 @@ jobs: -DPYTHON_INCLUDE_DIR=$(python${{ matrix.python_version }} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ - -DLIGHTNING_GIT_TAG=35c3bd4 \ + -DLIGHTNING_GIT_TAG=07626e5 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 51f940f324..4ddb5b3514 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=35c3bd4 \ + -DLIGHTNING_GIT_TAG=07626e5 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index 8dc20e14eb..bfcdabd80d 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=35c3bd4 \ + -DLIGHTNING_GIT_TAG=07626e5 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 6ac829f230..a070be9fed 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=35c3bd4 \ + -DLIGHTNING_GIT_TAG=07626e5 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index aac2812a62..c471d7c151 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=35c3bd4 +LIGHTNING_GIT_TAG_VALUE?=07626e5 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From b471aef0df80dd208dd9d6cfa87bc85a05f0e4f4 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 19:19:19 -0400 Subject: [PATCH 117/120] test against 4b40406 --- .github/workflows/build-wheel-linux-x86_64.yaml | 3 ++- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 5b20b62ec7..96e6d39216 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -340,10 +340,11 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$GITHUB_WORKSPACE/runtime-build/lib \ -DPYTHON_EXECUTABLE=$(which python${{ matrix.python_version }}) \ + -DUSE_PYTHON_HEADERS=ON \ -DPYTHON_INCLUDE_DIR=$(python${{ matrix.python_version }} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ - -DLIGHTNING_GIT_TAG=07626e5 \ + -DLIGHTNING_GIT_TAG=4b40406 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 4ddb5b3514..8670d9508e 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=07626e5 \ + -DLIGHTNING_GIT_TAG=4b40406 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index bfcdabd80d..b923938a7a 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=07626e5 \ + -DLIGHTNING_GIT_TAG=4b40406 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index a070be9fed..6115f80801 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=07626e5 \ + -DLIGHTNING_GIT_TAG=4b40406 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index c471d7c151..bb62ae3a86 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=07626e5 +LIGHTNING_GIT_TAG_VALUE?=4b40406 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From c0b1564a0e82ee8607c70b51c277f675a2953520 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 19:49:27 -0400 Subject: [PATCH 118/120] test against 4b40406 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 96e6d39216..010a91e2ef 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -344,7 +344,7 @@ jobs: -DPYTHON_INCLUDE_DIR=$(python${{ matrix.python_version }} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ - -DLIGHTNING_GIT_TAG=4b40406 \ + -DLIGHTNING_GIT_TAG=3044c13 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 8670d9508e..32c9cdb363 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=4b40406 \ + -DLIGHTNING_GIT_TAG=3044c13 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index b923938a7a..cacd32f8da 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=4b40406 \ + -DLIGHTNING_GIT_TAG=3044c13 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index 6115f80801..a637306d13 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=4b40406 \ + -DLIGHTNING_GIT_TAG=3044c13 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index bb62ae3a86..9e478833cd 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,7 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF -LIGHTNING_GIT_TAG_VALUE?=4b40406 +LIGHTNING_GIT_TAG_VALUE?=3044c13 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := "" From e53c243fc9c61a4387ce12bf45a050914f0fdce9 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Sat, 17 Aug 2024 19:58:34 -0400 Subject: [PATCH 119/120] default USE_PYTHON_HEADERS ON for lightning backend --- runtime/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/Makefile b/runtime/Makefile index 9e478833cd..85ba82e1c3 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -14,6 +14,7 @@ ENABLE_LIGHTNING?=ON ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF +USE_PYTHON_HEADERS?=ON LIGHTNING_GIT_TAG_VALUE?=3044c13 BUILD_TARGETS := rt_capi rtd_dummy From 151a4b843a026b5473066c1ec81e7703030fa1e4 Mon Sep 17 00:00:00 2001 From: Shuli Shu <08cnbj@gmail.com> Date: Mon, 19 Aug 2024 17:53:23 -0400 Subject: [PATCH 120/120] test against 77a8b21 --- .github/workflows/build-wheel-linux-x86_64.yaml | 2 +- .github/workflows/build-wheel-macos-arm64.yaml | 2 +- .github/workflows/build-wheel-macos-x86_64.yaml | 2 +- .github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh | 2 +- runtime/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheel-linux-x86_64.yaml b/.github/workflows/build-wheel-linux-x86_64.yaml index 010a91e2ef..a363d17625 100644 --- a/.github/workflows/build-wheel-linux-x86_64.yaml +++ b/.github/workflows/build-wheel-linux-x86_64.yaml @@ -344,7 +344,7 @@ jobs: -DPYTHON_INCLUDE_DIR=$(python${{ matrix.python_version }} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \ -DPYTHON_LIBRARY=$(python3${{ matrix.python_version }} -c "import sysconfig; import os; print(os.path.join(sysconfig.get_config_var('LIBDIR'), sysconfig.get_config_var('LIBRARY')))") \ -Dpybind11_DIR=$(python${{ matrix.python_version }} -c "import pybind11; print(pybind11.get_cmake_dir())") \ - -DLIGHTNING_GIT_TAG=3044c13 \ + -DLIGHTNING_GIT_TAG=77a8b21 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-arm64.yaml b/.github/workflows/build-wheel-macos-arm64.yaml index 32c9cdb363..1a36e54e64 100644 --- a/.github/workflows/build-wheel-macos-arm64.yaml +++ b/.github/workflows/build-wheel-macos-arm64.yaml @@ -301,7 +301,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=3044c13 \ + -DLIGHTNING_GIT_TAG=77a8b21 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/build-wheel-macos-x86_64.yaml b/.github/workflows/build-wheel-macos-x86_64.yaml index cacd32f8da..c831d55d93 100644 --- a/.github/workflows/build-wheel-macos-x86_64.yaml +++ b/.github/workflows/build-wheel-macos-x86_64.yaml @@ -292,7 +292,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=3044c13 \ + -DLIGHTNING_GIT_TAG=77a8b21 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh index a637306d13..26044e4efb 100644 --- a/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh +++ b/.github/workflows/scripts/linux_arm64/rh8/build_catalyst.sh @@ -45,7 +45,7 @@ cmake -S runtime -B runtime-build -G Ninja \ -DPYTHON_INCLUDE_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/include/python${PYTHON_VERSION} \ -DPYTHON_LIBRARY=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib \ -Dpybind11_DIR=/opt/_internal/cpython-${PYTHON_VERSION}.${PYTHON_SUBVERSION}/lib/python${PYTHON_VERSION}/site-packages/pybind11/share/cmake/pybind11 \ - -DLIGHTNING_GIT_TAG=3044c13 \ + -DLIGHTNING_GIT_TAG=77a8b21 \ -DENABLE_WARNINGS=OFF \ -DENABLE_OPENQASM=ON \ -DENABLE_OPENMP=OFF \ diff --git a/runtime/Makefile b/runtime/Makefile index 85ba82e1c3..d9c7ff3164 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -15,7 +15,7 @@ ENABLE_LIGHTNING_KOKKOS?=ON ENABLE_OPENQASM?=ON ENABLE_ASAN?=OFF USE_PYTHON_HEADERS?=ON -LIGHTNING_GIT_TAG_VALUE?=3044c13 +LIGHTNING_GIT_TAG_VALUE?=77a8b21 BUILD_TARGETS := rt_capi rtd_dummy TEST_TARGETS := ""