Skip to content

Commit c212d92

Browse files
perazzperazz
authored
Merge branch 'main' into serialize_fpm_model
2 parents a1e71e9 + a0cb608 commit c212d92

22 files changed

+441
-97
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"

‎.github/workflows/CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-latest, macos-11, windows-latest]
25-
gcc_v: [10] # Version of GFortran we want to use.
25+
gcc_v: [10,11,12,13] # Version of GFortran we want to use.
2626
include:
2727
- os: ubuntu-latest
2828
os-arch: linux-x86_64
@@ -43,7 +43,7 @@ jobs:
4343

4444
steps:
4545
- name: Checkout code
46-
uses: actions/checkout@v1
46+
uses: actions/checkout@v4
4747

4848
- name: Install GFortran macOS
4949
if: contains(matrix.os, 'macos')
@@ -194,7 +194,7 @@ jobs:
194194
- build
195195

196196
steps:
197-
- uses: actions/checkout@v2
197+
- uses: actions/checkout@v4
198198

199199
- name: Download Artifacts
200200
uses: actions/download-artifact@v2
@@ -277,7 +277,7 @@ jobs:
277277
env:
278278
DEPLOY_BRANCH: ${{ secrets.DEPLOY_BRANCH && contains(github.ref, secrets.DEPLOY_BRANCH) && 1 || 0 }}
279279

280-
- uses: actions/checkout@v2
280+
- uses: actions/checkout@v4
281281
if: ${{ github.event_name == 'push' }}
282282

283283
- name: Download Artifacts

‎.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
build-and-deploy:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
10-
- uses: actions/setup-python@v1
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-python@v5
1111
with:
1212
python-version: '3.x'
1313
- name: Install dependencies

‎.github/workflows/meta.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
mpi: openmpi
3636
- os: ubuntu-latest
3737
mpi: mpich
38-
- os: windows-latest
39-
mpi: msmpi
4038
- os: macos-latest
4139
mpi: openmpi
4240
- os: macos-latest
@@ -45,7 +43,7 @@ jobs:
4543

4644
steps:
4745
- name: Checkout code
48-
uses: actions/checkout@v1
46+
uses: actions/checkout@v4
4947

5048
- name: (Ubuntu) setup gcc version
5149
if: contains(matrix.os,'ubuntu')
@@ -106,16 +104,14 @@ jobs:
106104
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
107105
timeout-minutes: 1
108106
run: |
109-
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
110-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
111-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
112-
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
107+
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
108+
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
113109
sudo apt-get update
114110
115111
- name: (Ubuntu) Install Intel oneAPI
116112
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
117-
timeout-minutes: 5
118-
run: sudo apt-get install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mpi intel-oneapi-mpi-devel intel-oneapi-mkl ninja-build
113+
timeout-minutes: 15
114+
run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-2023.1.0 intel-oneapi-compiler-fortran-2023.1.0 intel-oneapi-mpi-devel ninja-build
119115

120116
- name: (Ubuntu) Setup Intel oneAPI environment
121117
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
@@ -152,6 +148,7 @@ jobs:
152148
if: contains(matrix.os,'windows') && contains(matrix.mpi,'msmpi')
153149
run: |
154150
echo "C:\Program Files\Microsoft MPI\Bin\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
151+
echo "/c/Program Files/Microsoft MPI/Bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
155152
echo "MSMPI_BIN=C:\Program Files\Microsoft MPI\Bin\" | Out-File -FilePath $env:GITHUB_ENV -Append
156153
157154
- name: (Windows) load OneAPI environment variables
@@ -216,9 +213,9 @@ jobs:
216213
if: contains(matrix.mpi,'intel')
217214
shell: bash
218215
run: |
219-
echo "FPM_FC=ifort" >> $GITHUB_ENV
220-
echo "FPM_CC=icc" >> $GITHUB_ENV
221-
echo "FPM_CXX=icpc" >> $GITHUB_ENV
216+
echo "FPM_FC=ifx" >> $GITHUB_ENV
217+
echo "FPM_CC=icx" >> $GITHUB_ENV
218+
echo "FPM_CXX=icpx" >> $GITHUB_ENV
222219
223220
- name: (macOS) Use gcc/g++ instead of Clang for C/C++
224221
if: contains(matrix.os,'macOS')

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
FORMAT: ${{ matrix.format }}
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@v2
47+
uses: actions/checkout@v4
4848
with:
4949
fetch-depth: 0
5050

@@ -124,7 +124,7 @@ jobs:
124124
env:
125125
DEPLOY_BRANCH: ${{ secrets.DEPLOY_BRANCH && contains(github.ref, secrets.DEPLOY_BRANCH) && 1 || 0 }}
126126

127-
- uses: actions/checkout@v2
127+
- uses: actions/checkout@v4
128128
if: ${{ github.event_name == 'push' }}
129129

130130
- name: Download Artifacts

‎ci/run_tests.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ pushd preprocess_cpp_deps
150150
"$fpm" build
151151
popd
152152

153+
pushd preprocess_cpp_suffix
154+
"$fpm" run
155+
popd
156+
153157
pushd preprocess_per_dependency
154158
"$fpm" run
155159
popd

‎example_packages/preprocess_cpp_suffix/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/*

‎example_packages/preprocess_cpp_suffix/app/main.f90

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
program test_preprocess_suffix
2+
use preprocess_cpp
3+
#ifndef TESTMACRO
4+
stop -1
5+
#else
6+
stop 0
7+
#endif
8+
end program test_preprocess_suffix

‎example_packages/preprocess_cpp_suffix/fpm.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name = "preprocess_cpp_suffix"
2+
version = "1"
3+
4+
[preprocess]
5+
[preprocess.cpp]
6+
macros = ["TESTMACRO", "TESTMACRO2=3", "TESTMACRO3={version}"]
7+
suffixes = ["fpp"]

‎example_packages/preprocess_cpp_suffix/src/preprocess_cpp.fpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
module preprocess_cpp
2+
implicit none
3+
private
4+
5+
public :: say_hello
6+
contains
7+
subroutine say_hello
8+
print *, "Hello, preprocess_cpp!"
9+
#ifndef TESTMACRO
10+
This breaks the build.
11+
#endif
12+
13+
#if TESTMACRO2 != 3
14+
This breaks the build.
15+
#endif
16+
17+
#if TESTMACRO3 != 1
18+
This breaks the build.
19+
#endif
20+
21+
end subroutine say_hello
22+
end module preprocess_cpp

0 commit comments

Comments
 (0)