Skip to content

Use ${{ matrix.mpi }} to ensure different output dirs #2271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willend merged 1 commit into from
Dec 15, 2025
+34 −34
Merged

Use ${{ matrix.mpi }} to ensure different output dirs #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/mcstas-conda-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests
mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests --suffix=${{ matrix.mpi }}
export SUM=`find run_singletests -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ `
export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86"
if [ "${EXPECTED}" == "${SUM}" ];
Expand All @@ -134,8 +134,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=BNL_H8 --testdir=run_singletests
mctest${SUFFIX} --instr=BNL_H8 --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=BNL_H8 --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=BNL_H8 --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch ISIS_CRISP
id: ISIS_CRISP
Expand All @@ -151,8 +151,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=ISIS_CRISP --testdir=run_singletests
mctest${SUFFIX} --instr=ISIS_CRISP --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=ISIS_CRISP --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=ISIS_CRISP --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch MCPL test instrument
id: mcpl-test
Expand All @@ -168,12 +168,12 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=ESS_BEER_MCPL --testdir=run_singletests
mctest${SUFFIX} --instr=ESS_BEER_MCPL --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests
mctest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests
mctest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=ESS_BEER_MCPL --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=ESS_BEER_MCPL --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch NCrystal test instrument
id: ncrystal-test
Expand All @@ -189,8 +189,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=NCrystal_example --testdir=run_singletests
mctest${SUFFIX} --instr=NCrystal_example --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=NCrystal_example --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=NCrystal_example --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch NeXus test instrument
id: nexus-test
Expand All @@ -206,8 +206,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcstas
mcstas --version
mctest${SUFFIX} --instr=templateSANS_Mantid --testdir=run_singletests
mctest${SUFFIX} --instr=templateSANS_Mantid --mpi=2 --testdir=run_singletests
mctest${SUFFIX} --instr=templateSANS_Mantid --testdir=run_singletests --suffix=${{ matrix.mpi }}
mctest${SUFFIX} --instr=templateSANS_Mantid --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Check for modified instruments
id: instr-test
Expand All @@ -234,9 +234,9 @@ jobs:
if [ "$NUMMATCH" -gt "0" ];
then
if [ "$RUNNER_OS" != "Windows" ]; then
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
mctest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
else
mctest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
mctest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
fi
else
echo No matching tests found
Expand Down Expand Up @@ -267,10 +267,10 @@ jobs:
fi
mkdir run_mctest && cd run_mctest
if [ "$RUNNER_OS" != "Windows" ]; then
mctest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
mctest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
mcviewtest --nobrowse $PWD
else
mctest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
mctest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
mcviewtest.bat --nobrowse $PWD
fi
fi
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/mcxtrace-conda-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcxtrace
mcxtrace --version
mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_singletests --suffix=${{ matrix.mpi }}
export SUM=`find run_singletests -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ `
export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86"
if [ "${EXPECTED}" == "${SUM}" ];
Expand All @@ -134,8 +134,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcxtrace
mcxtrace --version
mxtest${SUFFIX} --instr=JJ_SAXS --testdir=run_singletests
mxtest${SUFFIX} --instr=JJ_SAXS --mpi=2 --testdir=run_singletests
mxtest${SUFFIX} --instr=JJ_SAXS --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=JJ_SAXS --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch ESRF_BM29 instrument
id: ESRF_BM29
Expand All @@ -151,8 +151,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcxtrace
mcxtrace --version
mxtest${SUFFIX} --instr=ESRF_BM29 --testdir=run_singletests
mxtest${SUFFIX} --instr=ESRF_BM29 --mpi=2 --testdir=run_singletests
mxtest${SUFFIX} --instr=ESRF_BM29 --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=ESRF_BM29 --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch MCPL test instrument
id: mcpl-test
Expand All @@ -168,10 +168,10 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcxtrace
mcxtrace --version
mxtest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_MCPL_input --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=Test_MCPL_output --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=Test_MCPL_input --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=Test_MCPL_output --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Launch Absorption test instrument
id: Absorption-test
Expand All @@ -187,8 +187,8 @@ jobs:
fi
test -f ${CONDA_PREFIX}/bin/mcxtrace
mcxtrace --version
mxtest${SUFFIX} --instr=Test_Absorption --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_Absorption --mpi=2 --testdir=run_singletests
mxtest${SUFFIX} --instr=Test_Absorption --testdir=run_singletests --suffix=${{ matrix.mpi }}
mxtest${SUFFIX} --instr=Test_Absorption --mpi=2 --testdir=run_singletests --suffix=${{ matrix.mpi }}

- name: Check for modified instruments
id: instr-test
Expand All @@ -215,9 +215,9 @@ jobs:
if [ "$NUMMATCH" -gt "0" ];
then
if [ "$RUNNER_OS" != "Windows" ]; then
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
mxtest --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
else
mxtest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES $PERMISSIVE --verbose
mxtest.bat --mpi=2 --testdir run_${comp} --comp=${comp} --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE --verbose
fi
else
echo No matching tests found
Expand Down Expand Up @@ -248,10 +248,10 @@ jobs:
fi
mkdir run_mxtest && cd run_mxtest
if [ "$RUNNER_OS" != "Windows" ]; then
mxtest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
mxtest --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
mxviewtest --nobrowse $PWD
else
mxtest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES $PERMISSIVE
mxtest.bat --mpi=2 --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.mpi }} $PERMISSIVE
mxviewtest.bat --nobrowse $PWD
fi
fi
Expand Down