Skip to content

Only pay attention to use_existing_modules if we have minimal toolchains #2536

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

Closed
ocaisa wants to merge 5 commits into from
Closed

Only pay attention to use_existing_modules if we have minimal toolchains #2536

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa37b54
Only pay attention to use_existing_modules if we have minimal toolchains
Jul 13, 2018
b3cb3ed
Dance around indentation issue
Jul 13, 2018
0c3a5ab
Fix missing parentheses
Jul 13, 2018
c1ec682
Change logic to mean they must both be True
Jul 13, 2018
323bcba
Update easyconfig.py
Jul 13, 2018
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
9 changes: 6 additions & 3 deletions easybuild/framework/easyconfig/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,10 @@ def robot_find_minimal_toolchain_of_dependency(dep, modtool, parent_tc=None, par
parent_tc = dep['toolchain']

avail_modules = []
if build_option('use_existing_modules') and not build_option('retain_all_deps'):
# Use existing modules is only considered relevant to the case where we have minimal toolchains
check_for_module_or_retain_dep = (build_option('use_existing_modules') or not build_option('minimal_toolchains'))\
and not build_option('retain_all_deps')
if check_for_module_or_retain_dep:
avail_modules = modtool.available()

newdep = copy.deepcopy(dep)
Expand All @@ -1463,7 +1466,7 @@ def robot_find_minimal_toolchain_of_dependency(dep, modtool, parent_tc=None, par
if eb_file is not None:
module_exists = False
# if necessary check if module exists
if build_option('use_existing_modules') and not build_option('retain_all_deps'):
if check_for_module_or_retain_dep:
full_mod_name = ActiveMNS().det_full_module_name(newdep)
# fallback to checking with modtool.exist is required,
# for hidden modules and external modules where module name may be partial
Expand All @@ -1476,7 +1479,7 @@ def robot_find_minimal_toolchain_of_dependency(dep, modtool, parent_tc=None, par

# select the toolchain to return, defaulting to the first element (lowest possible toolchain)
minimal_toolchain = possible_toolchains[0]['toolchain']
if build_option('use_existing_modules') and not build_option('retain_all_deps'):
if check_for_module_or_retain_dep:
# take the last element in the case of using existing modules (allows for potentially better optimisation)
filtered_possibilities = [tc for tc in possible_toolchains if tc['module_exists']]
if filtered_possibilities:
Expand Down