3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-17 08:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] TaskManager: fix issue with checkCompatibilityNodes()

Browse source
This commit is contained in:
Julien-Haudegond 2020-09-03 19:05:36 +02:00
parent a19ef357c1
commit bdf96e2119
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meshroom/core/taskManager.py
View file

@ -184,7 +184,7 @@ class TaskManager(BaseObject):
if not nodes: if not nodes:
logging.warning('Nothing to compute') logging.warning('Nothing to compute')
return return
self.checkCompatibilityNodes(nodes, "COMPUTATION") # name of the context is important for QML self.checkCompatibilityNodes(graph, nodes, "COMPUTATION") # name of the context is important for QML
nodes = [node for node in nodes if not self.contains(node)] # be sure to avoid non-real conflicts nodes = [node for node in nodes if not self.contains(node)] # be sure to avoid non-real conflicts
chunksInConflict = self.getAlreadySubmittedChunks(nodes) chunksInConflict = self.getAlreadySubmittedChunks(nodes)
@ -273,10 +273,10 @@ class TaskManager(BaseObject):
self._nodes.add(node) self._nodes.add(node)
self._nodesExtern.append(node) self._nodesExtern.append(node)
def checkCompatibilityNodes(self, nodes, context): def checkCompatibilityNodes(self, graph, nodes, context):
compatNodes = [] compatNodes = []
for node in nodes: for node in nodes:
if node in self._graph._compatibilityNodes.values(): if node in graph._compatibilityNodes.values():
compatNodes.append(node.nameToLabel(node.name)) compatNodes.append(node.nameToLabel(node.name))
if compatNodes: if compatNodes:
# Warning: Syntax and terms are parsed on QML side to recognize the error # Warning: Syntax and terms are parsed on QML side to recognize the error
@ -329,7 +329,7 @@ class TaskManager(BaseObject):
if not nodesToProcess: if not nodesToProcess:
logging.warning('Nothing to compute') logging.warning('Nothing to compute')
return return
self.checkCompatibilityNodes(nodesToProcess, "SUBMITTING") # name of the context is important for QML self.checkCompatibilityNodes(graph, nodesToProcess, "SUBMITTING") # name of the context is important for QML
flowEdges = graph.flowEdges(startNodes=toNodes) flowEdges = graph.flowEdges(startNodes=toNodes)
edgesToProcess = set(edgesToProcess).intersection(flowEdges) edgesToProcess = set(edgesToProcess).intersection(flowEdges)