Fix errors after rebase : move localFarmSubmitter module & remove useless functions

Author: Alxiice

meshroom/submitters/localFarm/localFarmSubmitter.py

@@ -5,7 +5,7 @@
 import shutil
 import logging
 from pathlib import Path
-from typing import Dict
+from typing import Dict, List
 from meshroom.core.submitter import BaseSubmitter, SubmitterOptions, BaseSubmittedJob, SubmitterOptionsEnum
 from meshroom.core.submitter import OrderedTask, OrderedTaskType
 from collections import namedtuple
@@ -77,7 +77,7 @@ def getRequestPackages(packagesDelimiter="=="):
     return list(reqPackages)
 
 
-def rezWrapCommand(cmd, useCurrentContext=False, useRequestedContext=True, otherRezPkg: list[str] = None, additionalEnv: dict=None):
+def rezWrapCommand(cmd, useCurrentContext=False, useRequestedContext=True, otherRezPkg: List[str] = None, additionalEnv: dict=None):
     """ Wrap command to be runned using rez.
     :param cmd: command to run
     :type cmd: bool
@@ -257,23 +257,6 @@ def getExpandWrappedCmd(self, cmdArgs, rezPackages):
             cmd = rezWrapCommand(cmd, otherRezPkg=rezPackages, additionalEnv=self.jobEnv)
         return cmd
 
-    def __createChunkTasks(self, job: Job, parentTask: Task, children: List[Task], chunkParams: dict) -> Task:
-        cmdArgs = chunkParams.get("chunkCmdArgs")
-        chunks = self.getChunks(chunkParams)
-        for c in chunks:
-            name = f"{parentTask.name}_{c.start}_{c.end}"
-            meta = parentTask.metadata.copy()
-            meta["iteration"] = c.iteration
-            cmdBin = wrapMeshroomBin("meshroom_compute")
-            cmd = f"{cmdBin} {cmdArgs} --iteration {c.iteration}"
-            if not self.disabled_rez:
-                cmd = rezWrapCommand(cmd, otherRezPkg=self.reqPackages)
-            chunkTask = Task(name=name, command=cmd, metadata=meta, env=self.jobEnv)
-            job.addTask(chunkTask)
-            for child in children:
-                job.addTaskDependency(child, chunkTask)
-            job.addTaskDependency(chunkTask, parentTask)
-
     def createFarmTask(self, meshroomFile: str, orderedTask: OrderedTask, createdTasks: Dict[OrderedTask, Task]) -> Task:
         metadata = dict()
         if orderedTask.node:

tests/test_submit.py

@@ -18,7 +18,7 @@
 from meshroom.core.submitter import BaseSubmitter
 from meshroom.core.submitter import jobManager
 from meshroom.core.submitter import OrderedTask, OrderedTasks, OrderedTaskType
-from meshroom.submitters.localFarmSubmitter import LocalFarmSubmitter, LocalFarmJob
+from meshroom.submitters.localFarm.localFarmSubmitter import LocalFarmSubmitter, LocalFarmJob
 
 from localfarm.localFarmLauncher import FarmLauncher
 
@@ -62,14 +62,13 @@ def waitForNodeCompletion(job: LocalFarmJob, node: Node, timeout=25):
         # Check that all tasks are finished
         for task in job.localfarmTasks.values():
             if task.get("status") not in (Status.NONE.name, Status.SUCCESS.name, Status.STOPPED.name, Status.ERROR.name):
-                continue
-        break
-        # Stop if the node switched to done
-        node.updateStatusFromCache()
-        nodeStatus = node.getGlobalStatus()
-        if nodeStatus not in (Status.SUBMITTED, Status.RUNNING):
+                break
+        else:
+            # All the tasks are finished
+            node.updateStatusFromCache()
+            nodeStatus = node.getGlobalStatus()
             print(f"Node status switched to {nodeStatus}")
-            return
+            break
 
 
 def processSubmit(node: Node, graph, tmp_path):
@@ -120,8 +119,8 @@ class TestNodeSubmit:
 
     @classmethod
     def setup_class(cls):
-        # meshroom.core.initSubmitters()
-        submitters = loadSubmitters(meshroomFolder, "submitters")
+        submittersFolder = os.path.join(meshroomFolder, "submitters")
+        submitters = loadSubmitters(submittersFolder, "localFarm")
         for submitter in submitters:
             registerSubmitter(submitter())