3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-05 20:31:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

[submitters] update submitter config

Browse source
This commit is contained in:
Fabien Castan 2019-03-18 14:51:01 +01:00
parent 007216e88b
commit b1984bca97
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/submitters/simpleFarmConfig.json
View file

@ -1,9 +1,10 @@
{ {
"BASE": ["mikrosRender", "!RenderLow", "!Wkst_OS", "!\"vfxpc1*\"", "!\"vfxpc??\""], "LIMITS": ["mikros"],
"BASE": ["mikrosRender"],
"CPU": { "CPU": {
"NONE": [], "NONE": [],
"NORMAL": [], "NORMAL": [],
"INTENSIVE": ["\"RenderHigh*\"", "@.nCPUs>20"] "INTENSIVE": ["@.nCPUs>30"]
}, },
"RAM": { "RAM": {
"NONE": [], "NONE": [],
@ -12,7 +13,7 @@
}, },
"GPU": { "GPU": {
"NONE": [], "NONE": [],
"NORMAL": ["!\"*loc*\"", "Wkst"], "NORMAL": ["!\"*rnd*\""],
"INTENSIVE": ["!\"*loc*\"", "Wkst"] "INTENSIVE": ["!\"*rnd*\"", "@.nCPUs=12"]
} }
} }

7
meshroom/submitters/simpleFarmSubmitter.py
View file

@ -42,7 +42,7 @@ class SimpleFarmSubmitter(BaseSubmitter):
tags['nbFrames'] = nbFrames tags['nbFrames'] = nbFrames
tags['prod'] = self.prod 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['CPU'].get(node.nodeDesc.cpu.name, []))
allRequirements.extend(self.config['RAM'].get(node.nodeDesc.ram.name, [])) allRequirements.extend(self.config['RAM'].get(node.nodeDesc.ram.name, []))
allRequirements.extend(self.config['GPU'].get(node.nodeDesc.gpu.name, [])) allRequirements.extend(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
@ -71,7 +71,10 @@ class SimpleFarmSubmitter(BaseSubmitter):
allRequirements = list(self.config.get('BASE', [])) allRequirements = list(self.config.get('BASE', []))
# Create Job Graph # 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 = {} nodeNameToTask = {}