From acc8fcd7b644e439963c6899955007acba676095 Mon Sep 17 00:00:00 2001 From: Minh Dao <43783196+minhqdao@users.noreply.github.com> Date: Mon, 29 Jul 2024 06:53:35 +0530 Subject: [PATCH 1/9] docs(readme): order columns of the compatibility matrix (#103) Order the columns of the compatibility matrix according to ascending compiler version number. Tackles #102. --------- Co-authored-by: minhqdao --- .github/compat/compat.csv | 16 ++++++++-------- .github/compat/wide_compat_reports.py | 18 +++++++++++++++++- README.md | 18 +++++++++--------- requirements.txt | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/.github/compat/compat.csv b/.github/compat/compat.csv index 4825c59..da351d5 100644 --- a/.github/compat/compat.csv +++ b/.github/compat/compat.csv @@ -1,10 +1,10 @@ compiler,gcc,gcc,gcc,gcc,gcc,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,lfortran,lfortran,lfortran,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc -version,10,11,12,13,9,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.10,2021.11,2021.12,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9 +version,9,10,11,12,13,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,2021.10,2021.11,2021.12,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.3,23.5,23.7,23.9,23.11 runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -macos-13,✓,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -macos-14,,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ -ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ -windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, -windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, +macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,, +macos-13,,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,, +macos-14,,,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,,,✓,✓,✓,,,,,,,, +ubuntu-20.04,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ +ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ +windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,✓,✓,,,✓,✓,✓,✓,✓,✓,✓,,,,,,,, +windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,✓,✓,,,✓,✓,✓,✓,✓,✓,✓,,,,,,,, diff --git a/.github/compat/wide_compat_reports.py b/.github/compat/wide_compat_reports.py index 6b67479..90e536e 100644 --- a/.github/compat/wide_compat_reports.py +++ b/.github/compat/wide_compat_reports.py @@ -16,7 +16,7 @@ # read long CSV df = pd.read_csv(ip) -# pivot and sort +# pivot and sort by runners df = pd.pivot_table( df, index="runner", @@ -26,6 +26,22 @@ aggfunc="first", ).sort_values(by=["runner"]) + +# group by compiler and sort by versions +grouped_versions = {} +for compiler in df.columns.get_level_values("compiler").unique(): + versions = df.loc[:, (compiler,)].columns.get_level_values("version").unique() + versions = sorted(versions, key=lambda version: tuple(map(int, version.split(".")))) + grouped_versions[compiler] = versions + +sorted_columns = [] +for compiler in grouped_versions: + sorted_columns.extend( + [(compiler, version) for version in grouped_versions[compiler]] + ) + +df = df[sorted_columns] + # write wide CSV df.to_csv(op) diff --git a/README.md b/README.md index 7f4b183..e5cf5dc 100644 --- a/README.md +++ b/README.md @@ -104,15 +104,15 @@ These are made available to subsequent workflow steps via the [`GITHUB_ENV` envi Toolchain support varies across GitHub-hosted runner images. -| runner | gcc 10 | gcc 11 | gcc 12 | gcc 13 | gcc 9 | intel 2021.1 | intel 2021.1.2 | intel 2021.2 | intel 2021.4 | intel 2022.0 | intel 2022.1 | intel 2022.2 | intel 2022.2.1 | intel 2023.0 | intel 2023.1 | intel 2023.2 | intel 2024.0 | intel 2024.1 | intel-classic 2021.1 | intel-classic 2021.1.2 | intel-classic 2021.10 | intel-classic 2021.11 | intel-classic 2021.12 | intel-classic 2021.2 | intel-classic 2021.3 | intel-classic 2021.4 | intel-classic 2021.5 | intel-classic 2021.6 | intel-classic 2021.7 | intel-classic 2021.7.1 | intel-classic 2021.8 | intel-classic 2021.9 | lfortran 0.31.0 | lfortran 0.32.0 | lfortran 0.33.0 | nvidia-hpc 20.11 | nvidia-hpc 21.11 | nvidia-hpc 22.11 | nvidia-hpc 23.11 | nvidia-hpc 23.3 | nvidia-hpc 23.5 | nvidia-hpc 23.7 | nvidia-hpc 23.9 | -|:-------------|:----------------|:----------------|:----------------|:----------------|:---------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------------|:--------------------------------|:-------------------------------|:-------------------------------|:-------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|:--------------------------|:--------------------------|:--------------------------|:-------------------------|:-------------------------|:-------------------------|:-------------------------| -| macos-12 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| macos-13 | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| macos-14 | | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| ubuntu-20.04 | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| ubuntu-22.04 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| windows-2019 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| windows-2022 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| runner | gcc 9 | gcc 10 | gcc 11 | gcc 12 | gcc 13 | intel 2021.1 | intel 2021.1.2 | intel 2021.2 | intel 2021.4 | intel 2022.0 | intel 2022.1 | intel 2022.2 | intel 2022.2.1 | intel 2023.0 | intel 2023.1 | intel 2023.2 | intel 2024.0 | intel 2024.1 | intel-classic 2021.1 | intel-classic 2021.1.2 | intel-classic 2021.2 | intel-classic 2021.3 | intel-classic 2021.4 | intel-classic 2021.5 | intel-classic 2021.6 | intel-classic 2021.7 | intel-classic 2021.7.1 | intel-classic 2021.8 | intel-classic 2021.9 | intel-classic 2021.10 | intel-classic 2021.11 | intel-classic 2021.12 | lfortran 0.31.0 | lfortran 0.32.0 | lfortran 0.33.0 | nvidia-hpc 20.11 | nvidia-hpc 21.11 | nvidia-hpc 22.11 | nvidia-hpc 23.3 | nvidia-hpc 23.5 | nvidia-hpc 23.7 | nvidia-hpc 23.9 | nvidia-hpc 23.11 | +|:-------------|:---------------|:----------------|:----------------|:----------------|:----------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:-------------------------------|:-------------------------------|:-------------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|:--------------------------|:--------------------------|:-------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------| +| macos-12 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | | | | | +| macos-13 | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | | | | | +| macos-14 | | | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | | | | | +| ubuntu-20.04 | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| ubuntu-22.04 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| windows-2019 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| windows-2022 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | **Note:** Intel's `ifx` compiler is not supported on macOS, so the `intel` option redirects to `intel-classic` (`ifort`). diff --git a/requirements.txt b/requirements.txt index debfb47..ec752b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ pandas -tabulate \ No newline at end of file +tabulate From bc6c3ce7fde1dd48b3bfa1d777c51f534421b8f2 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 22 Aug 2024 11:59:21 +0200 Subject: [PATCH 2/9] export FC only once --- setup-fortran.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 6e3f483..65b9a34 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -413,21 +413,6 @@ install_intel_apt() fi source /opt/intel/oneapi/setvars.sh - - if $classic; then - export FC="ifort" - export CC="icc" - export CXX="icpc" - else - export FC="ifx" - export CC="icx" - export CXX="icpx" - fi - if $install_mkl; then - export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64" - export MKLROOT="$ONEAPI_ROOT/mkl/latest" - fi - export_intel_vars } From 8f61302cda1aba4a3308161f2881ba39fae8b6ca Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 10:15:10 +0200 Subject: [PATCH 3/9] try without mkl library install --- .github/workflows/test.yml | 3 ++- action.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21a5bd5..107e8a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,7 +75,8 @@ jobs: with: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - install_mkl: true + # install_mkl: true + install_mkl: false # - name: Debug with tmate # uses: mxschmitt/action-tmate@v3 diff --git a/action.yml b/action.yml index c9d65cd..847fd69 100644 --- a/action.yml +++ b/action.yml @@ -1,4 +1,4 @@ -name: "Setup Fortran and libraries" +name: "Setup Fortran and math libraries" description: "Setup Fortran compiler and toolchain" inputs: compiler: From bb4ae341cee0333b20bcf11df1c332a694ecd4f6 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 10:15:39 +0200 Subject: [PATCH 4/9] do not test for mkl install --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 107e8a9..b32530a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,16 +88,16 @@ jobs: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - - name: Test MKL libraries + # - name: Test MKL libraries # we could also exclude 2021.5 for all macos versions here # this needs refactoring at some point - should the install # fail if no mkl version exists? - if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' - uses: ./.github/actions/test-mkl - with: - compiler: ${{ matrix.toolchain.compiler }} - version: ${{ matrix.toolchain.version }} - install_mkl: true + # if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' + # uses: ./.github/actions/test-mkl + # with: + # compiler: ${{ matrix.toolchain.compiler }} + # version: ${{ matrix.toolchain.version }} + # install_mkl: true - name: Test C compiler continue-on-error: true From efe9926eee8a420037513cf1bb31adebae72496f Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 10:52:01 +0200 Subject: [PATCH 5/9] do install mkl, check vars file --- .github/compat/matrix.yml | 118 ++++++++++++++++++------------------- .github/workflows/test.yml | 4 +- setup-fortran.sh | 4 ++ 3 files changed, 65 insertions(+), 61 deletions(-) diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml index e4addd1..02ff11f 100644 --- a/.github/compat/matrix.yml +++ b/.github/compat/matrix.yml @@ -1,70 +1,70 @@ os: - ubuntu-22.04 - ubuntu-20.04 - - macos-14 - - macos-13 - - macos-12 - - windows-2022 - - windows-2019 + # - macos-14 + # - macos-13 + # - macos-12 + # - windows-2022 + # - windows-2019 toolchain: - - {compiler: gcc, version: 13} - - {compiler: gcc, version: 12} - - {compiler: gcc, version: 11} - - {compiler: gcc, version: 10} - - {compiler: gcc, version: 9} - - {compiler: intel, version: '2024.1'} - - {compiler: intel, version: '2024.0'} - - {compiler: intel, version: '2023.2'} - - {compiler: intel, version: '2023.1'} - - {compiler: intel, version: '2023.0'} - - {compiler: intel, version: '2022.2.1'} - - {compiler: intel, version: '2022.2'} - - {compiler: intel, version: '2022.1'} - - {compiler: intel, version: '2022.0'} - - {compiler: intel, version: '2021.4'} - - {compiler: intel, version: '2021.2'} + # - {compiler: gcc, version: 13} + # - {compiler: gcc, version: 12} + # - {compiler: gcc, version: 11} + # - {compiler: gcc, version: 10} + # - {compiler: gcc, version: 9} + # - {compiler: intel, version: '2024.1'} + # - {compiler: intel, version: '2024.0'} + # - {compiler: intel, version: '2023.2'} + # - {compiler: intel, version: '2023.1'} + # - {compiler: intel, version: '2023.0'} + # - {compiler: intel, version: '2022.2.1'} + # - {compiler: intel, version: '2022.2'} + # - {compiler: intel, version: '2022.1'} + # - {compiler: intel, version: '2022.0'} + # - {compiler: intel, version: '2021.4'} + # - {compiler: intel, version: '2021.2'} - {compiler: intel, version: '2021.1.2'} - {compiler: intel, version: '2021.1'} - - {compiler: intel-classic, version: '2021.12'} - - {compiler: intel-classic, version: '2021.11'} - - {compiler: intel-classic, version: '2021.10'} - - {compiler: intel-classic, version: '2021.9'} - - {compiler: intel-classic, version: '2021.8'} - - {compiler: intel-classic, version: '2021.7.1'} - - {compiler: intel-classic, version: '2021.7'} - - {compiler: intel-classic, version: '2021.6'} - - {compiler: intel-classic, version: '2021.5'} - - {compiler: intel-classic, version: '2021.4'} - - {compiler: intel-classic, version: '2021.3'} - - {compiler: intel-classic, version: '2021.2'} + # - {compiler: intel-classic, version: '2021.12'} + # - {compiler: intel-classic, version: '2021.11'} + # - {compiler: intel-classic, version: '2021.10'} + # - {compiler: intel-classic, version: '2021.9'} + # - {compiler: intel-classic, version: '2021.8'} + # - {compiler: intel-classic, version: '2021.7.1'} + # - {compiler: intel-classic, version: '2021.7'} + # - {compiler: intel-classic, version: '2021.6'} + # - {compiler: intel-classic, version: '2021.5'} + # - {compiler: intel-classic, version: '2021.4'} + # - {compiler: intel-classic, version: '2021.3'} + # - {compiler: intel-classic, version: '2021.2'} - {compiler: intel-classic, version: '2021.1.2'} - {compiler: intel-classic, version: '2021.1'} - - {compiler: lfortran, version: '0.31.0'} - - {compiler: lfortran, version: '0.32.0'} - - {compiler: lfortran, version: '0.33.0'} - - {compiler: nvidia-hpc, version: '23.11'} - - {compiler: nvidia-hpc, version: '23.9'} - - {compiler: nvidia-hpc, version: '23.7'} - - {compiler: nvidia-hpc, version: '23.5'} - - {compiler: nvidia-hpc, version: '23.3'} - - {compiler: nvidia-hpc, version: '23.1'} - - {compiler: nvidia-hpc, version: '22.11'} - - {compiler: nvidia-hpc, version: '22.9'} - - {compiler: nvidia-hpc, version: '22.7'} - - {compiler: nvidia-hpc, version: '22.5'} - - {compiler: nvidia-hpc, version: '22.3'} - - {compiler: nvidia-hpc, version: '22.2'} - - {compiler: nvidia-hpc, version: '22.1'} - - {compiler: nvidia-hpc, version: '21.11'} - - {compiler: nvidia-hpc, version: '21.9'} - - {compiler: nvidia-hpc, version: '21.7'} - - {compiler: nvidia-hpc, version: '21.5'} - - {compiler: nvidia-hpc, version: '21.3'} - - {compiler: nvidia-hpc, version: '21.2'} - - {compiler: nvidia-hpc, version: '21.1'} - - {compiler: nvidia-hpc, version: '20.11'} - - {compiler: nvidia-hpc, version: '20.9'} - - {compiler: nvidia-hpc, version: '20.7'} + # - {compiler: lfortran, version: '0.31.0'} + # - {compiler: lfortran, version: '0.32.0'} + # - {compiler: lfortran, version: '0.33.0'} + # - {compiler: nvidia-hpc, version: '23.11'} + # - {compiler: nvidia-hpc, version: '23.9'} + # - {compiler: nvidia-hpc, version: '23.7'} + # - {compiler: nvidia-hpc, version: '23.5'} + # - {compiler: nvidia-hpc, version: '23.3'} + # - {compiler: nvidia-hpc, version: '23.1'} + # - {compiler: nvidia-hpc, version: '22.11'} + # - {compiler: nvidia-hpc, version: '22.9'} + # - {compiler: nvidia-hpc, version: '22.7'} + # - {compiler: nvidia-hpc, version: '22.5'} + # - {compiler: nvidia-hpc, version: '22.3'} + # - {compiler: nvidia-hpc, version: '22.2'} + # - {compiler: nvidia-hpc, version: '22.1'} + # - {compiler: nvidia-hpc, version: '21.11'} + # - {compiler: nvidia-hpc, version: '21.9'} + # - {compiler: nvidia-hpc, version: '21.7'} + # - {compiler: nvidia-hpc, version: '21.5'} + # - {compiler: nvidia-hpc, version: '21.3'} + # - {compiler: nvidia-hpc, version: '21.2'} + # - {compiler: nvidia-hpc, version: '21.1'} + # - {compiler: nvidia-hpc, version: '20.11'} + # - {compiler: nvidia-hpc, version: '20.9'} + # - {compiler: nvidia-hpc, version: '20.7'} exclude: # intel-classic >= 2021.10.0 not available for mac - os: macos-14 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b32530a..0dac2c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,8 +75,8 @@ jobs: with: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - # install_mkl: true - install_mkl: false + install_mkl: true + # install_mkl: false # - name: Debug with tmate # uses: mxschmitt/action-tmate@v3 diff --git a/setup-fortran.sh b/setup-fortran.sh index 65b9a34..dfc1fa1 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -408,9 +408,13 @@ install_intel_apt() intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version ;; esac + cat /opt/intel/oneapi/setvars.sh if $install_mkl; then + echo "Installing Intel oneAPI MKL $mkl_version..." sudo apt-get install intel-oneapi-mkl-$mkl_version fi + cat /opt/intel/oneapi/setvars.sh + source /opt/intel/oneapi/setvars.sh export_intel_vars From ab9a3b69fafa43071b925c3e46f7cc0289690b2a Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 11:09:32 +0200 Subject: [PATCH 6/9] change order of install and source --- .github/compat/long_compat.csv | 231 +-------------------------------- setup-fortran.sh | 6 +- 2 files changed, 2 insertions(+), 235 deletions(-) diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index 4b63a3c..145dab5 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,238 +1,9 @@ runner,compiler,version,support -macos-12,gcc,10,✓ -macos-12,gcc,11,✓ -macos-12,gcc,12,✓ -macos-12,gcc,13,✓ -macos-12,gcc,9,✓ -macos-12,intel-classic,2021.1.2, -macos-12,intel-classic,2021.1,✓ -macos-12,intel-classic,2021.10,✓ -macos-12,intel-classic,2021.2,✓ -macos-12,intel-classic,2021.3,✓ -macos-12,intel-classic,2021.4,✓ -macos-12,intel-classic,2021.5,✓ -macos-12,intel-classic,2021.6,✓ -macos-12,intel-classic,2021.7.1, -macos-12,intel-classic,2021.7,✓ -macos-12,intel-classic,2021.8,✓ -macos-12,intel-classic,2021.9,✓ -macos-12,lfortran,0.31.0,✓ -macos-12,lfortran,0.32.0,✓ -macos-12,lfortran,0.33.0,✓ -macos-13,gcc,10, -macos-13,gcc,11, -macos-13,gcc,12, -macos-13,gcc,13, -macos-13,gcc,9, -macos-13,intel-classic,2021.1.2, -macos-13,intel-classic,2021.1,✓ -macos-13,intel-classic,2021.10,✓ -macos-13,intel-classic,2021.2,✓ -macos-13,intel-classic,2021.3,✓ -macos-13,intel-classic,2021.4,✓ -macos-13,intel-classic,2021.5,✓ -macos-13,intel-classic,2021.6,✓ -macos-13,intel-classic,2021.7.1, -macos-13,intel-classic,2021.7,✓ -macos-13,intel-classic,2021.8,✓ -macos-13,intel-classic,2021.9,✓ -macos-13,lfortran,0.31.0,✓ -macos-13,lfortran,0.32.0,✓ -macos-13,lfortran,0.33.0,✓ -macos-14,gcc,11, -macos-14,gcc,12, -macos-14,gcc,13, -macos-14,intel-classic,2021.1.2, -macos-14,intel-classic,2021.1,✓ -macos-14,intel-classic,2021.10,✓ -macos-14,intel-classic,2021.2,✓ -macos-14,intel-classic,2021.3,✓ -macos-14,intel-classic,2021.4,✓ -macos-14,intel-classic,2021.5,✓ -macos-14,intel-classic,2021.6,✓ -macos-14,intel-classic,2021.7.1, -macos-14,intel-classic,2021.7,✓ -macos-14,intel-classic,2021.8,✓ -macos-14,intel-classic,2021.9,✓ -macos-14,lfortran,0.31.0,✓ -macos-14,lfortran,0.32.0,✓ -macos-14,lfortran,0.33.0,✓ -ubuntu-20.04,gcc,10,✓ -ubuntu-20.04,gcc,11,✓ -ubuntu-20.04,gcc,12, -ubuntu-20.04,gcc,13,✓ -ubuntu-20.04,gcc,9,✓ ubuntu-20.04,intel-classic,2021.1.2,✓ ubuntu-20.04,intel-classic,2021.1,✓ -ubuntu-20.04,intel-classic,2021.10,✓ -ubuntu-20.04,intel-classic,2021.11,✓ -ubuntu-20.04,intel-classic,2021.12,✓ -ubuntu-20.04,intel-classic,2021.2,✓ -ubuntu-20.04,intel-classic,2021.3, -ubuntu-20.04,intel-classic,2021.4,✓ -ubuntu-20.04,intel-classic,2021.5,✓ -ubuntu-20.04,intel-classic,2021.6,✓ -ubuntu-20.04,intel-classic,2021.7.1,✓ -ubuntu-20.04,intel-classic,2021.7,✓ -ubuntu-20.04,intel-classic,2021.8,✓ -ubuntu-20.04,intel-classic,2021.9,✓ ubuntu-20.04,intel,2021.1.2,✓ ubuntu-20.04,intel,2021.1,✓ -ubuntu-20.04,intel,2021.2,✓ -ubuntu-20.04,intel,2021.4,✓ -ubuntu-20.04,intel,2022.0,✓ -ubuntu-20.04,intel,2022.1,✓ -ubuntu-20.04,intel,2022.2.1,✓ -ubuntu-20.04,intel,2022.2,✓ -ubuntu-20.04,intel,2023.0,✓ -ubuntu-20.04,intel,2023.1,✓ -ubuntu-20.04,intel,2023.2,✓ -ubuntu-20.04,intel,2024.0,✓ -ubuntu-20.04,intel,2024.1,✓ -ubuntu-20.04,lfortran,0.31.0,✓ -ubuntu-20.04,lfortran,0.32.0,✓ -ubuntu-20.04,lfortran,0.33.0,✓ -ubuntu-20.04,nvidia-hpc,20.11,✓ -ubuntu-20.04,nvidia-hpc,20.7, -ubuntu-20.04,nvidia-hpc,20.9, -ubuntu-20.04,nvidia-hpc,21.1, -ubuntu-20.04,nvidia-hpc,21.11,✓ -ubuntu-20.04,nvidia-hpc,21.3, -ubuntu-20.04,nvidia-hpc,21.5, -ubuntu-20.04,nvidia-hpc,21.7, -ubuntu-20.04,nvidia-hpc,21.9, -ubuntu-20.04,nvidia-hpc,22.1, -ubuntu-20.04,nvidia-hpc,22.11,✓ -ubuntu-20.04,nvidia-hpc,22.2, -ubuntu-20.04,nvidia-hpc,22.3, -ubuntu-20.04,nvidia-hpc,22.5, -ubuntu-20.04,nvidia-hpc,22.7, -ubuntu-20.04,nvidia-hpc,22.9, -ubuntu-20.04,nvidia-hpc,23.1, -ubuntu-20.04,nvidia-hpc,23.11,✓ -ubuntu-20.04,nvidia-hpc,23.3,✓ -ubuntu-20.04,nvidia-hpc,23.5,✓ -ubuntu-20.04,nvidia-hpc,23.7,✓ -ubuntu-20.04,nvidia-hpc,23.9,✓ -ubuntu-22.04,gcc,10,✓ -ubuntu-22.04,gcc,11,✓ -ubuntu-22.04,gcc,12,✓ -ubuntu-22.04,gcc,13,✓ -ubuntu-22.04,gcc,9,✓ ubuntu-22.04,intel-classic,2021.1.2,✓ ubuntu-22.04,intel-classic,2021.1,✓ -ubuntu-22.04,intel-classic,2021.10,✓ -ubuntu-22.04,intel-classic,2021.11,✓ -ubuntu-22.04,intel-classic,2021.12,✓ -ubuntu-22.04,intel-classic,2021.2,✓ -ubuntu-22.04,intel-classic,2021.3, -ubuntu-22.04,intel-classic,2021.4,✓ -ubuntu-22.04,intel-classic,2021.5,✓ -ubuntu-22.04,intel-classic,2021.6,✓ -ubuntu-22.04,intel-classic,2021.7.1,✓ -ubuntu-22.04,intel-classic,2021.7,✓ -ubuntu-22.04,intel-classic,2021.8,✓ -ubuntu-22.04,intel-classic,2021.9,✓ ubuntu-22.04,intel,2021.1.2,✓ -ubuntu-22.04,intel,2021.1,✓ -ubuntu-22.04,intel,2021.2,✓ -ubuntu-22.04,intel,2021.4,✓ -ubuntu-22.04,intel,2022.0,✓ -ubuntu-22.04,intel,2022.1,✓ -ubuntu-22.04,intel,2022.2.1,✓ -ubuntu-22.04,intel,2022.2,✓ -ubuntu-22.04,intel,2023.0,✓ -ubuntu-22.04,intel,2023.1,✓ -ubuntu-22.04,intel,2023.2,✓ -ubuntu-22.04,intel,2024.0,✓ -ubuntu-22.04,intel,2024.1,✓ -ubuntu-22.04,lfortran,0.31.0,✓ -ubuntu-22.04,lfortran,0.32.0,✓ -ubuntu-22.04,lfortran,0.33.0,✓ -ubuntu-22.04,nvidia-hpc,20.11,✓ -ubuntu-22.04,nvidia-hpc,20.7, -ubuntu-22.04,nvidia-hpc,20.9, -ubuntu-22.04,nvidia-hpc,21.1, -ubuntu-22.04,nvidia-hpc,21.11,✓ -ubuntu-22.04,nvidia-hpc,21.7, -ubuntu-22.04,nvidia-hpc,21.9, -ubuntu-22.04,nvidia-hpc,22.11,✓ -ubuntu-22.04,nvidia-hpc,22.5, -ubuntu-22.04,nvidia-hpc,22.7, -ubuntu-22.04,nvidia-hpc,22.9, -ubuntu-22.04,nvidia-hpc,23.1, -ubuntu-22.04,nvidia-hpc,23.11,✓ -ubuntu-22.04,nvidia-hpc,23.3,✓ -ubuntu-22.04,nvidia-hpc,23.5,✓ -ubuntu-22.04,nvidia-hpc,23.7,✓ -ubuntu-22.04,nvidia-hpc,23.9,✓ -windows-2019,gcc,10,✓ -windows-2019,gcc,11,✓ -windows-2019,gcc,12,✓ -windows-2019,gcc,13,✓ -windows-2019,gcc,9,✓ -windows-2019,intel-classic,2021.1.2, -windows-2019,intel-classic,2021.1, -windows-2019,intel-classic,2021.10,✓ -windows-2019,intel-classic,2021.11,✓ -windows-2019,intel-classic,2021.12,✓ -windows-2019,intel-classic,2021.2, -windows-2019,intel-classic,2021.3, -windows-2019,intel-classic,2021.4, -windows-2019,intel-classic,2021.5, -windows-2019,intel-classic,2021.6,✓ -windows-2019,intel-classic,2021.7.1, -windows-2019,intel-classic,2021.7,✓ -windows-2019,intel-classic,2021.8, -windows-2019,intel-classic,2021.9,✓ -windows-2019,intel,2021.1.2, -windows-2019,intel,2021.1, -windows-2019,intel,2021.2, -windows-2019,intel,2021.4, -windows-2019,intel,2022.0, -windows-2019,intel,2022.1,✓ -windows-2019,intel,2022.2.1, -windows-2019,intel,2022.2,✓ -windows-2019,intel,2023.0, -windows-2019,intel,2023.1,✓ -windows-2019,intel,2023.2,✓ -windows-2019,intel,2024.0,✓ -windows-2019,intel,2024.1,✓ -windows-2019,lfortran,0.31.0,✓ -windows-2019,lfortran,0.32.0,✓ -windows-2019,lfortran,0.33.0,✓ -windows-2022,gcc,10,✓ -windows-2022,gcc,11,✓ -windows-2022,gcc,12,✓ -windows-2022,gcc,13,✓ -windows-2022,gcc,9,✓ -windows-2022,intel-classic,2021.1.2, -windows-2022,intel-classic,2021.1, -windows-2022,intel-classic,2021.10,✓ -windows-2022,intel-classic,2021.11,✓ -windows-2022,intel-classic,2021.12,✓ -windows-2022,intel-classic,2021.2, -windows-2022,intel-classic,2021.3, -windows-2022,intel-classic,2021.4, -windows-2022,intel-classic,2021.5, -windows-2022,intel-classic,2021.6,✓ -windows-2022,intel-classic,2021.7.1, -windows-2022,intel-classic,2021.7,✓ -windows-2022,intel-classic,2021.8, -windows-2022,intel-classic,2021.9,✓ -windows-2022,intel,2021.1.2, -windows-2022,intel,2021.1, -windows-2022,intel,2021.2, -windows-2022,intel,2021.4, -windows-2022,intel,2022.0, -windows-2022,intel,2022.1,✓ -windows-2022,intel,2022.2.1, -windows-2022,intel,2022.2,✓ -windows-2022,intel,2023.0, -windows-2022,intel,2023.1,✓ -windows-2022,intel,2023.2,✓ -windows-2022,intel,2024.0,✓ -windows-2022,intel,2024.1,✓ -windows-2022,lfortran,0.31.0,✓ -windows-2022,lfortran,0.32.0,✓ -windows-2022,lfortran,0.33.0,✓ +ubuntu-22.04,intel,2021.1,✓ \ No newline at end of file diff --git a/setup-fortran.sh b/setup-fortran.sh index dfc1fa1..813846d 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -408,15 +408,11 @@ install_intel_apt() intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version ;; esac - cat /opt/intel/oneapi/setvars.sh + source /opt/intel/oneapi/setvars.sh if $install_mkl; then echo "Installing Intel oneAPI MKL $mkl_version..." sudo apt-get install intel-oneapi-mkl-$mkl_version fi - cat /opt/intel/oneapi/setvars.sh - - - source /opt/intel/oneapi/setvars.sh export_intel_vars } From 4047c6f03599213f294d1b7db24505fc8f4c6fb6 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 11:47:50 +0200 Subject: [PATCH 7/9] change order of install to let setvars prevail --- .github/compat/long_compat.csv | 231 ++++++++++++++++++++++++++++++++- .github/compat/matrix.yml | 118 ++++++++--------- setup-fortran.sh | 9 +- 3 files changed, 294 insertions(+), 64 deletions(-) diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index 145dab5..4b63a3c 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,9 +1,238 @@ runner,compiler,version,support +macos-12,gcc,10,✓ +macos-12,gcc,11,✓ +macos-12,gcc,12,✓ +macos-12,gcc,13,✓ +macos-12,gcc,9,✓ +macos-12,intel-classic,2021.1.2, +macos-12,intel-classic,2021.1,✓ +macos-12,intel-classic,2021.10,✓ +macos-12,intel-classic,2021.2,✓ +macos-12,intel-classic,2021.3,✓ +macos-12,intel-classic,2021.4,✓ +macos-12,intel-classic,2021.5,✓ +macos-12,intel-classic,2021.6,✓ +macos-12,intel-classic,2021.7.1, +macos-12,intel-classic,2021.7,✓ +macos-12,intel-classic,2021.8,✓ +macos-12,intel-classic,2021.9,✓ +macos-12,lfortran,0.31.0,✓ +macos-12,lfortran,0.32.0,✓ +macos-12,lfortran,0.33.0,✓ +macos-13,gcc,10, +macos-13,gcc,11, +macos-13,gcc,12, +macos-13,gcc,13, +macos-13,gcc,9, +macos-13,intel-classic,2021.1.2, +macos-13,intel-classic,2021.1,✓ +macos-13,intel-classic,2021.10,✓ +macos-13,intel-classic,2021.2,✓ +macos-13,intel-classic,2021.3,✓ +macos-13,intel-classic,2021.4,✓ +macos-13,intel-classic,2021.5,✓ +macos-13,intel-classic,2021.6,✓ +macos-13,intel-classic,2021.7.1, +macos-13,intel-classic,2021.7,✓ +macos-13,intel-classic,2021.8,✓ +macos-13,intel-classic,2021.9,✓ +macos-13,lfortran,0.31.0,✓ +macos-13,lfortran,0.32.0,✓ +macos-13,lfortran,0.33.0,✓ +macos-14,gcc,11, +macos-14,gcc,12, +macos-14,gcc,13, +macos-14,intel-classic,2021.1.2, +macos-14,intel-classic,2021.1,✓ +macos-14,intel-classic,2021.10,✓ +macos-14,intel-classic,2021.2,✓ +macos-14,intel-classic,2021.3,✓ +macos-14,intel-classic,2021.4,✓ +macos-14,intel-classic,2021.5,✓ +macos-14,intel-classic,2021.6,✓ +macos-14,intel-classic,2021.7.1, +macos-14,intel-classic,2021.7,✓ +macos-14,intel-classic,2021.8,✓ +macos-14,intel-classic,2021.9,✓ +macos-14,lfortran,0.31.0,✓ +macos-14,lfortran,0.32.0,✓ +macos-14,lfortran,0.33.0,✓ +ubuntu-20.04,gcc,10,✓ +ubuntu-20.04,gcc,11,✓ +ubuntu-20.04,gcc,12, +ubuntu-20.04,gcc,13,✓ +ubuntu-20.04,gcc,9,✓ ubuntu-20.04,intel-classic,2021.1.2,✓ ubuntu-20.04,intel-classic,2021.1,✓ +ubuntu-20.04,intel-classic,2021.10,✓ +ubuntu-20.04,intel-classic,2021.11,✓ +ubuntu-20.04,intel-classic,2021.12,✓ +ubuntu-20.04,intel-classic,2021.2,✓ +ubuntu-20.04,intel-classic,2021.3, +ubuntu-20.04,intel-classic,2021.4,✓ +ubuntu-20.04,intel-classic,2021.5,✓ +ubuntu-20.04,intel-classic,2021.6,✓ +ubuntu-20.04,intel-classic,2021.7.1,✓ +ubuntu-20.04,intel-classic,2021.7,✓ +ubuntu-20.04,intel-classic,2021.8,✓ +ubuntu-20.04,intel-classic,2021.9,✓ ubuntu-20.04,intel,2021.1.2,✓ ubuntu-20.04,intel,2021.1,✓ +ubuntu-20.04,intel,2021.2,✓ +ubuntu-20.04,intel,2021.4,✓ +ubuntu-20.04,intel,2022.0,✓ +ubuntu-20.04,intel,2022.1,✓ +ubuntu-20.04,intel,2022.2.1,✓ +ubuntu-20.04,intel,2022.2,✓ +ubuntu-20.04,intel,2023.0,✓ +ubuntu-20.04,intel,2023.1,✓ +ubuntu-20.04,intel,2023.2,✓ +ubuntu-20.04,intel,2024.0,✓ +ubuntu-20.04,intel,2024.1,✓ +ubuntu-20.04,lfortran,0.31.0,✓ +ubuntu-20.04,lfortran,0.32.0,✓ +ubuntu-20.04,lfortran,0.33.0,✓ +ubuntu-20.04,nvidia-hpc,20.11,✓ +ubuntu-20.04,nvidia-hpc,20.7, +ubuntu-20.04,nvidia-hpc,20.9, +ubuntu-20.04,nvidia-hpc,21.1, +ubuntu-20.04,nvidia-hpc,21.11,✓ +ubuntu-20.04,nvidia-hpc,21.3, +ubuntu-20.04,nvidia-hpc,21.5, +ubuntu-20.04,nvidia-hpc,21.7, +ubuntu-20.04,nvidia-hpc,21.9, +ubuntu-20.04,nvidia-hpc,22.1, +ubuntu-20.04,nvidia-hpc,22.11,✓ +ubuntu-20.04,nvidia-hpc,22.2, +ubuntu-20.04,nvidia-hpc,22.3, +ubuntu-20.04,nvidia-hpc,22.5, +ubuntu-20.04,nvidia-hpc,22.7, +ubuntu-20.04,nvidia-hpc,22.9, +ubuntu-20.04,nvidia-hpc,23.1, +ubuntu-20.04,nvidia-hpc,23.11,✓ +ubuntu-20.04,nvidia-hpc,23.3,✓ +ubuntu-20.04,nvidia-hpc,23.5,✓ +ubuntu-20.04,nvidia-hpc,23.7,✓ +ubuntu-20.04,nvidia-hpc,23.9,✓ +ubuntu-22.04,gcc,10,✓ +ubuntu-22.04,gcc,11,✓ +ubuntu-22.04,gcc,12,✓ +ubuntu-22.04,gcc,13,✓ +ubuntu-22.04,gcc,9,✓ ubuntu-22.04,intel-classic,2021.1.2,✓ ubuntu-22.04,intel-classic,2021.1,✓ +ubuntu-22.04,intel-classic,2021.10,✓ +ubuntu-22.04,intel-classic,2021.11,✓ +ubuntu-22.04,intel-classic,2021.12,✓ +ubuntu-22.04,intel-classic,2021.2,✓ +ubuntu-22.04,intel-classic,2021.3, +ubuntu-22.04,intel-classic,2021.4,✓ +ubuntu-22.04,intel-classic,2021.5,✓ +ubuntu-22.04,intel-classic,2021.6,✓ +ubuntu-22.04,intel-classic,2021.7.1,✓ +ubuntu-22.04,intel-classic,2021.7,✓ +ubuntu-22.04,intel-classic,2021.8,✓ +ubuntu-22.04,intel-classic,2021.9,✓ ubuntu-22.04,intel,2021.1.2,✓ -ubuntu-22.04,intel,2021.1,✓ \ No newline at end of file +ubuntu-22.04,intel,2021.1,✓ +ubuntu-22.04,intel,2021.2,✓ +ubuntu-22.04,intel,2021.4,✓ +ubuntu-22.04,intel,2022.0,✓ +ubuntu-22.04,intel,2022.1,✓ +ubuntu-22.04,intel,2022.2.1,✓ +ubuntu-22.04,intel,2022.2,✓ +ubuntu-22.04,intel,2023.0,✓ +ubuntu-22.04,intel,2023.1,✓ +ubuntu-22.04,intel,2023.2,✓ +ubuntu-22.04,intel,2024.0,✓ +ubuntu-22.04,intel,2024.1,✓ +ubuntu-22.04,lfortran,0.31.0,✓ +ubuntu-22.04,lfortran,0.32.0,✓ +ubuntu-22.04,lfortran,0.33.0,✓ +ubuntu-22.04,nvidia-hpc,20.11,✓ +ubuntu-22.04,nvidia-hpc,20.7, +ubuntu-22.04,nvidia-hpc,20.9, +ubuntu-22.04,nvidia-hpc,21.1, +ubuntu-22.04,nvidia-hpc,21.11,✓ +ubuntu-22.04,nvidia-hpc,21.7, +ubuntu-22.04,nvidia-hpc,21.9, +ubuntu-22.04,nvidia-hpc,22.11,✓ +ubuntu-22.04,nvidia-hpc,22.5, +ubuntu-22.04,nvidia-hpc,22.7, +ubuntu-22.04,nvidia-hpc,22.9, +ubuntu-22.04,nvidia-hpc,23.1, +ubuntu-22.04,nvidia-hpc,23.11,✓ +ubuntu-22.04,nvidia-hpc,23.3,✓ +ubuntu-22.04,nvidia-hpc,23.5,✓ +ubuntu-22.04,nvidia-hpc,23.7,✓ +ubuntu-22.04,nvidia-hpc,23.9,✓ +windows-2019,gcc,10,✓ +windows-2019,gcc,11,✓ +windows-2019,gcc,12,✓ +windows-2019,gcc,13,✓ +windows-2019,gcc,9,✓ +windows-2019,intel-classic,2021.1.2, +windows-2019,intel-classic,2021.1, +windows-2019,intel-classic,2021.10,✓ +windows-2019,intel-classic,2021.11,✓ +windows-2019,intel-classic,2021.12,✓ +windows-2019,intel-classic,2021.2, +windows-2019,intel-classic,2021.3, +windows-2019,intel-classic,2021.4, +windows-2019,intel-classic,2021.5, +windows-2019,intel-classic,2021.6,✓ +windows-2019,intel-classic,2021.7.1, +windows-2019,intel-classic,2021.7,✓ +windows-2019,intel-classic,2021.8, +windows-2019,intel-classic,2021.9,✓ +windows-2019,intel,2021.1.2, +windows-2019,intel,2021.1, +windows-2019,intel,2021.2, +windows-2019,intel,2021.4, +windows-2019,intel,2022.0, +windows-2019,intel,2022.1,✓ +windows-2019,intel,2022.2.1, +windows-2019,intel,2022.2,✓ +windows-2019,intel,2023.0, +windows-2019,intel,2023.1,✓ +windows-2019,intel,2023.2,✓ +windows-2019,intel,2024.0,✓ +windows-2019,intel,2024.1,✓ +windows-2019,lfortran,0.31.0,✓ +windows-2019,lfortran,0.32.0,✓ +windows-2019,lfortran,0.33.0,✓ +windows-2022,gcc,10,✓ +windows-2022,gcc,11,✓ +windows-2022,gcc,12,✓ +windows-2022,gcc,13,✓ +windows-2022,gcc,9,✓ +windows-2022,intel-classic,2021.1.2, +windows-2022,intel-classic,2021.1, +windows-2022,intel-classic,2021.10,✓ +windows-2022,intel-classic,2021.11,✓ +windows-2022,intel-classic,2021.12,✓ +windows-2022,intel-classic,2021.2, +windows-2022,intel-classic,2021.3, +windows-2022,intel-classic,2021.4, +windows-2022,intel-classic,2021.5, +windows-2022,intel-classic,2021.6,✓ +windows-2022,intel-classic,2021.7.1, +windows-2022,intel-classic,2021.7,✓ +windows-2022,intel-classic,2021.8, +windows-2022,intel-classic,2021.9,✓ +windows-2022,intel,2021.1.2, +windows-2022,intel,2021.1, +windows-2022,intel,2021.2, +windows-2022,intel,2021.4, +windows-2022,intel,2022.0, +windows-2022,intel,2022.1,✓ +windows-2022,intel,2022.2.1, +windows-2022,intel,2022.2,✓ +windows-2022,intel,2023.0, +windows-2022,intel,2023.1,✓ +windows-2022,intel,2023.2,✓ +windows-2022,intel,2024.0,✓ +windows-2022,intel,2024.1,✓ +windows-2022,lfortran,0.31.0,✓ +windows-2022,lfortran,0.32.0,✓ +windows-2022,lfortran,0.33.0,✓ diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml index 02ff11f..e4addd1 100644 --- a/.github/compat/matrix.yml +++ b/.github/compat/matrix.yml @@ -1,70 +1,70 @@ os: - ubuntu-22.04 - ubuntu-20.04 - # - macos-14 - # - macos-13 - # - macos-12 - # - windows-2022 - # - windows-2019 + - macos-14 + - macos-13 + - macos-12 + - windows-2022 + - windows-2019 toolchain: - # - {compiler: gcc, version: 13} - # - {compiler: gcc, version: 12} - # - {compiler: gcc, version: 11} - # - {compiler: gcc, version: 10} - # - {compiler: gcc, version: 9} - # - {compiler: intel, version: '2024.1'} - # - {compiler: intel, version: '2024.0'} - # - {compiler: intel, version: '2023.2'} - # - {compiler: intel, version: '2023.1'} - # - {compiler: intel, version: '2023.0'} - # - {compiler: intel, version: '2022.2.1'} - # - {compiler: intel, version: '2022.2'} - # - {compiler: intel, version: '2022.1'} - # - {compiler: intel, version: '2022.0'} - # - {compiler: intel, version: '2021.4'} - # - {compiler: intel, version: '2021.2'} + - {compiler: gcc, version: 13} + - {compiler: gcc, version: 12} + - {compiler: gcc, version: 11} + - {compiler: gcc, version: 10} + - {compiler: gcc, version: 9} + - {compiler: intel, version: '2024.1'} + - {compiler: intel, version: '2024.0'} + - {compiler: intel, version: '2023.2'} + - {compiler: intel, version: '2023.1'} + - {compiler: intel, version: '2023.0'} + - {compiler: intel, version: '2022.2.1'} + - {compiler: intel, version: '2022.2'} + - {compiler: intel, version: '2022.1'} + - {compiler: intel, version: '2022.0'} + - {compiler: intel, version: '2021.4'} + - {compiler: intel, version: '2021.2'} - {compiler: intel, version: '2021.1.2'} - {compiler: intel, version: '2021.1'} - # - {compiler: intel-classic, version: '2021.12'} - # - {compiler: intel-classic, version: '2021.11'} - # - {compiler: intel-classic, version: '2021.10'} - # - {compiler: intel-classic, version: '2021.9'} - # - {compiler: intel-classic, version: '2021.8'} - # - {compiler: intel-classic, version: '2021.7.1'} - # - {compiler: intel-classic, version: '2021.7'} - # - {compiler: intel-classic, version: '2021.6'} - # - {compiler: intel-classic, version: '2021.5'} - # - {compiler: intel-classic, version: '2021.4'} - # - {compiler: intel-classic, version: '2021.3'} - # - {compiler: intel-classic, version: '2021.2'} + - {compiler: intel-classic, version: '2021.12'} + - {compiler: intel-classic, version: '2021.11'} + - {compiler: intel-classic, version: '2021.10'} + - {compiler: intel-classic, version: '2021.9'} + - {compiler: intel-classic, version: '2021.8'} + - {compiler: intel-classic, version: '2021.7.1'} + - {compiler: intel-classic, version: '2021.7'} + - {compiler: intel-classic, version: '2021.6'} + - {compiler: intel-classic, version: '2021.5'} + - {compiler: intel-classic, version: '2021.4'} + - {compiler: intel-classic, version: '2021.3'} + - {compiler: intel-classic, version: '2021.2'} - {compiler: intel-classic, version: '2021.1.2'} - {compiler: intel-classic, version: '2021.1'} - # - {compiler: lfortran, version: '0.31.0'} - # - {compiler: lfortran, version: '0.32.0'} - # - {compiler: lfortran, version: '0.33.0'} - # - {compiler: nvidia-hpc, version: '23.11'} - # - {compiler: nvidia-hpc, version: '23.9'} - # - {compiler: nvidia-hpc, version: '23.7'} - # - {compiler: nvidia-hpc, version: '23.5'} - # - {compiler: nvidia-hpc, version: '23.3'} - # - {compiler: nvidia-hpc, version: '23.1'} - # - {compiler: nvidia-hpc, version: '22.11'} - # - {compiler: nvidia-hpc, version: '22.9'} - # - {compiler: nvidia-hpc, version: '22.7'} - # - {compiler: nvidia-hpc, version: '22.5'} - # - {compiler: nvidia-hpc, version: '22.3'} - # - {compiler: nvidia-hpc, version: '22.2'} - # - {compiler: nvidia-hpc, version: '22.1'} - # - {compiler: nvidia-hpc, version: '21.11'} - # - {compiler: nvidia-hpc, version: '21.9'} - # - {compiler: nvidia-hpc, version: '21.7'} - # - {compiler: nvidia-hpc, version: '21.5'} - # - {compiler: nvidia-hpc, version: '21.3'} - # - {compiler: nvidia-hpc, version: '21.2'} - # - {compiler: nvidia-hpc, version: '21.1'} - # - {compiler: nvidia-hpc, version: '20.11'} - # - {compiler: nvidia-hpc, version: '20.9'} - # - {compiler: nvidia-hpc, version: '20.7'} + - {compiler: lfortran, version: '0.31.0'} + - {compiler: lfortran, version: '0.32.0'} + - {compiler: lfortran, version: '0.33.0'} + - {compiler: nvidia-hpc, version: '23.11'} + - {compiler: nvidia-hpc, version: '23.9'} + - {compiler: nvidia-hpc, version: '23.7'} + - {compiler: nvidia-hpc, version: '23.5'} + - {compiler: nvidia-hpc, version: '23.3'} + - {compiler: nvidia-hpc, version: '23.1'} + - {compiler: nvidia-hpc, version: '22.11'} + - {compiler: nvidia-hpc, version: '22.9'} + - {compiler: nvidia-hpc, version: '22.7'} + - {compiler: nvidia-hpc, version: '22.5'} + - {compiler: nvidia-hpc, version: '22.3'} + - {compiler: nvidia-hpc, version: '22.2'} + - {compiler: nvidia-hpc, version: '22.1'} + - {compiler: nvidia-hpc, version: '21.11'} + - {compiler: nvidia-hpc, version: '21.9'} + - {compiler: nvidia-hpc, version: '21.7'} + - {compiler: nvidia-hpc, version: '21.5'} + - {compiler: nvidia-hpc, version: '21.3'} + - {compiler: nvidia-hpc, version: '21.2'} + - {compiler: nvidia-hpc, version: '21.1'} + - {compiler: nvidia-hpc, version: '20.11'} + - {compiler: nvidia-hpc, version: '20.9'} + - {compiler: nvidia-hpc, version: '20.7'} exclude: # intel-classic >= 2021.10.0 not available for mac - os: macos-14 diff --git a/setup-fortran.sh b/setup-fortran.sh index 813846d..095b16b 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -397,6 +397,11 @@ install_intel_apt() | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update + # first install mkl, then the compilers, to keep setvars clean + if $install_mkl; then + sudo apt-get install intel-oneapi-mkl-$mkl_version + fi + # c/cpp compiler package names changed with 2024+ case $version in 2024*) @@ -409,10 +414,6 @@ install_intel_apt() ;; esac source /opt/intel/oneapi/setvars.sh - if $install_mkl; then - echo "Installing Intel oneAPI MKL $mkl_version..." - sudo apt-get install intel-oneapi-mkl-$mkl_version - fi export_intel_vars } From 360e5a5f4e9d12ea71ca591346e1735380db2b5f Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 12:48:46 +0200 Subject: [PATCH 8/9] test mkl install --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dac2c4..d3457d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,16 +88,16 @@ jobs: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - # - name: Test MKL libraries + - name: Test MKL libraries # we could also exclude 2021.5 for all macos versions here # this needs refactoring at some point - should the install # fail if no mkl version exists? - # if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' - # uses: ./.github/actions/test-mkl - # with: - # compiler: ${{ matrix.toolchain.compiler }} - # version: ${{ matrix.toolchain.version }} - # install_mkl: true + if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' + uses: ./.github/actions/test-mkl + with: + compiler: ${{ matrix.toolchain.compiler }} + version: ${{ matrix.toolchain.version }} + install_mkl: true - name: Test C compiler continue-on-error: true From fdaa8d912ef2db92daf9b1e7be6269bd632f2476 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Fri, 23 Aug 2024 12:52:43 +0200 Subject: [PATCH 9/9] remove comment --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3457d4..21a5bd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,6 @@ jobs: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} install_mkl: true - # install_mkl: false # - name: Debug with tmate # uses: mxschmitt/action-tmate@v3