hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules: specialized configure_options for external packages (#5543)

Browse source 
closes #5473

Prior to this PR we were not exiting early for external packages, which
caused the `configure_options` property of the contexts to fail with
e.g. a key error because the DAG gets truncated for them. More
importantly Spack configure options don't make any sense for externals.

Now we exit early, and leave a message in the module file clarifying
that this package has been installed outside of Spack.
This commit is contained in:
Massimiliano Culpo 2017-09-29 18:23:13 +02:00 committed by becker33
parent a63fdc8f35
commit 554937780b
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/spack/spack/modules/common.py
View file

@ -457,16 +457,24 @@ def long_description(self):
def configure_options(self): def configure_options(self):
pkg = self.spec.package pkg = self.spec.package
# If the spec is external Spack doesn't know its configure options
if self.spec.external:
msg = 'unknown, software installed outside of Spack'
return msg
# This is quite simple right now, but contains information on how # This is quite simple right now, but contains information on how
# to call different build system classes. # to call different build system classes.
for attr in ('configure_args', 'cmake_args'): for attr in ('configure_args', 'cmake_args'):
try: try:
configure_args = getattr(pkg, attr)() configure_args = getattr(pkg, attr)()
return ' '.join(configure_args) return ' '.join(configure_args)
except (AttributeError, IOError): except (AttributeError, IOError, KeyError):
# The method doesn't exist in the current spec,
# or it's not usable
pass pass
# The default is to return None # Returning a false-like value makes the default templates skip
# the configure option section
return None return None
@tengine.context_property @tengine.context_property

10
lib/spack/spack/test/modules/lmod.py
View file

@ -236,3 +236,13 @@ def test_override_template_in_modules_yaml(
content = modulefile_content('mpileaks arch=x86-linux') content = modulefile_content('mpileaks arch=x86-linux')
assert 'Override even better!' in content assert 'Override even better!' in content
@pytest.mark.usefixtures('config')
def test_external_configure_args(
self, factory
):
# If this package is detected as an external, its configure option line
# in the module file starts with 'unknown'
writer, spec = factory('externaltool')
assert 'unknown' in writer.context.configure_options