From 56436e527cde0ce281a743f9c50d8b8039ebf286 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Wed, 24 Apr 2024 22:55:52 +0545 Subject: [PATCH 01/11] Use quotes for versions in CI --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b54c28..b44cdb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,19 +8,19 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] toolchain: - - { compiler: gcc, version: 13 } - - { compiler: intel, version: 2024.1 } - - { compiler: intel-classic, version: 2021.10 } + - { compiler: gcc, version: "13" } + - { compiler: intel, version: "2024.1" } + - { compiler: intel-classic, version: "2021.10" } exclude: - os: macos-latest - toolchain: { compiler: intel, version: 2024.1 } + toolchain: { compiler: intel, version: "2024.1" } - os: windows-latest - toolchain: { compiler: intel, version: 2024.1 } + toolchain: { compiler: intel, version: "2024.1" } - os: windows-latest - toolchain: { intel-classic, version: 2021.10 } + toolchain: { intel-classic, version: "2021.10" } include: - os: ubuntu-latest - toolchain: { compiler: nvidia-hpc, version: 23.11 } + toolchain: { compiler: nvidia-hpc, version: "23.11" } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -40,15 +40,15 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] toolchain: - - { compiler: gcc, version: 13 } - - { compiler: intel, version: 2023.2 } - - { compiler: intel-classic, version: 2021.10 } - - { compiler: nvidia-hpc, version: 23.11 } + - { compiler: gcc, version: "13" } + - { compiler: intel, version: "2023.2" } + - { compiler: intel-classic, version: "2021.10" } + - { compiler: nvidia-hpc, version: "23.11" } exclude: - os: macos-latest - toolchain: { compiler: intel, version: 2023.2 } + toolchain: { compiler: intel, version: "2023.2" } - os: macos-latest - toolchain: { compiler: nvidia-hpc, version: 23.11 } + toolchain: { compiler: nvidia-hpc, version: "23.11" } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 1c9d351016dec2b2823a250ef1bfe82387691539 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Wed, 24 Apr 2024 22:56:26 +0545 Subject: [PATCH 02/11] Use newest ifx version --- .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 b44cdb8..8577799 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,12 +41,12 @@ jobs: os: [ubuntu-latest, macos-latest] toolchain: - { compiler: gcc, version: "13" } - - { compiler: intel, version: "2023.2" } + - { compiler: intel, version: "2024.1" } - { compiler: intel-classic, version: "2021.10" } - { compiler: nvidia-hpc, version: "23.11" } exclude: - os: macos-latest - toolchain: { compiler: intel, version: "2023.2" } + toolchain: { compiler: intel, version: "2024.1" } - os: macos-latest toolchain: { compiler: nvidia-hpc, version: "23.11" } runs-on: ${{ matrix.os }} From b53b226fc45f3dcaa5eca5775f8460c4d8905fd3 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Wed, 24 Apr 2024 22:57:45 +0545 Subject: [PATCH 03/11] Try enabling Windows --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8577799..3c6d17b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,6 @@ jobs: exclude: - os: macos-latest toolchain: { compiler: intel, version: "2024.1" } - - os: windows-latest - toolchain: { compiler: intel, version: "2024.1" } - - os: windows-latest - toolchain: { intel-classic, version: "2021.10" } include: - os: ubuntu-latest toolchain: { compiler: nvidia-hpc, version: "23.11" } From 74089b3388c114799ef32a6f13a8220165ff2b9f Mon Sep 17 00:00:00 2001 From: minhqdao Date: Wed, 24 Apr 2024 23:14:37 +0545 Subject: [PATCH 04/11] Rename example files --- example/{ex1.f90 => version_f_ex1.f90} | 0 example/{ex2.f90 => version_f_ex2.f90} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename example/{ex1.f90 => version_f_ex1.f90} (100%) rename example/{ex2.f90 => version_f_ex2.f90} (100%) diff --git a/example/ex1.f90 b/example/version_f_ex1.f90 similarity index 100% rename from example/ex1.f90 rename to example/version_f_ex1.f90 diff --git a/example/ex2.f90 b/example/version_f_ex2.f90 similarity index 100% rename from example/ex2.f90 rename to example/version_f_ex2.f90 From 29e292ece63e7b42524045afad6e999351f1cc30 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 25 Apr 2024 08:24:05 +0545 Subject: [PATCH 05/11] Try out commit sha --- .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 3c6d17b..9743c07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: fortran-lang/setup-fortran@v1 + - uses: fortran-lang/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - - uses: fortran-lang/setup-fpm@v5 + - uses: fortran-lang/setup-fpm@ with: github-token: ${{ secrets.GITHUB_TOKEN }} - run: fpm test From 4e4b9f51465dff6782f7f322150598c681f45b6c Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 25 Apr 2024 08:25:00 +0545 Subject: [PATCH 06/11] Use fork --- .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 9743c07..2af0e1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: fortran-lang/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e + - uses: wpbonelli/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} From e64be502201eed7817d2f3c1ebff1ebc15c5b554 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 25 Apr 2024 08:33:36 +0545 Subject: [PATCH 07/11] Setup fpm correctly --- .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 2af0e1f..e2d7d71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: wpbonelli/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e + - uses: wpbonelli/setup-fortran@setvars id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} - - uses: fortran-lang/setup-fpm@ + - uses: fortran-lang/setup-fpm@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} - run: fpm test From d58dc66f142bba82d9ee3256c526fec46ed32883 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 25 Apr 2024 08:48:34 +0545 Subject: [PATCH 08/11] Use sha again --- .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 e2d7d71..9300154 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: wpbonelli/setup-fortran@setvars + - uses: wpbonelli/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} From ee0c7e9ed8e2da3cbbbe5dd5a896db77e5cb19f2 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 28 Jul 2024 15:05:05 +0530 Subject: [PATCH 09/11] Add support for shared libraries to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6e1fe0e..20e00c5 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ make This will generate the static library `libversion-f.a` in the root directory. You can compile it alongside your project or link it using the `-L` and `-l` flags. +A dynamic library will also be created for use in your projects (suffix `.so` on Linux systems and `.dylib` on macOS). + If you wish to use a compiler other than `gfortran`, simply specify it by running: ```bash From 4588922470e4f262bae1893e50a4d95d352e232d Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 28 Jul 2024 15:26:39 +0530 Subject: [PATCH 10/11] Use fortran-lang/setup-fortran again --- .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 9300154..3c6d17b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: wpbonelli/setup-fortran@848728b9f8f277e196a7e4e1afb61474c4869d2e + - uses: fortran-lang/setup-fortran@v1 id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} From f3790fb79a537696a0ed94d621a434e5e0d1db1a Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 28 Jul 2024 16:13:24 +0530 Subject: [PATCH 11/11] Update intel-classic version --- .github/workflows/ci.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c6d17b..24ace91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,11 +10,15 @@ jobs: toolchain: - { compiler: gcc, version: "13" } - { compiler: intel, version: "2024.1" } - - { compiler: intel-classic, version: "2021.10" } + - { compiler: intel-classic, version: "2021.12" } exclude: - os: macos-latest toolchain: { compiler: intel, version: "2024.1" } + - os: macos-latest + toolchain: { compiler: intel-classic, version: "2021.12" } include: + - os: macos-latest + toolchain: { compiler: intel-classic, version: "2021.10" } - os: ubuntu-latest toolchain: { compiler: nvidia-hpc, version: "23.11" } runs-on: ${{ matrix.os }} @@ -37,13 +41,14 @@ jobs: os: [ubuntu-latest, macos-latest] toolchain: - { compiler: gcc, version: "13" } - - { compiler: intel, version: "2024.1" } - - { compiler: intel-classic, version: "2021.10" } - - { compiler: nvidia-hpc, version: "23.11" } - exclude: - - os: macos-latest + include: + - os: ubuntu-latest toolchain: { compiler: intel, version: "2024.1" } + - os: ubuntu-latest + toolchain: { compiler: intel-classic, version: "2021.12" } - os: macos-latest + toolchain: { compiler: intel-classic, version: "2021.10" } + - os: ubuntu-latest toolchain: { compiler: nvidia-hpc, version: "23.11" } runs-on: ${{ matrix.os }} steps: