Skip to content

Commit 346aa65

Browse files
committed
small CI fix
1 parent 2602628 commit 346aa65

File tree

1 file changed

+34
-26
lines changed

1 file changed

+34
-26
lines changed

.github/workflows/test.yml

+34-26
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
if: needs.file-changes.outputs.checkall == 'true'
2424
needs: file-changes
2525
strategy:
26+
fail-fast: false
2627
matrix:
2728
os: ['ubuntu', 'macos']
2829
mpi: ['mpi']
@@ -39,15 +40,12 @@ jobs:
3940
precision:
4041
debug: no-debug
4142
intel: false
42-
43-
include:
4443
- os: ubuntu
4544
mpi: mpi
4645
precision: single
4746
debug: no-debug
4847
intel: false
4948

50-
fail-fast: false
5149
continue-on-error: true
5250
runs-on: ${{ matrix.os }}-latest
5351

@@ -56,30 +54,32 @@ jobs:
5654
uses: actions/checkout@v4
5755

5856
- name: Setup MacOS
59-
if: matrix.os == 'macos'
60-
run: |
57+
if: matrix.os == 'macos'
58+
run: |
6159
brew install coreutils python cmake fftw hdf5 gcc@14 boost open-mpi
6260
echo "FC=gfortran-14" >> $GITHUB_ENV
6361
echo "BOOST_INCLUDE=/opt/homebrew/include/" >> $GITHUB_ENV
6462
6563
- name: Setup Ubuntu
66-
if: matrix.os == 'ubuntu' && matrix.intel == false
64+
if: matrix.os == 'ubuntu' && matrix.intel == false
6765
run: |
68-
sudo apt update -y
69-
sudo apt install -y cmake gcc g++ python3 python3-dev hdf5-tools \
70-
libfftw3-dev libhdf5-dev openmpi-bin libopenmpi-dev
66+
sudo apt update -y
67+
sudo apt install -y cmake gcc g++ python3 python3-dev hdf5-tools \
68+
libfftw3-dev libhdf5-dev openmpi-bin libopenmpi-dev
7169
7270
- name: Setup Ubuntu (Intel)
73-
if: matrix.os == 'ubuntu' && matrix.intel == true
71+
if: matrix.os == 'ubuntu' && matrix.intel == true
7472
run: |
7573
sudo apt update -y
7674
sudo apt install -y tar wget make cmake python3 python3-dev
7775
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
7876
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
7977
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
80-
sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
78+
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
8179
sudo apt-get update
82-
sudo apt-get install -y intel-oneapi-common-vars intel-oneapi-compiler-fortran-2022.1.0 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.1.0 intel-oneapi-mkl-2021.4.0 intel-oneapi-mpi-2021.7.1 intel-oneapi-mpi-devel-2021.7.1
80+
sudo apt-get install -y intel-oneapi-common-vars intel-oneapi-compiler-fortran-2022.1.0 \
81+
intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.1.0 intel-oneapi-mkl-2021.4.0 \
82+
intel-oneapi-mpi-2021.7.1 intel-oneapi-mpi-devel-2021.7.1
8383
source /opt/intel/oneapi/setvars.sh
8484
echo "CXX=$(which icpc)" >> $GITHUB_ENV
8585
echo "CC=$(which icc)" >> $GITHUB_ENV
@@ -91,14 +91,22 @@ jobs:
9191
echo "I_MPI_ROOT=/opt/intel/oneapi/mpi/2021.7.1/" >> $GITHUB_ENV
9292
9393
- name: Build
94-
run: |
94+
run: |
9595
if [ '${{ matrix.intel }}' == 'true' ]; then . /opt/intel/oneapi/setvars.sh; fi
96-
/bin/bash mfc.sh build -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} --${{ matrix.precision }}
96+
precision_flag=""
97+
if [ "${{ matrix.precision }}" == "single" ]; then
98+
precision_flag="--single"
99+
fi
100+
/bin/bash mfc.sh build -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} $precision_flag
97101
98102
- name: Test
99-
run: |
103+
run: |
100104
if [ '${{ matrix.intel }}' == 'true' ]; then . /opt/intel/oneapi/setvars.sh; fi
101-
/bin/bash mfc.sh test --max-attempts 3 -j $(nproc) $OPT1 $OPT2
105+
precision_flag=""
106+
if [ "${{ matrix.precision }}" == "single" ]; then
107+
precision_flag="--single"
108+
fi
109+
/bin/bash mfc.sh test --max-attempts 3 -j $(nproc) $OPT1 $OPT2 $precision_flag
102110
env:
103111
OPT1: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
104112
OPT2: ${{ matrix.debug == 'debug' && '-% 20' || '' }}
@@ -122,7 +130,7 @@ jobs:
122130
lbl: gt
123131
precision: single
124132
runs-on:
125-
group: phoenix
133+
group: phoenix
126134
labels: ${{ matrix.lbl }}
127135
env:
128136
ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16
@@ -132,24 +140,24 @@ jobs:
132140
uses: actions/checkout@v4
133141

134142
- name: Build & Test
135-
if: matrix.lbl == 'gt'
136-
run: bash .github/workflows/phoenix/submit.sh .github/workflows/phoenix/test.sh ${{ matrix.device }} ${{ matrix.precision }}
143+
if: matrix.lbl == 'gt'
144+
run: bash .github/workflows/phoenix/submit.sh .github/workflows/phoenix/test.sh ${{ matrix.device }} ${{ matrix.precision }}
137145

138146
- name: Build
139-
if: matrix.lbl == 'frontier'
140-
run: bash .github/workflows/frontier/build.sh
147+
if: matrix.lbl == 'frontier'
148+
run: bash .github/workflows/frontier/build.sh
141149

142150
- name: Test
143-
if: matrix.lbl == 'frontier'
144-
run: bash .github/workflows/frontier/submit.sh .github/workflows/frontier/test.sh ${{matrix.device}} ${{ matrix.precision }}
151+
if: matrix.lbl == 'frontier'
152+
run: bash .github/workflows/frontier/submit.sh .github/workflows/frontier/test.sh ${{ matrix.device }} ${{ matrix.precision }}
145153

146154
- name: Print Logs
147-
if: always()
148-
run: cat test-${{ matrix.device }}-${{ matrix.precision }}.out
155+
if: always()
156+
run: cat test-${{ matrix.device }}-${{ matrix.precision }}.out
149157

150158
- name: Archive Logs
151159
uses: actions/upload-artifact@v4
152-
if: always()
160+
if: always()
153161
with:
154162
name: logs-${{ strategy.job-index }}-${{ matrix.device }}-${{ matrix.precision }}
155163
path: test-${{ matrix.device }}-${{ matrix.precision }}.out

0 commit comments

Comments
 (0)