[core] Node : add defaultStatus in _createChunks

Author: Alxiice

bin/meshroom_createChunks

@@ -72,7 +72,7 @@ submittedStatuses = [Status.RUNNING]
 # Find job
 submitter, job = None, None
 # It's required if we want to spool chunks on different machines
-jobInfos = node._nodestatus.jobInfos
+jobInfos = node._nodeStatus.jobInfos
 submitterName, jid = jobInfos.get("submitterName"), jobInfos.get("jid")
 for subName, sub in submitters.items():
     if not sub._options.includes(SubmitterOptionsEnum.RETRIEVE):
@@ -86,6 +86,10 @@ if not (hasattr(node, '_chunksCreated') and node._chunksCreated):
     # Create node chunks
     # Once created we don't have to do it again even if we relaunch the job
     node._createChunks()
+    # TODO
+    # Notify that the chunk is submitted
+    # for chunk in node._chunks:
+    #     chunk._status.initExternSubmit()
 
 # Get chunks to process in the current process
 chunksToProcess = []

meshroom/core/desc/node.py

@@ -162,7 +162,7 @@ def processChunk(self, chunk):
 
     def executeChunkCommandLine(self, chunk, cmd, env=None):
         try:
-            with open(chunk.logFile, 'w') as logF:
+            with open(chunk.getLogFile(), 'w') as logF:
                 chunk.status.commandLine = cmd
                 chunk.saveStatusFile()
                 cmdList = shlex.split(cmd)
@@ -171,7 +171,7 @@ def executeChunkCommandLine(self, chunk, cmd, env=None):
 
                 print(f"Starting Process for '{chunk.node.name}'")
                 print(f" - commandLine: {cmd}")
-                print(f" - logFile: {chunk.logFile}")
+                print(f" - logFile: {chunk.getLogFile()}")
                 if prog:
                     cmdList[0] = Path(prog).as_posix()
                     print(f" - command full path: {cmdList[0]}")
@@ -216,7 +216,7 @@ def executeChunkCommandLine(self, chunk, cmd, env=None):
                         pass
 
             if chunk.subprocess.returncode != 0:
-                with open(chunk.logFile, "r") as logF:
+                with open(chunk.getLogFile(), "r") as logF:
                     logContent = "".join(logF.readlines())
                 raise RuntimeError(f'Error on node "{chunk.name}":\nLog:\n{logContent}')
         finally:

meshroom/core/graph.py

@@ -1081,6 +1081,7 @@ def dfsToProcess(self, startNodes=None):
              visited nodes and edges that are not already computed (node.status != SUCCESS).
              The order is defined by the visit and finishVertex event.
         """
+        print(f"[Graph] (dfsToProcess) startNodes={startNodes}")
         nodes = []
         edges = []
         visitor = Visitor(reverse=False, dependenciesOnly=True)
@@ -1091,6 +1092,10 @@ def discoverVertex(vertex, graph):
                 raise StopBranchVisit()
 
         def finishVertex(vertex, graph):
+            if not vertex.chunks:
+                # Chunks have not been initialized
+                nodes.append(vertex)
+                return
             chunksToProcess = []
             for chunk in vertex.chunks:
                 if chunk.status.status is not Status.SUCCESS: