Skip to content

Compile with MPI enabled by default (#2653) #2669

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 5 commits into from
Sep 17, 2026
+22 −6
Merged

Compile with MPI enabled by default (#2653) #2669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa58d81
Experiment: --mpi=1 by default
willend Sep 15, 2026
3d26090
Improved --help with option to disable mpi-compilation (--mpi=None/--…
willend Sep 15, 2026
4673ab1
Should enable auto-compilation by mpi in mcgui
willend Sep 15, 2026
52023b1
Starting value "MPI" in run dialogue
willend Sep 15, 2026
e6d3b79
Drop non-mpi runs
willend Sep 17, 2026
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
1 change: 0 additions & 1 deletion .github/workflows/mcstas-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ jobs:
fi
test -n "$(command -v mcstas${EXESUFFIX})"
mcstas${EXESUFFIX} --version
mctest${SUFFIX} --verbose --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource,Masked_ESS_butterfly_image --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${MYWORKERID}
if [ "${{ matrix.nmpi }}" != "0" ];
then
mctest${SUFFIX} --verbose --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource,Masked_ESS_butterfly_image --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${MYWORKERID}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/mcxtrace-basictest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ jobs:
fi
test -n "$(command -v mcxtrace${EXESUFFIX})"
mcxtrace${EXESUFFIX} --version
mxtest${SUFFIX} --verbose --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${MYWORKERID}
if [ "${{ matrix.nmpi }}" != "0" ];
then
mxtest${SUFFIX} --verbose --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${MYWORKERID}
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mcgui/mcgui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def canPlot(self):
return ((self.__instrFile != "") and (not self.isSimRunning()))

__thread_exc_signal = QtCore.Signal(str)
def compile(self, mpi=False):
def compile(self, mpi=True):
# using Qt in-built cross-thread signaling
self.__thread_exc_signal.connect(handleExceptionMsg)

Expand Down
2 changes: 2 additions & 0 deletions tools/Python/mcgui/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,8 @@ def retranslateUi(self, dlgStartSim):
self.cbxClustering.setItemText(4, _translate("dlgStartSim", "OpenACC (recompile)"))
self.cbxClustering.setItemText(5, _translate("dlgStartSim", "OpenACC and MPI"))
self.cbxClustering.setItemText(6, _translate("dlgStartSim", "OpenACC and MPI (recompile)"))
self.cbxClustering.setCurrentIndex(1)

self.lblInspect.setText(_translate( "dlgStartSim", "Inspect:"))
self.lblAutoPlot.setText(_translate( "dlgStartSim", "Autoplot:"))
self.lblAutoPlot.setToolTip(_translate( "dlgStartSim", "Automatically show results with selected plotter at the end"))
Expand Down
22 changes: 19 additions & 3 deletions tools/Python/mcrun/mcrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ def add_mcrun_adv_options(parser):

# Multiprocessing
add('--mpi',
metavar='NB_CPU',
help='Spread simulation over NB_CPU machines using MPI')
metavar='NB_CPU', default=1,
help='Spread simulation over NB_CPU machines using MPI. Compilation with MPI is enabled by default, disable by setting --mpi=None or --mpi=0')

add('--machines',
metavar='machines',
Expand Down Expand Up @@ -429,7 +429,23 @@ def expand_options(options):

# MPI
if options.mpi is not None:
options.use_mpi = True
# String-based --mpi input, anything but "None" means enable mpi
if isinstance(options.mpi,str):
if not (options.mpi.upper()=="NONE"):
# Enable
options.use_mpi = True
else:
# Disable
options.mpi=None
options.use_mpi = False
# Numeric --mpi input any value >0 means enable mpi
elif not (options.mpi<1):
# Enable
options.use_mpi = True
else:
# Disable
options.mpi=None
options.use_mpi = False
if options.openacc is True:
options.cc = mccode_config.compilation['OACC']
else:
Expand Down
Loading