From b1984bca97afb3f9dd005eeea786cf1ed5576f59 Mon Sep 17 00:00:00 2001
From: Fabien Castan <faca@mikrosimage.eu>
Date: Mon, 18 Mar 2019 14:51:01 +0100
Subject: [PATCH] [submitters] update submitter config

---
 meshroom/submitters/simpleFarmConfig.json  | 9 +++++----
 meshroom/submitters/simpleFarmSubmitter.py | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/meshroom/submitters/simpleFarmConfig.json b/meshroom/submitters/simpleFarmConfig.json
index dd0e41d0..2e788f78 100644
--- a/meshroom/submitters/simpleFarmConfig.json
+++ b/meshroom/submitters/simpleFarmConfig.json
@@ -1,9 +1,10 @@
 {
-    "BASE": ["mikrosRender", "!RenderLow", "!Wkst_OS", "!\"vfxpc1*\"", "!\"vfxpc??\""],
+    "LIMITS": ["mikros"],
+    "BASE": ["mikrosRender"],
     "CPU": {
         "NONE": [],
         "NORMAL": [],
-        "INTENSIVE": ["\"RenderHigh*\"", "@.nCPUs>20"]
+        "INTENSIVE": ["@.nCPUs>30"]
     },
     "RAM": {
         "NONE": [],
@@ -12,7 +13,7 @@
     },
     "GPU": {
         "NONE": [],
-        "NORMAL": ["!\"*loc*\"", "Wkst"],
-        "INTENSIVE": ["!\"*loc*\"", "Wkst"]
+        "NORMAL": ["!\"*rnd*\""],
+        "INTENSIVE": ["!\"*rnd*\"", "@.nCPUs=12"]
     }
 }
diff --git a/meshroom/submitters/simpleFarmSubmitter.py b/meshroom/submitters/simpleFarmSubmitter.py
index a2b8041e..2340150f 100644
--- a/meshroom/submitters/simpleFarmSubmitter.py
+++ b/meshroom/submitters/simpleFarmSubmitter.py
@@ -42,7 +42,7 @@ class SimpleFarmSubmitter(BaseSubmitter):
 
         tags['nbFrames'] = nbFrames
         tags['prod'] = self.prod
-        allRequirements = list(self.config.get('BASE', []))
+        allRequirements = list()
         allRequirements.extend(self.config['CPU'].get(node.nodeDesc.cpu.name, []))
         allRequirements.extend(self.config['RAM'].get(node.nodeDesc.ram.name, []))
         allRequirements.extend(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
@@ -71,7 +71,10 @@ class SimpleFarmSubmitter(BaseSubmitter):
         allRequirements = list(self.config.get('BASE', []))
 
         # Create Job Graph
-        job = simpleFarm.Job(name, tags=mainTags, requirements={'service': str(','.join(allRequirements))})
+        job = simpleFarm.Job(name,
+                tags=mainTags,
+                requirements={'limits': self.config.get('LIMITS', ''), 'service': str(','.join(allRequirements))},
+                )
 
         nodeNameToTask = {}