3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-22 13:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[graph] handle invalidation value for output attributes

Browse source 
output attributes UIDs are only based on the hash of their values without the cache folder
This commit is contained in:
Yann Lanthony 2017-10-30 11:35:07 +01:00
parent 7da2466c74
commit c1a0f43ee3
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
meshroom/core/graph.py
View file

@ -92,6 +92,9 @@ class Attribute(BaseObject):
self._label = getattr(attributeDesc, 'label', None) self._label = getattr(attributeDesc, 'label', None)
self._isOutput = getattr(attributeDesc, 'isOutput', False) self._isOutput = getattr(attributeDesc, 'isOutput', False)
# invalidation value for output attributes
self._invalidationValue = ""
def absoluteName(self): def absoluteName(self):
return '{}.{}.{}'.format(self.node.graph.name, self.node.name, self._name) return '{}.{}.{}'.format(self.node.graph.name, self.node.name, self._name)
@ -130,9 +133,8 @@ class Attribute(BaseObject):
""" """
""" """
if self.attributeDesc.isOutput: if self.attributeDesc.isOutput:
# only dependent of the linked node uid, so it is independent # only dependent on the hash of its value without the cache folder
# from the cache folder which may be used in the filepath. return hash(self._invalidationValue)
return self.node.uid()
if self.isLink: if self.isLink:
return self.getLinkParam().uid() return self.getLinkParam().uid()
if isinstance(self._value, basestring): if isinstance(self._value, basestring):
@ -461,6 +463,10 @@ class Node(BaseObject):
self._cmdVars[attr.attributeDesc.group] = self._cmdVars.get(attr.attributeDesc.group, '') + \ self._cmdVars[attr.attributeDesc.group] = self._cmdVars.get(attr.attributeDesc.group, '') + \
' ' + self._cmdVars[name] ' ' + self._cmdVars[name]
# For updating output attributes invalidation values
cmdVarsNoCache = self._cmdVars.copy()
cmdVarsNoCache['cache'] = ''
# Evaluate output params # Evaluate output params
for name, attr in self._attributes.objects.items(): for name, attr in self._attributes.objects.items():
if not attr.attributeDesc.isOutput: if not attr.attributeDesc.isOutput:
@ -468,6 +474,9 @@ class Node(BaseObject):
attr.value = attr.attributeDesc.value.format( attr.value = attr.attributeDesc.value.format(
nodeType=self.nodeType, nodeType=self.nodeType,
**self._cmdVars) **self._cmdVars)
attr._invalidationValue = attr.attributeDesc.value.format(
nodeType=self.nodeType,
**cmdVarsNoCache)
v = attr.value v = attr.value
self._cmdVars[name] = '--{name} {value}'.format(name=name, value=v) self._cmdVars[name] = '--{name} {value}'.format(name=name, value=v)