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

[core/bin] Submitting: remove a duplicate function and move another one

Browse source
This commit is contained in:
Julien-Haudegond 2020-09-03 18:12:51 +02:00
parent 78f7febeb7
commit 3f3a6c0e83
5 changed files with 35 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

33
meshroom/core/taskManager.py
View file

@ -5,6 +5,7 @@ from enum import Enum
import meshroom
from meshroom.common import BaseObject, DictModel, Property, Signal, Slot
from meshroom.core.node import Status
import meshroom.core.graph
class State(Enum):
@ -186,7 +187,8 @@ class TaskManager(BaseObject):
if chunksInConflict:
chunksStatus = set([chunk.status.status.name for chunk in chunksInConflict])
chunksName = [node.name for node in chunksInConflict]
# Syntax and terms are used on QML side to recognize the error
# Warning: Syntax and terms are parsed on QML side to recognize the error
# Syntax : [Context] ErrorType: ErrorMessage
msg = '[COMPUTATION] Already Submitted:\n' \
'WARNING - Some nodes are already submitted with status: {}\nNodes: {}'.format(
', '.join(chunksStatus),
@ -275,11 +277,23 @@ class TaskManager(BaseObject):
:return:
"""
# ensure submitter is properly set
sub = meshroom.core.submitters.get(submitter, None)
# Ensure submitter is properly set
sub = None
if submitter:
sub = meshroom.core.submitters.get(submitter, None)
elif len(meshroom.core.submitters) == 1:
# if only one submitter available use it
sub = list(meshroom.core.submitters.values())[0]
if sub is None:
raise RuntimeError("Unknown Submitter : " + submitter)
# Warning: Syntax and terms are parsed on QML side to recognize the error
# Syntax : [Context] ErrorType: ErrorMessage
raise RuntimeError("[SUBMITTING] Unknown Submitter:\n"
"Unknown Submitter called '{submitter}'. Available submitters are: '{allSubmitters}'.".format(
submitter=submitter,
allSubmitters=str(meshroom.core.submitters.keys())
))
# Update task manager's lists
if self._thread._state != State.RUNNING:
self._nodes.clear()
@ -298,6 +312,9 @@ class TaskManager(BaseObject):
flowEdges = graph.flowEdges(startNodes=toNodes)
edgesToProcess = set(edgesToProcess).intersection(flowEdges)
logging.info("Nodes to process: {}".format(nodesToProcess))
logging.info("Edges to process: {}".format(edgesToProcess))
try:
res = sub.submit(nodesToProcess, edgesToProcess, graph.filepath)
if res:
@ -309,6 +326,14 @@ class TaskManager(BaseObject):
except Exception as e:
logging.error("Error on submit : {}".format(e))
def submitFromFile(self, graphFile, submitter, toNode=None):
"""
Submit the given graph via the given submitter.
"""
graph = meshroom.core.graph.loadGraph(graphFile)
toNodes = graph.findNodes([toNode]) if toNode else None
self.submit(graph, submitter, toNodes)
def getAlreadySubmittedChunks(self, nodes):
"""
Check if nodes have already been submitted in another Meshroom instance.