Skip to content

Commit

Permalink
update gcc version on workflow files
Browse files Browse the repository at this point in the history
  • Loading branch information
AmintorDusko committed Nov 2, 2022
1 parent ee213c0 commit f9c6336
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
GCC_VERSION: 10
GCC_VERSION: 11

jobs:
benchmarks:
Expand All @@ -32,7 +32,7 @@ jobs:
python-version: '3.8'

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-10 g++-10 ninja-build libopenblas-dev
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION ninja-build libopenblas-dev

- name: Build GBenchmark
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_cache_Kokkos_linux.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Cache Kokkos and Kokkos Kernels

env:
GCC_VERSION: 10
GCC_VERSION: 11

on:
workflow_call:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fetch-depth: 2

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 ninja-build gcovr lcov
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION ninja-build gcovr lcov

- name: Build and run unit tests
run: |
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
python-version: '3.8'

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION

- name: Get required Python packages
run: |
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
fetch-depth: 2

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 libopenblas-dev ninja-build gcovr lcov
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev ninja-build gcovr lcov

- name: Build and run unit tests
run: |
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
python-version: '3.8'

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 libopenblas-dev
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev

- name: Get required Python packages
run: |
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
cp -rf ${{ github.workspace}}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 ninja-build gcovr lcov
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION ninja-build gcovr lcov

- name: Build and run unit tests
run: |
Expand Down Expand Up @@ -365,7 +365,7 @@ jobs:
pwd
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION

- name: Get required Python packages
run: |
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
cp -rf ${{ github.workspace}}/Kokkos_install/${{ matrix.exec_model }}/* Kokkos/
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 libopenblas-dev ninja-build gcovr lcov
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev ninja-build gcovr lcov

- name: Build and run unit tests
run: |
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
pwd
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-11 g++-11 libopenblas-dev
run: sudo apt-get update && sudo apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION libopenblas-dev

- name: Get required Python packages
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/wheel_linux_x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ name: Wheel::Linux::x86_64
# **Why we have it**: To build wheels for pennylane-lightning installation.
# **Who does it impact**: Wheels to be uploaded to PyPI.

env:
GCC_VERSION: 11

on:
pull_request:
push:
Expand Down Expand Up @@ -49,7 +52,7 @@ jobs:
- name: Install dependencies (Ubuntu)
if: ${{ (matrix.container_img == 'ubuntu-latest') && (steps.kokkos-cache.outputs.cache-hit != 'true') }}
run: |
apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y -q install cmake gcc-11 g++-11 ninja-build git
apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y -q install cmake gcc-$GCC_VERSION g++-$GCC_VERSION ninja-build git
echo "COMPILER=g++-11" >> $GITHUB_ENV
- name: Install dependencies (CentOS)
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ RUN apt-get update \
python3-pip \
python3-venv \
python3-dev \
gcc-10 g++-10 cpp-10 \
gcc-11 g++-11 cpp-11 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
&& /usr/sbin/update-ccache-symlinks \
&& mkdir /opt/ccache \
&& ccache --set-config=cache_dir=/opt/ccache \
Expand Down

0 comments on commit f9c6336

Please sign in to comment.