From 3aa984a0a57bf1d48a2e4e508658eecbb3c1168f Mon Sep 17 00:00:00 2001
From: Fabien Castan <fabcastan@gmail.com>
Date: Tue, 22 Feb 2022 15:23:34 +0100
Subject: [PATCH 1/2] [submitters] simpleFarm: updates for rez packages
 versions detection

Use REZ_REQUEST and REZ_RESOLVE to define the direct packages
dependencies.
---
 meshroom/submitters/simpleFarmSubmitter.py | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/meshroom/submitters/simpleFarmSubmitter.py b/meshroom/submitters/simpleFarmSubmitter.py
index fc46bf8c7a..b04a4990e9 100644
--- a/meshroom/submitters/simpleFarmSubmitter.py
+++ b/meshroom/submitters/simpleFarmSubmitter.py
@@ -3,6 +3,7 @@
 
 import os
 import json
+import logging
 
 import simpleFarm
 from meshroom.core.desc import Level
@@ -12,14 +13,12 @@
 binDir = os.path.dirname(os.path.dirname(os.path.dirname(currentDir)))
 
 class SimpleFarmSubmitter(BaseSubmitter):
-    if 'REZ_MESHROOM_VERSION' in os.environ:
-        MESHROOM_PACKAGE = "meshroom-{}".format(os.environ.get('REZ_MESHROOM_VERSION', ''))
-    else:
-        MESHROOM_PACKAGE = None
 
     filepath = os.environ.get('SIMPLEFARMCONFIG', os.path.join(currentDir, 'simpleFarmConfig.json'))
     config = json.load(open(filepath))
 
+    reqPackages = []
+    environment = {}
     ENGINE = ''
     DEFAULT_TAGS = {'prod': ''}
 
@@ -28,6 +27,32 @@ def __init__(self, parent=None):
         self.engine = os.environ.get('MESHROOM_SIMPLEFARM_ENGINE', 'tractor')
         self.share = os.environ.get('MESHROOM_SIMPLEFARM_SHARE', 'vfx')
         self.prod = os.environ.get('PROD', 'mvg')
+        if 'REZ_REQUEST' in os.environ:
+            packages = os.environ.get('REZ_REQUEST', '').split()
+            resolvedPackages = os.environ.get('REZ_RESOLVE', '').split()
+            resolvedVersions = {}
+            for r in resolvedPackages:
+                # remove implict packages
+                if r.startswith('~'):
+                    continue
+                # logging.info('REZ: {}'.format(str(r)))
+                v = r.split('-')
+                # logging.info('    v: {}'.format(str(v)))
+                if len(v) == 2:
+                    resolvedVersions[v[0]] = v[1]
+            for p in packages:
+                if p.startswith('~'):
+                    continue
+                v = p.split('-')
+                self.reqPackages.append('-'.join([v[0], resolvedVersions[v[0]]]))
+            logging.debug('REZ Packages: {}'.format(str(self.reqPackages)))
+        elif 'REZ_MESHROOM_VERSION' in os.environ:
+            self.reqPackages = ["meshroom-{}".format(os.environ.get('REZ_MESHROOM_VERSION', ''))]
+        else:
+            self.reqPackages = None
+
+        if 'REZ_DEV_PACKAGES_ROOT' in os.environ:
+            self.environment['REZ_DEV_PACKAGES_ROOT'] = os.environ['REZ_DEV_PACKAGES_ROOT']
 
     def createTask(self, meshroomFile, node):
         tags = self.DEFAULT_TAGS.copy()  # copy to not modify default tags
@@ -50,10 +75,10 @@ def createTask(self, meshroomFile, node):
         task = simpleFarm.Task(
             name=node.nodeType,
             command='{exe} --node {nodeName} "{meshroomFile}" {parallelArgs} --extern'.format(
-                exe='meshroom_compute' if self.MESHROOM_PACKAGE else os.path.join(binDir, 'meshroom_compute'),
+                exe='meshroom_compute' if self.reqPackages else os.path.join(binDir, 'meshroom_compute'),
                 nodeName=node.name, meshroomFile=meshroomFile, parallelArgs=parallelArgs),
             tags=tags,
-            rezPackages=[self.MESHROOM_PACKAGE] if self.MESHROOM_PACKAGE else None,
+            rezPackages=self.reqPackages,
             requirements={'service': str(','.join(allRequirements))},
             **arguments)
         return task
@@ -74,6 +99,7 @@ def submit(self, nodes, edges, filepath):
         job = simpleFarm.Job(name,
                 tags=mainTags,
                 requirements={'service': str(','.join(allRequirements))},
+                environment=self.environment,
                 )
 
         nodeNameToTask = {}

From 91b68e7f3bb5aafe97dbfa71f92988ba6225a391 Mon Sep 17 00:00:00 2001
From: Fabien Castan <fabcastan@gmail.com>
Date: Tue, 22 Feb 2022 15:24:02 +0100
Subject: [PATCH 2/2] [submitters] simpleFarm: update gpu tags

---
 meshroom/submitters/simpleFarmConfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meshroom/submitters/simpleFarmConfig.json b/meshroom/submitters/simpleFarmConfig.json
index 67fd4036a0..c5c2d5fea7 100644
--- a/meshroom/submitters/simpleFarmConfig.json
+++ b/meshroom/submitters/simpleFarmConfig.json
@@ -12,7 +12,7 @@
     },
     "GPU": {
         "NONE": [],
-        "NORMAL": ["!\"*rnd*\""],
-        "INTENSIVE": ["!\"*rnd*\"", "@.nCPUs>=12"]
+        "NORMAL": ["cuda8G"],
+        "INTENSIVE": ["cuda16G"]
     }
 }