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

Every old spec has empty compiler flags

Browse Source
This commit is contained in:
Gregory Becker 2016-05-05 17:49:30 -07:00
parent 1bb7bfaf7f
commit 9a39ccea8f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/spec.py
View File

@ -756,13 +756,15 @@ def dag_hash(self, length=None):
""" """
yaml_text = yaml.dump( yaml_text = yaml.dump(
self.to_node_dict(), default_flow_style=True, width=sys.maxint) self.to_node_dict(), default_flow_style=True, width=sys.maxint)
print yaml_text
sha = hashlib.sha1(yaml_text) sha = hashlib.sha1(yaml_text)
return base64.b32encode(sha.digest()).lower()[:length] return base64.b32encode(sha.digest()).lower()[:length]
def to_node_dict(self): def to_node_dict(self):
params = dict( (name, v.value) for name, v in self.variants.items() ) params = dict( (name, v.value) for name, v in self.variants.items() )
params.update( dict( (name, value) for name, value in self.compiler_flags.items()) ) params.update( dict( (name, []) for name in FlagMap.valid_compiler_flags() ) )
params.update( dict( (name, value) for name, value in self.compiler_flags.items()) ) #override
d = { d = {
'parameters' : params, 'parameters' : params,
'arch' : self.architecture, 'arch' : self.architecture,
@ -817,8 +819,8 @@ def from_node_dict(node):
elif 'variants' in node: elif 'variants' in node:
for name, value in node['variants'].items(): for name, value in node['variants'].items():
spec.variants[name] = VariantSpec(name, value) spec.variants[name] = VariantSpec(name, value)
# for name in FlagMap.valid_compiler_flags(): for name in FlagMap.valid_compiler_flags():
# spec.compiler_flags[name] = [] spec.compiler_flags[name] = []
else: else:
raise SpackRecordError("Did not find a valid format for variants in YAML file") raise SpackRecordError("Did not find a valid format for variants in YAML file")