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

Make _hash private to discourage access; fix dag_hash length handling.

Browse Source
This commit is contained in:
Todd Gamblin
2016-05-09 03:39:08 -07:00
parent 7151fd8836
commit 0c853ac3ea
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,8 @@
spec = id [ options ] spec = id [ options ]
options = { @version-list | +variant | -variant | ~variant | options = { @version-list | +variant | -variant | ~variant |
%compiler | arch=architecture | [ flag ]=value} %compiler | arch=architecture | [ flag ]=value}
flag = { cflags | cxxflags | fflags | cppflags | ldflags | flag = { cflags | cxxflags | fcflags | fflags | cppflags |
ldlibs } ldflags | ldlibs }
variant = id variant = id
architecture = id architecture = id
compiler = id [ version-list ] compiler = id [ version-list ]
@@ -112,8 +112,8 @@
import spack.parse import spack.parse
import spack.error import spack.error
import spack.compilers as compilers import spack.compilers as compilers
import spack.compiler as Compiler
# TODO: move display_specs to some other location.
from spack.cmd.find import display_specs from spack.cmd.find import display_specs
from spack.version import * from spack.version import *
from spack.util.string import * from spack.util.string import *
@@ -377,7 +377,9 @@ def __str__(self):
return ''.join(str(self[key]) for key in sorted_keys) return ''.join(str(self[key]) for key in sorted_keys)
_valid_compiler_flags = ['cflags', 'cxxflags', 'fflags', 'ldflags', 'ldlibs', 'cppflags'] _valid_compiler_flags = [
'cflags', 'cxxflags', 'fcflags', 'fflags', 'ldflags', 'ldlibs', 'cppflags']
class FlagMap(HashableMap): class FlagMap(HashableMap):
def __init__(self, spec): def __init__(self, spec):
super(FlagMap, self).__init__() super(FlagMap, self).__init__()
@@ -486,7 +488,7 @@ def __init__(self, spec_like, *dep_like, **kwargs):
self.variants = other.variants self.variants = other.variants
self.variants.spec = self self.variants.spec = self
self.namespace = other.namespace self.namespace = other.namespace
self.hash = other.hash self._hash = other._hash
# Specs are by default not assumed to be normal, but in some # Specs are by default not assumed to be normal, but in some
# cases we've read them from a file want to assume normal. # cases we've read them from a file want to assume normal.
@@ -755,15 +757,15 @@ def dag_hash(self, length=None):
""" """
Return a hash of the entire spec DAG, including connectivity. Return a hash of the entire spec DAG, including connectivity.
""" """
if self.hash: if self._hash:
return self.hash return self._hash[:length]
else: else:
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)
sha = hashlib.sha1(yaml_text) sha = hashlib.sha1(yaml_text)
b32_hash = base64.b32encode(sha.digest()).lower()[:length] b32_hash = base64.b32encode(sha.digest()).lower()[:length]
if self.concrete: if self.concrete:
self.hash = b32_hash self._hash = b32_hash
return b32_hash return b32_hash
def to_node_dict(self): def to_node_dict(self):
@@ -811,7 +813,7 @@ def from_node_dict(node):
spec.architecture = node['arch'] spec.architecture = node['arch']
if 'hash' in node: if 'hash' in node:
spec.hash = node['hash'] spec._hash = node['hash']
if node['compiler'] is None: if node['compiler'] is None:
spec.compiler = None spec.compiler = None
@@ -1644,7 +1646,7 @@ def _dup(self, other, **kwargs):
self.variants.spec = self self.variants.spec = self
self.external = other.external self.external = other.external
self.namespace = other.namespace self.namespace = other.namespace
self.hash = other.hash self._hash = other._hash
# If we copy dependencies, preserve DAG structure in the new spec # If we copy dependencies, preserve DAG structure in the new spec
if kwargs.get('deps', True): if kwargs.get('deps', True):
@@ -2047,6 +2049,7 @@ def do_parse(self):
try: try:
while self.next: while self.next:
# TODO: clean this parsing up a bit
if self.previous: if self.previous:
specs.append(self.previous.value) specs.append(self.previous.value)
if self.accept(ID): if self.accept(ID):
@@ -2138,7 +2141,7 @@ def spec(self, name, check_valid_token = False):
spec.dependents = DependencyMap() spec.dependents = DependencyMap()
spec.dependencies = DependencyMap() spec.dependencies = DependencyMap()
spec.namespace = spec_namespace spec.namespace = spec_namespace
spec.hash = None spec._hash = None
spec._normal = False spec._normal = False
spec._concrete = False spec._concrete = False