Skip to content

probe external modules for missing metadata that is not provided via extermal module metadata file #3174

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
boegel merged 23 commits into from
Apr 9, 2020
Merged

probe external modules for missing metadata that is not provided via extermal module metadata file #3174

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d56f4fa
Adding the lowercase module name scheme
victorusu Jul 10, 2017
dc51f55
Merge pull request #3 from victorusu/lowercase-name-scheme
victorusu Jul 10, 2017
54d9722
Merge branch 'master' of https://github.com/easybuilders/easybuild-fr…
victorusu Jan 30, 2019
00d0077
Merge branch 'master' of https://github.com/easybuilders/easybuild-fr…
victorusu Jan 23, 2020
46473d5
Add probe of PREFIX and VERSION variable in external modules
victorusu Jan 23, 2020
9cdf2ed
Fix PR remarks and add support for Lua syntax
victorusu Jan 23, 2020
afe4e11
Improve the design
victorusu Jan 23, 2020
5d87a9a
improve cray support
victorusu Jan 30, 2020
6648542
Fix PR remarks
victorusu Feb 17, 2020
bab80b3
Add Cray specific mapping
victorusu Mar 2, 2020
b3152c7
Address PR remarks
victorusu Mar 2, 2020
e6f3eb7
Address style changes
victorusu Mar 2, 2020
6d3a63e
Quick fix to test external_metadata definition hypothesis
victorusu Mar 2, 2020
1a8cf18
Merge branch 'develop' into cug20
boegel Apr 8, 2020
b80c8d6
Merge pull request #4 from boegel/cug20
victorusu Apr 8, 2020
e36cde2
rename ModulesTool.get_variable_from_modulefile method to ModulesTool…
boegel Apr 8, 2020
1507e62
reimplement handle_external_module_metadata + clean up probe_external…
boegel Apr 8, 2020
0277662
enhance test_external_dependencies to check probing of external modul…
boegel Apr 8, 2020
12573ab
fix broken test_resolve_dependencies test by providing dummy implemen…
boegel Apr 8, 2020
a9facb3
strip off leading/trailing whitespace in get_setenv_value_from_module…
boegel Apr 8, 2020
227a9fd
use prefix value rather than name of environment variable that contai…
boegel Apr 8, 2020
1fbea39
Merge pull request #5 from boegel/cug20
victorusu Apr 9, 2020
3aed793
remove unused imports in test/framework/modules.py
boegel Apr 9, 2020
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
21 changes: 14 additions & 7 deletions easybuild/framework/easyconfig/easyconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,13 @@ def handle_external_module_metadata_by_probing_modules(self, dep_name):
dependency = {}

short_ext_modname = dep_name.split('/')[0]

if short_ext_modname.startswith('craype-'):
short_ext_modname = short_ext_modname.split('craype-')[1]
elif short_ext_modname.startswith('cray-'):
short_ext_modname = short_ext_modname.split('cray-')[1]

short_ext_modname.replace('-', '_')
short_ext_modname_upper = convert_name(short_ext_modname, upper=True)

allowed_pairs = [
Expand All @@ -1185,15 +1192,15 @@ def handle_external_module_metadata_by_probing_modules(self, dep_name):
('%s_HOME' % short_ext_modname_upper, '%s_VERSION' % short_ext_modname_upper),
]

for p, v in allowed_pairs:
prefix = self.modules_tool.get_variable_from_modulefile(dep_name, p)
version = self.modules_tool.get_variable_from_modulefile(dep_name, v)
for prefix, version in allowed_pairs:
module_prefix = self.modules_tool.get_variable_from_modulefile(dep_name, prefix)
module_version = self.modules_tool.get_variable_from_modulefile(dep_name, version)

if prefix and version:
if module_prefix and module_version:
dependency = {
'name': [short_ext_modname],
'version': [version],
'prefix': p
'name': [short_ext_modname_upper],
'version': [module_version],
'prefix': module_prefix
}
break

Expand Down