zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed 'deferred' to 'defer' + don't use it as a decorator

Browse Source
This commit is contained in:
Massimiliano Culpo 2019-01-01 11:48:47 +01:00
parent dce6851d37
commit 675f944a3a
No known key found for this signature in database
GPG Key ID: D1ADB1014FF1118C
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/llnl/util/multiproc.py
View File

@ -14,7 +14,7 @@
__all__ = ['Barrier'] __all__ = ['Barrier']
def deferred(func): def defer(func):
"""Package a function call into something that can be invoked """Package a function call into something that can be invoked
at a later moment. at a later moment.

6
lib/spack/spack/compiler.py
View File

@ -302,7 +302,8 @@ def search_compiler_commands(cls, operating_system, *search_paths):
_NameVariation(*match.groups()), language) _NameVariation(*match.groups()), language)
) )
commands.append( commands.append(
detect_version_command(callback, full_path) llnl.util.multiproc.defer(detect_version)
(callback, full_path)
) )
# Reverse it here so that the dict creation (last insert wins) # Reverse it here so that the dict creation (last insert wins)
@ -351,8 +352,7 @@ def __hash__(self):
_NameVariation = collections.namedtuple('_NameVariation', ['prefix', 'suffix']) _NameVariation = collections.namedtuple('_NameVariation', ['prefix', 'suffix'])
@llnl.util.multiproc.deferred def detect_version(callback, path):
def detect_version_command(callback, path):
"""Detects the version of a compiler at a given path. """Detects the version of a compiler at a given path.
Args: Args:

10
lib/spack/spack/test/compilers.py
View File

@ -23,7 +23,7 @@
import spack.compilers.xl_r import spack.compilers.xl_r
import spack.compilers.fj import spack.compilers.fj
from spack.compiler import detect_version_command, Compiler from spack.compiler import detect_version, Compiler
def test_get_compiler_duplicates(config): def test_get_compiler_duplicates(config):
@ -46,14 +46,14 @@ def test_all_compilers(config):
def test_version_detection_is_empty(): def test_version_detection_is_empty():
command = detect_version_command(lambda x: None, path='/usr/bin/gcc') version = detect_version(lambda x: None, path='/usr/bin/gcc')
expected = (None, "Couldn't get version for compiler /usr/bin/gcc") expected = (None, "Couldn't get version for compiler /usr/bin/gcc")
assert command() == expected assert version == expected
def test_version_detection_is_successful(): def test_version_detection_is_successful():
command = detect_version_command(lambda x: '4.9', path='/usr/bin/gcc') version = detect_version(lambda x: '4.9', path='/usr/bin/gcc')
assert command() == (('4.9', '/usr/bin/gcc'), None) assert version == (('4.9', '/usr/bin/gcc'), None)
def test_compiler_flags_from_config_are_grouped(): def test_compiler_flags_from_config_are_grouped():