Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ubuntu 24 CI: Remove libopenblas-base package and update Kokkos build OS #1041

Merged
merged 9 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
### Documentation

### Bug fixes

* Update Github CI to use Ubuntu 24 and remove `libopenblas-base` package.
[(#1041)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1041)

### Contributors

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests_linux_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
maliasadi marked this conversation as resolved.
Show resolved Hide resolved
maliasadi marked this conversation as resolved.
Show resolved Hide resolved
josephleekl marked this conversation as resolved.
Show resolved Hide resolved
OMP_NUM_THREADS: "2"
OMP_PROC_BIND: "false"

Expand Down Expand Up @@ -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 # 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

Expand Down Expand Up @@ -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
josephleekl marked this conversation as resolved.
Show resolved Hide resolved
python -m pip install scipy-openblas32

- name: Build and run unit tests
Expand All @@ -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 # 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

Expand Down Expand Up @@ -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) }}
Expand Down Expand Up @@ -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 # 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

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests_lkcpu_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down Expand Up @@ -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) }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/tests_lqcpu_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

josephleekl marked this conversation as resolved.
Show resolved Hide resolved
- name: Get required Python packages
run: |
WHEEL_NAME=$(cat ${{ github.workspace }}/${{ matrix.pl_backend }}-${{ matrix.blas }}_name.txt)
Expand Down
2 changes: 1 addition & 1 deletion pennylane_lightning/core/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.41.0-dev2"
__version__ = "0.41.0-dev3"
Loading