wip

Author: Alxiice

bin/meshroom_compute

@@ -141,27 +141,26 @@ if args.node:
     if args.extern:
         # Restore the log level
         logging.getLogger().setLevel(meshroom.logStringToPython[args.verbose])
-
-    # Prepare logger
-    node.prepareLogger(args.iteration)
-    # Preprocess
-    node.preprocess(args.forceCompute, args.inCurrentEnv)
-    # Process
+        
     if args.iteration == ChunkIndex.NONE:
+        # Process the whole node
         if node.nodeStatus.status == Status.STOPPED:
             print(f"Node {node}: status is STOPPED")
             killRunningJob(node)
+        node.preprocess(args.forceCompute, args.inCurrentEnv)
+        node.prepareLogger(args.iteration)
         node.process(args.forceCompute, args.inCurrentEnv)
+        node.restoreLogger()
+        node.postprocess(args.forceCompute, args.inCurrentEnv)
     else:
         chunk = chunks[0]
         if chunk._status.status == Status.STOPPED:
             print(f"Chunk {chunk}: status is STOPPED")
             killRunningJob(node)
+        node.prepareLogger(args.iteration)
         chunk.process(args.forceCompute, args.inCurrentEnv)
-    # Postprocess
-    node.postprocess(args.forceCompute, args.inCurrentEnv)
-    # Restore logger
-    node.restoreLogger()
+        node.restoreLogger()
+
 else:
     if args.iteration != ChunkIndex.NONE:
         print('Error: "--iteration" only makes sense when used with "--node".')

bin/meshroom_createChunks

@@ -129,13 +129,13 @@ if not args.forceStatus and not args.forceCompute:
                 f"submitterSessionUid: {node._nodeStatus.submitterSessionUid}")
 
 if chunksToProcess:
-    node.prepareLogger()
     node.preprocess()
+    node.prepareLogger()
     for chunk in chunksToProcess:
         logging.info(f"[MeshroomCreateChunks] process chunk {chunk}")
         chunk.process(args.forceCompute, args.inCurrentEnv)
-    node.postprocess()
     node.restoreLogger()
+    node.postprocess()
 else:
     logging.info(f"[MeshroomCreateChunks] -> create job to process chunks {[c for c in node.chunks]}")
     submitter.createChunkTask(node, graphFile=args.graphFile, cache=args.cache, 

meshroom/core/desc/node.py

@@ -426,7 +426,7 @@ def processChunkInEnvironment(self, chunk):
             meshroomComputeCmd += f" --preprocess"
         elif chunk.isPostprocess:
             meshroomComputeCmd += f" --postprocess"
-        elif len(chunk.node.getChunks()) > 1:
+        elif len(chunk.node.getChunks()) >= 1:
             meshroomComputeCmd += f" --iteration {chunk.range.iteration}"
 
         runtimeEnv = chunk.node.nodeDesc.plugin.runtimeEnv

meshroom/core/node.py

@@ -408,25 +408,22 @@ def makeProgressBar(self, end, message=''):
 
             f.close()
 
-        with open(self.logFile) as f:
+        with open(self.logFile, "r") as f:
             content = f.read()
             self.progressBarPosition = content.rfind('\n')
 
-            f.close()
-
     def updateProgressBar(self, value):
         assert self.progressBar
         assert value <= self.progressEnd
 
         tics = round((value/self.progressEnd)*51)
 
-        with open(self.logFile, 'r+') as f:
+        with open(self.logFile, "r+") as f:
             text = f.read()
             for i in range(tics-self.currentProgressTics):
                 text = text[:self.progressBarPosition]+'*'+text[self.progressBarPosition:]
             f.seek(0)
             f.write(text)
-            f.close()
 
         self.currentProgressTics = tics
 
@@ -1719,9 +1716,10 @@ def processIteration(self, iteration):
 
     def preprocess(self, forceCompute=False, inCurrentEnv=False):
         """ Prepare the node processing """
+        self.prepareLogger(ChunkIndex.PREPROCESS)
         if self.nodeDesc._hasPreprocess:
-            # self.nodeDesc.preprocess(self)
             self._preprocessChunk.process(forceCompute, inCurrentEnv)
+        self.restoreLogger()
 
     def process(self, forceCompute=False, inCurrentEnv=False):
         for chunk in self._chunks:
@@ -1732,14 +1730,15 @@ def postprocess(self, forceCompute=False, inCurrentEnv=False):
         Invoke the post process on Client Node to execute after the processing on the
         node is completed
         """
+        self.prepareLogger(ChunkIndex.POSTPROCESS)
         if self.nodeDesc._hasPostprocess:
-            # self.nodeDesc.postprocess(self)
             self._postprocessChunk.process(forceCompute, inCurrentEnv)
+        self.restoreLogger()
 
     def getLogHandlers(self):
         return self._handlers
 
-    def prepareLogger(self, iteration=-1):
+    def prepareLogger(self, iteration=ChunkIndex.NONE):
         # Get file handler path
         chunkName = self.getChunkName(iteration)
         logFileName = f"{chunkName}.log"

meshroom/ui/qml/Utils/Colors.qml

@@ -52,7 +52,7 @@ QtObject {
     ]
 
     function getChunkColor(chunk, overrides) {
-        if (chunk === undefined)
+        if (chunk === undefined || chunk == null)
             return "transparent"
         if (overrides && chunk.statusName in overrides) {
             return overrides[chunk.statusName]

tests/test_compute.py

@@ -23,21 +23,21 @@
 def executeChunks(node, size):
     os.makedirs(node.internalFolder)
     logFiles = {}
+    node.preprocess()
     for chunkIndex in range(size):
         iteration = chunkIndex if size > 1 else -1
         logFileName = f"{chunkIndex}.log"
         logFile = Path(node.internalFolder) / logFileName
         logFiles[chunkIndex] = logFile
         logFile.touch()
         node.prepareLogger(iteration)
-        node.preprocess()
         if size > 1:
             chunk = node.chunks[chunkIndex]
             chunk.process(True, True)
         else:
             node.process(True, True)
-        node.postprocess()
         node.restoreLogger()
+    node.postprocess()
     return logFiles