From a60c47de781b94410a6283ff8b537f425ae02c5c Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Thu, 27 Jun 2024 14:58:10 +0000 Subject: [PATCH] Don't consider lib/release for impi >= 2021.11 lib/release is a symbolic link to lib, so we no longer need to include it in LD_LIBRARY_PATH and LIBRARY_PATH --- easybuild/easyblocks/i/impi.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easybuild/easyblocks/i/impi.py b/easybuild/easyblocks/i/impi.py index f7c3c9c998..b30418d889 100644 --- a/easybuild/easyblocks/i/impi.py +++ b/easybuild/easyblocks/i/impi.py @@ -211,7 +211,9 @@ def sanity_check_step(self): mpi_subdir = self.get_versioned_subdir('mpi') 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') + lib_dir = os.path.join(mpi_subdir, 'lib') + if impi_ver < LooseVersion('2021.11'): + lib_dir = os.path.join(lib_dir, 'release') elif impi_ver >= LooseVersion('2019'): bin_dir = os.path.join('intel64', 'bin') @@ -288,9 +290,10 @@ def make_module_req_guess(self): mpi_subdir = self.get_versioned_subdir('mpi') lib_dirs = [ os.path.join(mpi_subdir, 'lib'), - os.path.join(mpi_subdir, 'lib', 'release'), os.path.join(mpi_subdir, 'libfabric', 'lib'), ] + if impi_ver < LooseVersion('2021.11'): + lib_dirs.insert(1, os.path.join(mpi_subdir, 'lib', 'release')) include_dirs = [os.path.join(mpi_subdir, 'include')] path_dirs = [ os.path.join(mpi_subdir, 'bin'),