Skip to content

Commit 9c245d8

Browse files
committed
[submitters] avoid multiple times the same requirement
1 parent f03af18 commit 9c245d8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

meshroom/submitters/simpleFarmSubmitter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ def createTask(self, meshroomFile, node):
7070

7171
tags['nbFrames'] = nbFrames
7272
tags['prod'] = self.prod
73-
allRequirements = list()
74-
allRequirements.extend(self.config['CPU'].get(node.nodeDesc.cpu.name, []))
75-
allRequirements.extend(self.config['RAM'].get(node.nodeDesc.ram.name, []))
76-
allRequirements.extend(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
73+
allRequirements = set()
74+
allRequirements.update(self.config['CPU'].get(node.nodeDesc.cpu.name, []))
75+
allRequirements.update(self.config['RAM'].get(node.nodeDesc.ram.name, []))
76+
allRequirements.update(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
7777

7878
executable = 'meshroom_compute' if self.reqPackages else os.path.join(binDir, 'meshroom_compute')
7979
taskCommand = f"{executable} --node {node.name} \"{meshroomFile}\" {parallelArgs} --extern"

meshroom/submitters/tractorSubmitter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,10 @@ def createTask(self, meshroomFile, node):
454454
optionalArgs["chunks"] = {'start': 0, 'end': nbBlocks - 1, 'step': 1}
455455
tags['nbFrames'] = node.size
456456
tags['prod'] = self.prod
457-
allRequirements = list()
458-
allRequirements.extend(self.config['CPU'].get(node.nodeDesc.cpu.name, []))
459-
allRequirements.extend(self.config['RAM'].get(node.nodeDesc.ram.name, []))
460-
allRequirements.extend(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
457+
allRequirements = set()
458+
allRequirements.update(self.config['CPU'].get(node.nodeDesc.cpu.name, []))
459+
allRequirements.update(self.config['RAM'].get(node.nodeDesc.ram.name, []))
460+
allRequirements.update(self.config['GPU'].get(node.nodeDesc.gpu.name, []))
461461
exe = "meshroom_compute" if self.reqPackages else os.path.join(binDir, "meshroom_compute")
462462
taskCommand = f"{exe} --node {node.name} \"{meshroomFile}\" --extern"
463463
task = Task(

0 commit comments

Comments
 (0)