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

two minor fixes

Browse Source
This commit is contained in:
Gregory Becker 2016-06-15 16:44:38 -07:00
commit 3fcd54203c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/compilers/__init__.py
View File

@ -74,7 +74,7 @@ def _to_dict(compiler):
d['spec'] = str(compiler.spec) d['spec'] = str(compiler.spec)
d['paths'] = dict( (attr, getattr(compiler, attr, None)) for attr in _path_instance_vars ) d['paths'] = dict( (attr, getattr(compiler, attr, None)) for attr in _path_instance_vars )
d['operating_system'] = str(compiler.operating_system) d['operating_system'] = str(compiler.operating_system)
d['modules'] = compiler.modules d['modules'] = compiler.modules if compiler.modules else []
if compiler.alias: if compiler.alias:
d['alias'] = compiler.alias d['alias'] = compiler.alias
@ -139,11 +139,11 @@ def remove_compiler_from_config(compiler_spec, scope=None):
- scope: configuration scope to modify. - scope: configuration scope to modify.
""" """
compiler_config = get_compiler_config(scope) compiler_config = get_compiler_config(scope)
matches = [(a,c) for (a,c) in compiler_config.items() if c['spec'] == compiler_spec] matches = [(a,c) for (a,c) in compiler_config.items() if c['spec'] == compiler_spec]
if len(matches) == 1: if len(matches) == 1:
del compiler_config[matches[0][0]] del compiler_config[matches[0][0]]
else: else:
CompilerSpecInsufficientlySpecificError(compiler_spec) CompilerSpecInsufficientlySpecificError(compiler_spec)
spack.config.update_config('compilers', compiler_config, scope) spack.config.update_config('compilers', compiler_config, scope)
@ -232,7 +232,7 @@ def get_compilers(cspec):
if items['compiler']['spec'] != str(cspec): if items['compiler']['spec'] != str(cspec):
continue continue
items = items['compiler'] items = items['compiler']
if not ('paths' in items and all(n in items['paths'] for n in _path_instance_vars)): if not ('paths' in items and all(n in items['paths'] for n in _path_instance_vars)):
raise InvalidCompilerConfigurationError(cspec) raise InvalidCompilerConfigurationError(cspec)
@ -255,7 +255,7 @@ def get_compilers(cspec):
else: else:
operating_system = None operating_system = None
alias = items['alias'] if 'alias' in items else None alias = items['alias'] if 'alias' in items else None
flags = {} flags = {}
@ -311,7 +311,7 @@ def all_os_classes():
this platform this platform
""" """
classes = [] classes = []
platform = spack.architecture.sys_type() platform = spack.architecture.sys_type()
for os_class in platform.operating_sys.values(): for os_class in platform.operating_sys.values():
classes.append(os_class) classes.append(os_class)

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

@ -46,10 +46,10 @@ def check_compiler_yaml_version():
if data: if data:
compilers = data['compilers'] compilers = data['compilers']
if len(compilers) > 0: if len(compilers) > 0:
if 'operating_system' not in compilers[0]['compiler']: if (not isinstance(compilers, list)) or 'operating_system' not in compilers[0]['compiler']:
new_file = os.path.join(scope.path, '_old_compilers.yaml') new_file = os.path.join(scope.path, '_old_compilers.yaml')
tty.warn('%s in out of date compilers format. ' tty.warn('%s in out of date compilers format. '
'Moved to %s. Spack automatically generate ' 'Moved to %s. Spack automatically generate '
'a compilers config file ' 'a compilers config file '
% (file_name, new_file)) % (file_name, new_file))
os.rename(file_name, new_file) os.rename(file_name, new_file)