Skip to content

Commit 7029032

Browse files
willendwillend
authored
Merge pull request #2271 from mccode-dev/conda-ci-label-by-mpi-variant
Use ${{ matrix.mpi }} to ensure different output dirs
2 parents 2cb7c9d + 6c690df commit 7029032

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎.github/workflows/mcstas-conda-basictest.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
fi
109109
test -f ${CONDA_PREFIX}/bin/mcstas
110110
mcstas --version
111-
mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests
111+
mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests --suffix=${{ matrix.mpi }}
112112
export SUM=`find run_singletests -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ `
113113
export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86"
114114
if [ "${EXPECTED}" == "${SUM}" ];
@@ -134,8 +134,8 @@ jobs:
134134
fi
135135
test -f ${CONDA_PREFIX}/bin/mcstas
136136
mcstas --version
137-
mctest${SUFFIX} --instr=BNL_H8 --testdir=run_singletests
138-
mctest${SUFFIX} --instr=BNL_H8 --mpi=2 --testdir=run_singletests
137+
mctest${SUFFIX} --instr=BNL_H8 --testdir=run_singletests --suffix=${{ matrix.mpi }}
138+
mctest${SUFFIX} --instr=BNL_H8 --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
139139
140140
- name: Launch ISIS_CRISP
141141
id: ISIS_CRISP
@@ -151,8 +151,8 @@ jobs:
151151
fi
152152
test -f ${CONDA_PREFIX}/bin/mcstas
153153
mcstas --version
154-
mctest${SUFFIX} --instr=ISIS_CRISP --testdir=run_singletests
155-
mctest${SUFFIX} --instr=ISIS_CRISP --mpi=2 --testdir=run_singletests
154+
mctest${SUFFIX} --instr=ISIS_CRISP --testdir=run_singletests --suffix=${{ matrix.mpi }}
155+
mctest${SUFFIX} --instr=ISIS_CRISP --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
156156
157157
- name: Launch MCPL test instrument
158158
id: mcpl-test
@@ -168,12 +168,12 @@ jobs:
168168
fi
169169
test -f ${CONDA_PREFIX}/bin/mcstas
170170
mcstas --version
171-
mctest${SUFFIX} --instr=ESS_BEER_MCPL --testdir=run_singletests
172-
mctest${SUFFIX} --instr=ESS_BEER_MCPL --mpi=2 --testdir=run_singletests
173-
mctest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests
174-
mctest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests
175-
mctest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests
176-
mctest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests
171+
mctest${SUFFIX} --instr=ESS_BEER_MCPL --testdir=run_singletests --suffix=${{ matrix.mpi }}
172+
mctest${SUFFIX} --instr=ESS_BEER_MCPL --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
173+
mctest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests --suffix=${{ matrix.mpi }}
174+
mctest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests --suffix=${{ matrix.mpi }}
175+
mctest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
176+
mctest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
177177
178178
- name: Launch NCrystal test instrument
179179
id: ncrystal-test
@@ -189,8 +189,8 @@ jobs:
189189
fi
190190
test -f ${CONDA_PREFIX}/bin/mcstas
191191
mcstas --version
192-
mctest${SUFFIX} --instr=NCrystal_example --testdir=run_singletests
193-
mctest${SUFFIX} --instr=NCrystal_example --mpi=2 --testdir=run_singletests
192+
mctest${SUFFIX} --instr=NCrystal_example --testdir=run_singletests --suffix=${{ matrix.mpi }}
193+
mctest${SUFFIX} --instr=NCrystal_example --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
194194
195195
- name: Launch NeXus test instrument
196196
id: nexus-test
@@ -206,8 +206,8 @@ jobs:
206206
fi
207207
test -f ${CONDA_PREFIX}/bin/mcstas
208208
mcstas --version
209-
mctest${SUFFIX} --instr=templateSANS_Mantid --testdir=run_singletests
210-
mctest${SUFFIX} --instr=templateSANS_Mantid --mpi=2 --testdir=run_singletests
209+
mctest${SUFFIX} --instr=templateSANS_Mantid --testdir=run_singletests --suffix=${{ matrix.mpi }}
210+
mctest${SUFFIX} --instr=templateSANS_Mantid --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
211211
212212
- name: Check for modified instruments
213213
id: instr-test
@@ -234,9 +234,9 @@ jobs:
234234
if [ "$NUMMATCH" -gt "0" ];
235235
then
236236
if [ "$RUNNER_OS" != "Windows" ]; then
237-
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
237+
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
238238
else
239-
mctest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
239+
mctest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
240240
fi
241241
else
242242
echo No matching tests found
@@ -267,10 +267,10 @@ jobs:
267267
fi
268268
mkdir run_mctest && cd run_mctest
269269
if [ "$RUNNER_OS" != "Windows" ]; then
270-
mctest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
270+
mctest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
271271
mcviewtest --nobrowse $PWD
272272
else
273-
mctest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
273+
mctest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
274274
mcviewtest.bat --nobrowse $PWD
275275
fi
276276
fi

‎.github/workflows/mcxtrace-conda-basictest.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
fi
109109
test -f ${CONDA_PREFIX}/bin/mcxtrace
110110
mcxtrace --version
111-
mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests
111+
mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests --suffix=${{ matrix.mpi }}
112112
export SUM=`find run_singletests -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ `
113113
export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86"
114114
if [ "${EXPECTED}" == "${SUM}" ];
@@ -134,8 +134,8 @@ jobs:
134134
fi
135135
test -f ${CONDA_PREFIX}/bin/mcxtrace
136136
mcxtrace --version
137-
mxtest${SUFFIX} --instr=JJ_SAXS --testdir=run_singletests
138-
mxtest${SUFFIX} --instr=JJ_SAXS --mpi=2 --testdir=run_singletests
137+
mxtest${SUFFIX} --instr=JJ_SAXS --testdir=run_singletests --suffix=${{ matrix.mpi }}
138+
mxtest${SUFFIX} --instr=JJ_SAXS --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
139139
140140
- name: Launch ESRF_BM29 instrument
141141
id: ESRF_BM29
@@ -151,8 +151,8 @@ jobs:
151151
fi
152152
test -f ${CONDA_PREFIX}/bin/mcxtrace
153153
mcxtrace --version
154-
mxtest${SUFFIX} --instr=ESRF_BM29 --testdir=run_singletests
155-
mxtest${SUFFIX} --instr=ESRF_BM29 --mpi=2 --testdir=run_singletests
154+
mxtest${SUFFIX} --instr=ESRF_BM29 --testdir=run_singletests --suffix=${{ matrix.mpi }}
155+
mxtest${SUFFIX} --instr=ESRF_BM29 --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
156156
157157
- name: Launch MCPL test instrument
158158
id: mcpl-test
@@ -168,10 +168,10 @@ jobs:
168168
fi
169169
test -f ${CONDA_PREFIX}/bin/mcxtrace
170170
mcxtrace --version
171-
mxtest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests
172-
mxtest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests
173-
mxtest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests
174-
mxtest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests
171+
mxtest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests --suffix=${{ matrix.mpi }}
172+
mxtest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests --suffix=${{ matrix.mpi }}
173+
mxtest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
174+
mxtest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
175175
176176
- name: Launch Absorption test instrument
177177
id: Absorption-test
@@ -187,8 +187,8 @@ jobs:
187187
fi
188188
test -f ${CONDA_PREFIX}/bin/mcxtrace
189189
mcxtrace --version
190-
mxtest${SUFFIX} --instr=Test_Absorption --testdir=run_singletests
191-
mxtest${SUFFIX} --instr=Test_Absorption --mpi=2 --testdir=run_singletests
190+
mxtest${SUFFIX} --instr=Test_Absorption --testdir=run_singletests --suffix=${{ matrix.mpi }}
191+
mxtest${SUFFIX} --instr=Test_Absorption --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
192192
193193
- name: Check for modified instruments
194194
id: instr-test
@@ -215,9 +215,9 @@ jobs:
215215
if [ "$NUMMATCH" -gt "0" ];
216216
then
217217
if [ "$RUNNER_OS" != "Windows" ]; then
218-
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
218+
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
219219
else
220-
mxtest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
220+
mxtest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
221221
fi
222222
else
223223
echo No matching tests found
@@ -248,10 +248,10 @@ jobs:
248248
fi
249249
mkdir run_mxtest && cd run_mxtest
250250
if [ "$RUNNER_OS" != "Windows" ]; then
251-
mxtest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
251+
mxtest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
252252
mxviewtest --nobrowse $PWD
253253
else
254-
mxtest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
254+
mxtest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
255255
mxviewtest.bat --nobrowse $PWD
256256
fi
257257
fi

0 commit comments

Comments
 (0)