From b5cfd8176689237f5a90f37d75215298bc1390bd Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 8 Feb 2023 09:00:49 +0100 Subject: [PATCH 01/13] Update CI.yml --- .github/workflows/CI.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a91a54c7..27e8b2c7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [gcc-8, gcc-10, gcc-11, clang-9, clang-12, clang-13] + compiler: [gcc-8, gcc-10, gcc-11, clang-9, clang-12, clang-13, nvhpc-23.1] build_type: [Debug, Release] exclude: - compiler: gcc-10 @@ -27,6 +27,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Set defaults + if: startsWith(matrix.compiler, 'clang') == 'true' or startsWith(matrix.compiler, 'gcc') == 'true' run: | export GCC_VERSION=$(echo ${{ matrix.compiler }} | cut -d'-' -f2) echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV @@ -43,9 +44,9 @@ jobs: path: pfunit key: ${{ matrix.compiler }}-pfunit - name: Install pFUnit - if: startsWith(matrix.compiler, 'gcc') && steps.cache-pfunit.outputs.cache-hit != 'true' + if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'gcc')) && steps.cache-pfunit.outputs.cache-hit != 'true' env: - PFUNIT_VERSION: 4.4.1 + PFUNIT_VERSION: 4.6.3 run: | apt-get update && apt-get -y install m4 git clone --branch v${PFUNIT_VERSION} --depth 1 https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git From 26b14d9c59550a0b326d74cef1117476303a2ec3 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 8 Feb 2023 09:02:16 +0100 Subject: [PATCH 02/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 27e8b2c7..04fdf313 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Set defaults - if: startsWith(matrix.compiler, 'clang') == 'true' or startsWith(matrix.compiler, 'gcc') == 'true' + if: startsWith(matrix.compiler, 'clang') == 'true' || startsWith(matrix.compiler, 'gcc') == 'true' run: | export GCC_VERSION=$(echo ${{ matrix.compiler }} | cut -d'-' -f2) echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV From 6b8a5c2840f0871008392d778e9065dd8468f2ec Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 8 Feb 2023 09:19:23 +0100 Subject: [PATCH 03/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 04fdf313..be8e92b8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Set defaults - if: startsWith(matrix.compiler, 'clang') == 'true' || startsWith(matrix.compiler, 'gcc') == 'true' + if: startsWith(matrix.compiler, 'clang') == 'true' || startsWith(matrix.compiler, 'nvhpc') == 'true' run: | export GCC_VERSION=$(echo ${{ matrix.compiler }} | cut -d'-' -f2) echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV From 9ec66d8b35b2ff1729000f0cae6e3104fa956455 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 8 Feb 2023 09:19:53 +0100 Subject: [PATCH 04/13] Update CI.yml --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index be8e92b8..a54704a1 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Set defaults - if: startsWith(matrix.compiler, 'clang') == 'true' || startsWith(matrix.compiler, 'nvhpc') == 'true' + if: startsWith(matrix.compiler, 'clang') == 'true' || startsWith(matrix.compiler, 'gcc') == 'true' run: | export GCC_VERSION=$(echo ${{ matrix.compiler }} | cut -d'-' -f2) echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV @@ -44,7 +44,7 @@ jobs: path: pfunit key: ${{ matrix.compiler }}-pfunit - name: Install pFUnit - if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'gcc')) && steps.cache-pfunit.outputs.cache-hit != 'true' + if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'nvhpc')) && steps.cache-pfunit.outputs.cache-hit != 'true' env: PFUNIT_VERSION: 4.6.3 run: | From c986e55b5b1135f198c81e3f2999c930d81ff8e0 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 8 Feb 2023 10:24:50 +0100 Subject: [PATCH 05/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a54704a1..ccdb1a36 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -33,7 +33,7 @@ jobs: echo "FC=gfortran-${GCC_VERSION}" >> $GITHUB_ENV echo "TEST_FORTRAN=OFF" >> $GITHUB_ENV # default will be overwritten in the next step - name: Enable Fortran - if: startsWith(matrix.compiler, 'clang') == 'false' + if: startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'nvhpc') run: echo "TEST_FORTRAN=ON" >> $GITHUB_ENV - name: Install python modules run: pip3 install --user nose numpy From 066242e1b4e6c935a848bcbecfeef056a6192e0f Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 12 Apr 2023 13:02:33 +0200 Subject: [PATCH 06/13] nvhpc 23.3 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8051b37d..26147636 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ jobs: clang-10, clang-14, clang-15, - nvhpc-23.1, + nvhpc-23.3, ] build_type: [Debug, Release] exclude: From 0639adb58f7f7abe3407151dabd0dab354aed075 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Fri, 2 Jun 2023 19:14:41 +0200 Subject: [PATCH 07/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 26147636..e356f885 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ jobs: clang-10, clang-14, clang-15, - nvhpc-23.3, + nvhpc-23.5, ] build_type: [Debug, Release] exclude: From 75bf957ec2ceadb79b00ca0e255496f759c63e39 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Mon, 31 Jul 2023 13:29:41 +0200 Subject: [PATCH 08/13] Update CI.yml --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e356f885..482e6200 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ jobs: clang-10, clang-14, clang-15, - nvhpc-23.5, + nvhpc-23.7, ] build_type: [Debug, Release] exclude: @@ -52,7 +52,7 @@ jobs: - name: Install pFUnit if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'nvhpc')) && steps.cache-pfunit.outputs.cache-hit != 'true' env: - PFUNIT_VERSION: 4.6.3 + PFUNIT_VERSION: 4.7.3 run: | apt-get update && apt-get -y install m4 git clone --branch v${PFUNIT_VERSION} --depth 1 https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git From ac6385fc4ab7dd6a0a78e0a9700fe2114d59aa87 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Fri, 6 Oct 2023 13:51:35 +0200 Subject: [PATCH 09/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index be0bd6d8..53e4107b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [nvhpc-23.7] + compiler: [nvhpc-23.9] build_type: [Debug, Release] exclude: - compiler: gcc-10 From 2c9bff14c4d4d213adfec935745b349fccb3ddc5 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Tue, 28 Nov 2023 21:53:39 +0100 Subject: [PATCH 10/13] Update CI.yml --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 53e4107b..60f3586a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [nvhpc-23.9] + compiler: [nvhpc-23.11] build_type: [Debug, Release] exclude: - compiler: gcc-10 @@ -46,7 +46,7 @@ jobs: - name: Install pFUnit if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'nvhpc')) && steps.cache-pfunit.outputs.cache-hit != 'true' env: - PFUNIT_VERSION: 4.7.3 + PFUNIT_VERSION: 4.7.4 run: | apt-get update && apt-get -y install m4 git clone --branch v${PFUNIT_VERSION} --depth 1 https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git From 76238eaa6bcead253f9a546337cb370689c447fb Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 31 Jan 2024 13:04:01 +0100 Subject: [PATCH 11/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 60f3586a..009b8e17 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [nvhpc-23.11] + compiler: [nvhpc-24.1] build_type: [Debug, Release] exclude: - compiler: gcc-10 From 53aeb25209965a684787887e0662b17af25be796 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 20 Mar 2024 15:13:54 +0100 Subject: [PATCH 12/13] 24.3 --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 009b8e17..7e1acb1f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [nvhpc-24.1] + compiler: [nvhpc-24.3] build_type: [Debug, Release] exclude: - compiler: gcc-10 @@ -46,7 +46,7 @@ jobs: - name: Install pFUnit if: (startsWith(matrix.compiler, 'gcc') || startsWith(matrix.compiler, 'nvhpc')) && steps.cache-pfunit.outputs.cache-hit != 'true' env: - PFUNIT_VERSION: 4.7.4 + PFUNIT_VERSION: 4.9.0 run: | apt-get update && apt-get -y install m4 git clone --branch v${PFUNIT_VERSION} --depth 1 https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git From 4a7cf29716ceaff874579830d806cfae275f85e2 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Wed, 29 May 2024 15:00:48 +0200 Subject: [PATCH 13/13] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7e1acb1f..1bf21efb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [nvhpc-24.3] + compiler: [nvhpc-24.5] build_type: [Debug, Release] exclude: - compiler: gcc-10