From eb96dc63d39690b99e071d0711cb1e7dfeca2bd8 Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 20:04:54 +0000 Subject: [PATCH 1/9] remove libopenblas-base --- .github/workflows/tests_linux_cpp.yml | 2 +- .github/workflows/tests_lqcpu_python.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index 88dbc7c93..321e47232 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -128,7 +128,7 @@ jobs: - name: Install dependencies run: | - sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-base libopenblas-dev ninja-build gcovr lcov + sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev ninja-build gcovr lcov python -m pip install scipy-openblas32 - name: Build and run unit tests diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml index f64d5a17c..f32bc09e8 100644 --- a/.github/workflows/tests_lqcpu_python.yml +++ b/.github/workflows/tests_lqcpu_python.yml @@ -77,7 +77,7 @@ jobs: - name: Install dependencies run: | - sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-base libopenblas-dev + sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev python -m pip install scipy-openblas32 wheel - name: Get required Python packages From 46f5d61d80789b8418f871feddd489046dd4b24c Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Thu, 16 Jan 2025 20:09:54 +0000 Subject: [PATCH 2/9] Auto update version from '0.41.0-dev2' to '0.41.0-dev3' --- pennylane_lightning/core/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index 9df0af442..29ba97e6d 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.41.0-dev2" +__version__ = "0.41.0-dev3" From 7ffb4f5a3a1e20fdbdce4aa42b66026f226dd6f0 Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 20:13:31 +0000 Subject: [PATCH 3/9] update changelog --- .github/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index e8cf40a18..1b7c0eab1 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -15,6 +15,9 @@ ### Documentation ### Bug fixes + +* Remove libopenblas-base package for Ubuntu 24 github CI + [(#1041)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1041) ### Contributors From 06c8bdb6f3ebe2a4001aeb6c7d61f04449f2a240 Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 20:24:23 +0000 Subject: [PATCH 4/9] trigger CI From 68a85819c5f714c2566996bd63a8f953bd9c926a Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 20:46:01 +0000 Subject: [PATCH 5/9] use GCC 13 --- .github/workflows/tests_linux_cpp.yml | 2 +- .github/workflows/tests_lqcpu_python.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index 321e47232..c8d28a8c9 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -30,7 +30,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 11 + GCC_VERSION: 13 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml index f32bc09e8..7ecba5df7 100644 --- a/.github/workflows/tests_lqcpu_python.yml +++ b/.github/workflows/tests_lqcpu_python.yml @@ -24,7 +24,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 11 + GCC_VERSION: 13 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" From b0f482a75def63b20c34ebf5d26f94bb094073a7 Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 20:58:44 +0000 Subject: [PATCH 6/9] gcc 12 --- .github/workflows/tests_linux_cpp.yml | 2 +- .github/workflows/tests_lqcpu_python.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index c8d28a8c9..0a96813e8 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -30,7 +30,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 13 + GCC_VERSION: 12 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml index 7ecba5df7..f8175cfe2 100644 --- a/.github/workflows/tests_lqcpu_python.yml +++ b/.github/workflows/tests_lqcpu_python.yml @@ -24,7 +24,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 13 + GCC_VERSION: 12 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" From 58c8f570544a80c356ba6c12c97c369041c36aab Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 22:11:02 +0000 Subject: [PATCH 7/9] fix --- .github/workflows/tests_linux_cpp.yml | 8 ++++---- .github/workflows/tests_lqcpu_python.yml | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index 0a96813e8..79c35fc93 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -30,7 +30,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 12 + GCC_VERSION: 13 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" @@ -85,7 +85,7 @@ jobs: cd ./Build mkdir -p ./tests/results for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}-${{ matrix.enable_kernel_avx_streaming }}-${{ matrix.enable_kernel_omp }}.info @@ -146,7 +146,7 @@ jobs: cd ./Build mkdir -p ./tests/results for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}.info @@ -232,7 +232,7 @@ jobs: cd ./Build mkdir -p ./tests/results-${{ github.job }}-${{ matrix.pl_backend }} for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results-${{ github.job }}-${{ matrix.pl_backend }}/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}.info diff --git a/.github/workflows/tests_lqcpu_python.yml b/.github/workflows/tests_lqcpu_python.yml index f8175cfe2..2d528b993 100644 --- a/.github/workflows/tests_lqcpu_python.yml +++ b/.github/workflows/tests_lqcpu_python.yml @@ -24,7 +24,7 @@ env: TF_VERSION: 2.10.0 TORCH_VERSION: 1.11.0+cpu COVERAGE_FLAGS: "--cov=pennylane_lightning --cov-report=term-missing --no-flaky-report -p no:warnings --tb=native" - GCC_VERSION: 12 + GCC_VERSION: 13 OMP_NUM_THREADS: "2" OMP_PROC_BIND: "false" @@ -144,6 +144,10 @@ jobs: name: wheel_${{ matrix.pl_backend }}-${{ matrix.blas }}.whl path: ${{ github.workspace }} + - name: Install dependencies + run: | + sudo apt-get update && sudo apt-get -y -q install libopenblas-dev + - name: Get required Python packages run: | WHEEL_NAME=$(cat ${{ github.workspace }}/${{ matrix.pl_backend }}-${{ matrix.blas }}_name.txt) From cac239427862195279a63948da303b643fece5ca Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Thu, 16 Jan 2025 22:41:51 +0000 Subject: [PATCH 8/9] update LK to ubuntu24 --- .github/workflows/tests_linux_cpp.yml | 6 +++--- .github/workflows/tests_lkcpu_python.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index 79c35fc93..ccbdd2d6d 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -174,14 +174,14 @@ jobs: uses: ./.github/workflows/build_and_cache_Kokkos_linux.yml with: runs_on: pl-4-core-large-runner - os: ubuntu-22.04 + os: ubuntu-latest cpptestswithKokkos: if: ${{ !contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) }} needs: [build_and_cache_Kokkos] strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] pl_backend: ["lightning_kokkos"] exec_model: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.exec_model) }} kokkos_version: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.kokkos_version) }} @@ -282,7 +282,7 @@ jobs: needs: [build_and_cache_Kokkos] strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] exec_model: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.exec_model) }} kokkos_version: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.kokkos_version) }} timeout-minutes: 60 diff --git a/.github/workflows/tests_lkcpu_python.yml b/.github/workflows/tests_lkcpu_python.yml index dc28f88ed..76a322299 100644 --- a/.github/workflows/tests_lkcpu_python.yml +++ b/.github/workflows/tests_lkcpu_python.yml @@ -48,14 +48,14 @@ jobs: name: "Build and cache Kokkos" uses: ./.github/workflows/build_and_cache_Kokkos_linux.yml with: - os: ubuntu-22.04 + os: ubuntu-latest kokkos_version: "4.5.00" build_lightning_kokkos_wheels: needs: [build_and_cache_Kokkos] strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] pl_backend: ["lightning_kokkos"] exec_model: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.exec_model) }} kokkos_version: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.kokkos_version) }} @@ -144,7 +144,7 @@ jobs: needs: [build_and_cache_Kokkos, build_lightning_kokkos_wheels] strategy: matrix: - os: [ubuntu-22.04] + os: [ubuntu-latest] pl_backend: ["lightning_kokkos"] group: [1, 2, 3, 4, 5, 6, 7] exec_model: ${{ fromJson(needs.build_and_cache_Kokkos.outputs.exec_model) }} From 0da48efb82a9cd4e78739dd064f42e8f2ec9265d Mon Sep 17 00:00:00 2001 From: Joseph Lee Date: Fri, 17 Jan 2025 16:44:35 +0000 Subject: [PATCH 9/9] apply shuli/ali comments --- .github/CHANGELOG.md | 2 +- .github/workflows/tests_linux_cpp.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 1b7c0eab1..c2f672a6d 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -16,7 +16,7 @@ ### Bug fixes -* Remove libopenblas-base package for Ubuntu 24 github CI +* Update Github CI to use Ubuntu 24 and remove `libopenblas-base` package. [(#1041)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1041) ### Contributors diff --git a/.github/workflows/tests_linux_cpp.yml b/.github/workflows/tests_linux_cpp.yml index ccbdd2d6d..d8097066b 100644 --- a/.github/workflows/tests_linux_cpp.yml +++ b/.github/workflows/tests_linux_cpp.yml @@ -85,7 +85,7 @@ jobs: cd ./Build mkdir -p ./tests/results for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch # Catch2 causes mismatch errors that needs to be ignored lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}-${{ matrix.enable_kernel_avx_streaming }}-${{ matrix.enable_kernel_omp }}.info @@ -146,7 +146,7 @@ jobs: cd ./Build mkdir -p ./tests/results for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch # Catch2 causes mismatch errors that needs to be ignored lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}.info @@ -232,7 +232,7 @@ jobs: cd ./Build mkdir -p ./tests/results-${{ github.job }}-${{ matrix.pl_backend }} for file in *runner ; do ./$file --order lex --reporter junit --out ./tests/results-${{ github.job }}-${{ matrix.pl_backend }}/report_$file.xml; done; - lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch + lcov --directory . -b ../pennylane_lightning/core/src --capture --output-file coverage.info --ignore-errors mismatch # Catch2 causes mismatch errors that needs to be ignored lcov --remove coverage.info '/usr/*' --output-file coverage.info mv coverage.info coverage-${{ github.job }}-${{ matrix.pl_backend }}.info