Skip to content

Commit

Permalink
Merge pull request #7 from boegel/impi-use-latest-for-libfabric
Browse files Browse the repository at this point in the history
use self.version rather than 'latest' symlink to point to correct subdirectory in impi build dir
  • Loading branch information
bartoldeman authored Apr 28, 2021
2 parents 90f3876 + 95f1f85 commit 9bfb976
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions easybuild/easyblocks/i/impi.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def sanity_check_step(self):
mpi_mods.extend(['mpi_base.mod', 'mpi_constants.mod', 'mpi_sizeofs.mod'])

if impi_ver >= LooseVersion('2021'):
mpi_subdir = os.path.join('mpi', 'latest')
mpi_subdir = os.path.join('mpi', self.version)
bin_dir = os.path.join(mpi_subdir, 'bin')
include_dir = os.path.join(mpi_subdir, 'include')
lib_dir = os.path.join(mpi_subdir, 'lib', 'release')
Expand Down Expand Up @@ -237,7 +237,7 @@ def sanity_check_step(self):
if impi_ver >= LooseVersion('2017'):
# Add minimal test program to sanity checks
if impi_ver >= LooseVersion('2021'):
impi_testsrc = os.path.join(self.installdir, 'mpi', 'latest', 'test', 'test.c')
impi_testsrc = os.path.join(self.installdir, 'mpi', self.version, 'test', 'test.c')
else:
impi_testsrc = os.path.join(self.installdir, 'test', 'test.c')

Expand Down Expand Up @@ -281,7 +281,7 @@ def make_module_req_guess(self):

impi_ver = LooseVersion(self.version)
if impi_ver >= LooseVersion('2021'):
mpi_subdir = os.path.join('mpi', 'latest')
mpi_subdir = os.path.join('mpi', self.version)
lib_dirs = [
os.path.join(mpi_subdir, 'lib'),
os.path.join(mpi_subdir, 'lib', 'release'),
Expand All @@ -295,7 +295,7 @@ def make_module_req_guess(self):
manpath = os.path.join(mpi_subdir, 'man')

if self.cfg['ofi_internal']:
libfabric_dir = os.path.join('mpi', 'latest', 'libfabric')
libfabric_dir = os.path.join('mpi', self.version, 'libfabric')
lib_dirs.append(os.path.join(libfabric_dir, 'lib'))
path_dirs.append(os.path.join(libfabric_dir, 'bin'))
guesses['FI_PROVIDER_PATH'] = [os.path.join(libfabric_dir, 'lib', 'prov')]
Expand Down

0 comments on commit 9bfb976

Please sign in to comment.