Skip to content

pass dependencies to toolchain.prepare when setting up build environment for extensions #5023

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

pass dependencies to toolchain.prepare when setting up build environment for extensions #5023

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
6 changes: 4 additions & 2 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,7 +2126,8 @@ def install_extensions_sequential(self, install=True):
self.log.debug("List of loaded modules: %s", self.modules_tool.list())
# don't reload modules for toolchain, there is no need
# since they will be loaded already by the fake module
ext.toolchain.prepare(onlymod=self.cfg['onlytcmod'], silent=True, loadmod=False,
ext.toolchain.prepare(onlymod=self.cfg['onlytcmod'], deps=self.cfg.dependencies(),
silent=True, loadmod=False,
rpath_filter_dirs=self.rpath_filter_dirs,
rpath_include_dirs=self.rpath_include_dirs,
rpath_wrappers_dir=self.rpath_wrappers_dir)
Expand Down Expand Up @@ -2288,7 +2289,8 @@ def update_exts_progress_bar_helper(running_exts, progress_size):
with self.fake_module_environment(with_build_deps=True):
# don't reload modules for toolchain, there is no
# need since they will be loaded by the fake module
ext.toolchain.prepare(onlymod=self.cfg['onlytcmod'], silent=True, loadmod=False,
ext.toolchain.prepare(onlymod=self.cfg['onlytcmod'], deps=self.cfg.dependencies(),
silent=True, loadmod=False,
rpath_filter_dirs=self.rpath_filter_dirs,
rpath_include_dirs=self.rpath_include_dirs,
rpath_wrappers_dir=self.rpath_wrappers_dir)
Expand Down
6 changes: 3 additions & 3 deletions easybuild/tools/toolchain/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ def get_dependency_version(self, dependency):
raise EasyBuildError("No toolchain version for dependency name %s (suffix %s) found",
dependency['name'], toolchain_suffix)

def _check_dependencies(self, dependencies):
def _check_dependencies(self, dependencies, check_modules=True):
""" Verify if the given dependencies exist and return them """
self.log.debug("_check_dependencies: adding toolchain dependencies %s", dependencies)

Expand All @@ -548,7 +548,7 @@ def _check_dependencies(self, dependencies):

# check whether modules exist
self.log.debug("_check_dependencies: MODULEPATH: %s", os.environ['MODULEPATH'])
if self.dry_run:
if self.dry_run or not check_modules:
deps_exist = [True] * len(dep_mod_names)
else:
deps_exist = self.modules_tool.exist(dep_mod_names)
Expand Down Expand Up @@ -862,7 +862,7 @@ def prepare(self, onlymod=None, deps=None, silent=False, loadmod=True,
# do all dependencies have a toolchain version?
if deps is None:
deps = []
self.dependencies = self._check_dependencies(deps)
self.dependencies = self._check_dependencies(deps, check_modules=loadmod)
if not len(deps) == len(self.dependencies):
self.log.debug("dep %s (%s)" % (len(deps), deps))
self.log.debug("tc.dep %s (%s)" % (len(self.dependencies), self.dependencies))
Expand Down