Skip to content

Commit 603bbf0

Browse files
author
Marc Coiffier
committed
Tentative de compilation avec icc
1 parent 97423b9 commit 603bbf0

3 files changed

Lines changed: 61 additions & 114 deletions

File tree

‎.github/workflows/idefix-ci-jobs.yml‎

Lines changed: 41 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
TESTME_OPTIONS:
55
required: true
66
type: string
7+
IDEFIX_TARGET:
8+
required: true
9+
type: string
710

811
# concurrency:
912
# # auto-cancel any concurrent job *in the same context*
@@ -13,6 +16,7 @@ on:
1316
# cancel-in-progress: true
1417

1518
env:
19+
IDEFIX_COMPILER: ${{ inputs.IDEFIX_COMPILER }}
1620
TESTME_OPTIONS: ${{ inputs.TESTME_OPTIONS }}
1721
PYTHONPATH: ${{ github.workspace }}
1822
IDEFIX_DIR: ${{ github.workspace }}
@@ -40,17 +44,11 @@ jobs:
4044
with:
4145
submodules: recursive
4246
- name: Sod test
43-
run: |
44-
cd $IDEFIX_DIR/test/HD/sod
45-
./testme.py -all $TESTME_OPTIONS
47+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod -all $TESTME_OPTIONS
4648
- name: Isothermal Sod test
47-
run: |
48-
cd $IDEFIX_DIR/test/HD/sod-iso
49-
./testme.py -all $TESTME_OPTIONS
49+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/sod-iso -all $TESTME_OPTIONS
5050
- name: Mach reflection test
51-
run: |
52-
cd $IDEFIX_DIR/test/HD//MachReflection
53-
./testme.py -all $TESTME_OPTIONS
51+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD//MachReflection -all $TESTME_OPTIONS
5452

5553
ParabolicHydro:
5654
needs: Linter
@@ -61,17 +59,11 @@ jobs:
6159
with:
6260
submodules: recursive
6361
- name: Viscous flow past cylinder
64-
run: |
65-
cd $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder
66-
./testme.py -all $TESTME_OPTIONS
62+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousFlowPastCylinder -all $TESTME_OPTIONS
6763
- name: Viscous disk
68-
run: |
69-
cd $IDEFIX_DIR/test/HD/ViscousDisk
70-
./testme.py -all $TESTME_OPTIONS
64+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ViscousDisk -all $TESTME_OPTIONS
7165
- name: Thermal diffusion
72-
run: |
73-
cd $IDEFIX_DIR/test/HD/thermalDiffusion
74-
./testme.py -all $TESTME_OPTIONS
66+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/thermalDiffusion -all $TESTME_OPTIONS
7567

7668
ShocksMHD:
7769
needs: Linter
@@ -82,22 +74,13 @@ jobs:
8274
with:
8375
submodules: recursive
8476
- name: MHD Sod test
85-
run: |
86-
cd $IDEFIX_DIR/test/MHD/sod
87-
./testme.py -all $TESTME_OPTIONS
77+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod -all $TESTME_OPTIONS
8878
- name: MHD Isothermal Sod test
89-
run: |
90-
cd $IDEFIX_DIR/test/MHD/sod-iso
91-
./testme.py -all $TESTME_OPTIONS
79+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sod-iso -all $TESTME_OPTIONS
9280
- name: Orszag Tang
93-
run: |
94-
cd $IDEFIX_DIR/test/MHD/OrszagTang
95-
./testme.py -all $TESTME_OPTIONS
81+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang -all $TESTME_OPTIONS
9682
- name: Orszag Tang 3D+restart tests
97-
run: |
98-
cd $IDEFIX_DIR/test/MHD/OrszagTang3D
99-
./testme.py -all $TESTME_OPTIONS
100-
83+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/OrszagTang3D -all $TESTME_OPTIONS
10184

10285
ParabolicMHD:
10386
needs: Linter
@@ -108,25 +91,15 @@ jobs:
10891
with:
10992
submodules: recursive
11093
- name: Ambipolar C Shock
111-
run: |
112-
cd $IDEFIX_DIR/test/MHD/AmbipolarCshock
113-
./testme.py -all $TESTME_OPTIONS
94+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock -all $TESTME_OPTIONS
11495
- name: Ambipolar C Shock 3D
115-
run: |
116-
cd $IDEFIX_DIR/test/MHD/AmbipolarCshock3D
117-
./testme.py -all $TESTME_OPTIONS
96+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/AmbipolarCshock3D -all $TESTME_OPTIONS
11897
- name: Resistive Alfvén wave
119-
run: |
120-
cd $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave
121-
./testme.py -all $TESTME_OPTIONS
98+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ResistiveAlfvenWave -all $TESTME_OPTIONS
12299
- name: Grid coarsening diffusion
123-
run: |
124-
cd $IDEFIX_DIR/test/MHD/Coarsening
125-
./testme.py -all $TESTME_OPTIONS
100+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/Coarsening -all $TESTME_OPTIONS
126101
- name: Hall whistler waves
127-
run: |
128-
cd $IDEFIX_DIR/test/MHD/HallWhistler
129-
./testme.py -all $TESTME_OPTIONS
102+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/HallWhistler -all $TESTME_OPTIONS
130103

131104
Fargo:
132105
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -137,13 +110,9 @@ jobs:
137110
with:
138111
submodules: recursive
139112
- name: Fargo + planet
140-
run: |
141-
cd $IDEFIX_DIR/test/HD/FargoPlanet
142-
./testme.py -all $TESTME_OPTIONS
113+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/FargoPlanet -all $TESTME_OPTIONS
143114
- name: Fargo MHD spherical
144-
run: |
145-
cd $IDEFIX_DIR/test/MHD/FargoMHDSpherical
146-
./testme.py -all $TESTME_OPTIONS
115+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/FargoMHDSpherical -all $TESTME_OPTIONS
147116

148117
ShearingBox:
149118
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -154,13 +123,9 @@ jobs:
154123
with:
155124
submodules: recursive
156125
- name: Hydro shearing box
157-
run: |
158-
cd $IDEFIX_DIR/test/HD/ShearingBox
159-
./testme.py -all $TESTME_OPTIONS
126+
run: scripts/ci/run-tests $IDEFIX_DIR/test/HD/ShearingBox -all $TESTME_OPTIONS
160127
- name: MHD shearing box
161-
run: |
162-
cd $IDEFIX_DIR/test/MHD/ShearingBox
163-
./testme.py -all $TESTME_OPTIONS
128+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/ShearingBox -all $TESTME_OPTIONS
164129

165130
SelfGravity:
166131
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -171,25 +136,15 @@ jobs:
171136
with:
172137
submodules: recursive
173138
- name: Jeans Instability
174-
run: |
175-
cd $IDEFIX_DIR/test/SelfGravity/JeansInstability
176-
./testme.py -all $TESTME_OPTIONS
139+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/JeansInstability -all $TESTME_OPTIONS
177140
- name: Random sphere spherical
178-
run: |
179-
cd $IDEFIX_DIR/test/SelfGravity/RandomSphere
180-
./testme.py -all $TESTME_OPTIONS
141+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphere -all $TESTME_OPTIONS
181142
- name: Random sphere cartesian
182-
run: |
183-
cd $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian
184-
./testme.py -all $TESTME_OPTIONS
143+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/RandomSphereCartesian -all $TESTME_OPTIONS
185144
- name: Uniform spherical collapse
186-
run: |
187-
cd $IDEFIX_DIR/test/SelfGravity/UniformCollapse
188-
./testme.py -all $TESTME_OPTIONS
145+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/UniformCollapse -all $TESTME_OPTIONS
189146
- name: Dusty spherical collapse
190-
run: |
191-
cd $IDEFIX_DIR/test/SelfGravity/DustyCollapse
192-
./testme.py -all $TESTME_OPTIONS
147+
run: scripts/ci/run-tests $IDEFIX_DIR/test/SelfGravity/DustyCollapse -all $TESTME_OPTIONS
193148

194149
Planet:
195150
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -200,29 +155,17 @@ jobs:
200155
with:
201156
submodules: recursive
202157
- name: 3 body
203-
run: |
204-
cd $IDEFIX_DIR/test/Planet/Planet3Body
205-
./testme.py -all $TESTME_OPTIONS
158+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/Planet3Body -all $TESTME_OPTIONS
206159
- name: migration
207-
run: |
208-
cd $IDEFIX_DIR/test/Planet/PlanetMigration2D
209-
./testme.py -all $TESTME_OPTIONS
160+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetMigration2D -all $TESTME_OPTIONS
210161
- name: planet-planet
211-
run: |
212-
cd $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D
213-
./testme.py -all $TESTME_OPTIONS
162+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetPlanetRK42D -all $TESTME_OPTIONS
214163
- name: spiral wake
215-
run: |
216-
cd $IDEFIX_DIR/test/Planet/PlanetSpiral2D
217-
./testme.py -all $TESTME_OPTIONS
164+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetSpiral2D -all $TESTME_OPTIONS
218165
- name: torques
219-
run: |
220-
cd $IDEFIX_DIR/test/Planet/PlanetTorque3D
221-
./testme.py -all $TESTME_OPTIONS
166+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetTorque3D -all $TESTME_OPTIONS
222167
- name: RK5
223-
run: |
224-
cd $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D
225-
./testme.py -all $TESTME_OPTIONS
168+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Planet/PlanetsIsActiveRK52D -all $TESTME_OPTIONS
226169

227170
Dust:
228171
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -233,13 +176,9 @@ jobs:
233176
with:
234177
submodules: recursive
235178
- name: Energy conservation
236-
run: |
237-
cd $IDEFIX_DIR/test/Dust/DustEnergy
238-
./testme.py -all $TESTME_OPTIONS
179+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustEnergy -all $TESTME_OPTIONS
239180
- name: Dusty wave
240-
run: |
241-
cd $IDEFIX_DIR/test/Dust/DustyWave
242-
./testme.py -all $TESTME_OPTIONS
181+
run: scripts/ci/run-tests $IDEFIX_DIR/test/Dust/DustyWave -all $TESTME_OPTIONS
243182

244183
Braginskii:
245184
needs: [Linter, ShocksHydro, ParabolicHydro, ShocksMHD, ParabolicMHD]
@@ -250,17 +189,11 @@ jobs:
250189
with:
251190
submodules: recursive
252191
- name: MTI
253-
run: |
254-
cd $IDEFIX_DIR/test/MHD/MTI
255-
./testme.py -all $TESTME_OPTIONS
192+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/MTI -all $TESTME_OPTIONS
256193
- name: Spherical anisotropic diffusion
257-
run: |
258-
cd $IDEFIX_DIR/test/MHD/sphBragTDiffusion
259-
./testme.py -all $TESTME_OPTIONS
194+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragTDiffusion -all $TESTME_OPTIONS
260195
- name: Spherical anisotropic viscosity
261-
run: |
262-
cd $IDEFIX_DIR/test/MHD/sphBragViscosity
263-
./testme.py -all $TESTME_OPTIONS
196+
run: scripts/ci/run-tests $IDEFIX_DIR/test/MHD/sphBragViscosity -all $TESTME_OPTIONS
264197

265198
Examples:
266199
needs: [Fargo, Dust, Planet, ShearingBox, SelfGravity]
@@ -282,10 +215,6 @@ jobs:
282215
with:
283216
submodules: recursive
284217
- name: Lookup table
285-
run: |
286-
cd $IDEFIX_DIR/test/utils/lookupTable
287-
./testme.py -all $TESTME_OPTIONS
218+
run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/lookupTable -all $TESTME_OPTIONS
288219
- name: Dump Image
289-
run: |
290-
cd $IDEFIX_DIR/test/utils/dumpImage
291-
./testme.py -all $TESTME_OPTIONS
220+
run: scripts/ci/run-tests $IDEFIX_DIR/test/utils/dumpImage -all $TESTME_OPTIONS

‎.github/workflows/idefix-ci.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,18 @@ jobs:
1515
uses: ./.github/workflows/idefix-ci-jobs.yml
1616
with:
1717
TESTME_OPTIONS: -cuda -Werror
18+
IDEFIX_COMPILER: cuda
1819

19-
cpu-jobs:
20-
name: CPU Jobs
20+
gcc-jobs:
21+
name: CPU Jobs (gcc)
2122
uses: ./.github/workflows/idefix-ci-jobs.yml
2223
with:
2324
TESTME_OPTIONS: -Werror
25+
IDEFIX_COMPILER: gcc
26+
27+
icc-jobs:
28+
name: CPU Jobs (icc)
29+
uses: ./.github/workflows/idefix-ci-jobs.yml
30+
with:
31+
TESTME_OPTIONS: -Werror
32+
IDEFIX_COMPILER: icc

‎scripts/ci/run-tests‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
set -ue
3+
if [ "$IDEFIX_COMPILER" == icc ]; then
4+
source /opt/intel/oneapi/setvars.sh
5+
export CC=icx
6+
export CXX=icpx
7+
fi
8+
cd "$1"
9+
./testme.py "${@:2}"

0 commit comments

Comments
 (0)