Skip to content
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

Jump to bottom

update sanity check in OpenMPI easyblock to support OpenMPI v5.0.0 #2709

Merged
merged 4 commits into from
Jun 4, 2022
Merged

update sanity check in OpenMPI easyblock to support OpenMPI v5.0.0 #2709

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80eaa5c
WIP: OpenMPI 5.0.0 support
Apr 6, 2022
8279913
Extends openmpi EB
May 3, 2022
f8eec08
Returns mpirun
May 4, 2022
2145372
Adds the comment and the new author
May 16, 2022
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
24 changes: 17 additions & 7 deletions easybuild/easyblocks/o/openmpi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ def config_opt_used(key, enable_opt=False):
# auto-detect based on available OS packages
os_packages = EASYCONFIG_CONSTANTS['OS_PKG_IBVERBS_DEV'][0]
verbs = any(check_os_dependency(osdep) for osdep in os_packages)

if verbs:
self.cfg.update('configopts', '--with-verbs')
else:
self.cfg.update('configopts', '--without-verbs')
if LooseVersion(self.version) <= LooseVersion('5.0.0'):
boegel marked this conversation as resolved.
Show resolved Hide resolved
if verbs:
self.cfg.update('configopts', '--with-verbs')
else:
self.cfg.update('configopts', '--without-verbs')

super(EB_OpenMPI, self).configure_step()

Expand Down Expand Up @@ -157,14 +157,24 @@ def load_module(self, *args, **kwargs):
def sanity_check_step(self):
"""Custom sanity check for OpenMPI."""

bin_names = ['mpicc', 'mpicxx', 'mpif90', 'mpifort', 'mpirun', 'ompi_info', 'opal_wrapper', 'orterun']
bin_names = ['mpicc', 'mpicxx', 'mpif90', 'mpifort', 'ompi_info', 'opal_wrapper']
if LooseVersion(self.version) >= LooseVersion('5.0.0'):
bin_names.append('prterun')
else:
bin_names.extend(['mpirun', 'orterun'])
boegel marked this conversation as resolved.
Show resolved Hide resolved
bin_files = [os.path.join('bin', x) for x in bin_names]

shlib_ext = get_shared_lib_ext()
lib_names = ['mpi_mpifh', 'mpi', 'ompitrace', 'open-pal', 'open-rte']
lib_names = ['mpi_mpifh', 'mpi', 'open-pal']
if LooseVersion(self.version) >= LooseVersion('5.0.0'):
lib_names.append('prrte')
else:
lib_names.extend(['ompitrace', 'open-rte'])
lib_files = [os.path.join('lib', 'lib%s.%s' % (x, shlib_ext)) for x in lib_names]

inc_names = ['mpi-ext', 'mpif-config', 'mpif', 'mpi', 'mpi_portable_platform']
if LooseVersion(self.version) >= LooseVersion('5.0.0'):
inc_names.append('prte')
inc_files = [os.path.join('include', x + '.h') for x in inc_names]

custom_paths = {
Expand Down