Skip to content

Exclude dependencies of dependencies that extend $MODULEPATH #2152

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

Merged
merged 2 commits into from
Mar 10, 2017
Merged

Exclude dependencies of dependencies that extend $MODULEPATH #2152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4abd76c
Exclude dependencies of dependencies that extend $MODULEPATH
bartoldeman Mar 9, 2017
9187af7
Rename dep to excluded_dep.
bartoldeman Mar 9, 2017
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: 9 additions & 0 deletions easybuild/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,15 @@ def make_module_dep(self, unload_info=None):
# if the modules that extend $MODULEPATH are not loaded this module is not available, so there is not
# point in loading them again (in fact, it may cause problems when reloading this module due to a load storm)
deps = [d for d in deps if d not in excluded_deps]

# load modules that open up the module tree before checking deps of deps (in reverse order)
self.modules_tool.load(excluded_deps[::-1])

for dep in excluded_deps:
Copy link
Member

@boegel boegel Mar 9, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bartoldeman one tiny suggestion: I would rename dep to excluded_dep here, to avoid confusion...

excluded_dep_deps = dependencies_for(dep, self.modules_tool)
self.log.debug("List of dependencies for excluded dependency %s: %s" % (dep, excluded_dep_deps))
deps = [d for d in deps if d not in excluded_dep_deps]

self.log.debug("List of retained deps to load in generated module: %s", deps)

# include load statements for retained dependencies
Expand Down
40 changes: 40 additions & 0 deletions test/framework/easyblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,46 @@ def test_make_module_dep_hmns(self):
regex = re.compile('load.*FFTW/3.3.3')
self.assertTrue(regex.search(mod_dep_txt), "Pattern '%s' found in: %s" % (regex.pattern, mod_dep_txt))

def test_make_module_dep_of_dep_hmns(self):
"""Test for make_module_dep under HMNS with dependencies of dependencies"""
test_ecs_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'easyconfigs', 'test_ecs')
all_stops = [x[0] for x in EasyBlock.get_steps()]
build_options = {
'check_osdeps': False,
'robot_path': [test_ecs_path],
'valid_stops': all_stops,
'validate': False,
}
os.environ['EASYBUILD_MODULE_NAMING_SCHEME'] = 'HierarchicalMNS'
init_config(build_options=build_options)
self.setup_hierarchical_modules()

# GCC and OpenMPI extend $MODULEPATH; hwloc is a dependency of OpenMPI.
self.contents = '\n'.join([
'easyblock = "ConfigureMake"',
'name = "pi"',
'version = "3.14"',
'homepage = "http://example.com"',
'description = "test easyconfig"',
"toolchain = {'name': 'goolf', 'version': '1.4.10'}",
'dependencies = [',
" ('GCC', '4.7.2', '', True),"
" ('hwloc', '1.6.2', '', ('GCC', '4.7.2')),",
" ('OpenMPI', '1.6.4', '', ('GCC', '4.7.2')),"
']',
])
self.writeEC()
eb = EasyBlock(EasyConfig(self.eb_file))

eb.installdir = os.path.join(config.install_path(), 'pi', '3.14')
eb.check_readiness_step()

# GCC, OpenMPI and hwloc modules should *not* be included in loads for dependencies
mod_dep_txt = eb.make_module_dep()
for mod in ['GCC/4.7.2', 'OpenMPI/1.6.4', 'hwloc/1.6.2']:
regex = re.compile('load.*%s' % mod)
self.assertFalse(regex.search(mod_dep_txt), "Pattern '%s' found in: %s" % (regex.pattern, mod_dep_txt))

def test_extensions_step(self):
"""Test the extensions_step"""
self.contents = '\n'.join([
Expand Down