Remove hardcoded 'syn' value in 'get_permutations()'.
@@ -1261,18 +1261,22 @@ def get_permutations(base_chip, cmdlinecfg):
# Create a new Chip object with the same job hash for each permutation.
for chip_cfg in perms:
new_chip = Chip(loglevel=loglevel)
+
# JSON dump/load is a simple way to deep-copy a Python
# dictionary which does not contain custom classes/objects.
new_chip.status = json.loads(json.dumps(base_chip.status))
new_chip.cfg = json.loads(json.dumps(chip_cfg))
+
+ # Skip the 'import' stage for remote jobs; it will be run locally and uploaded.
if 'remote_addr' in cmdlinecfg.keys():
- new_chip.set('start', 'syn')
+ new_chip.set('start', new_chip.get('steplist')[1])
+
+ # Set and increment the "job ID" so multiple chips don't share the same directory.
new_chip.set('jobid', cur_jobid)
cur_jobid = str(int(cur_jobid) + 1)
+
chips.append(new_chip)
# Done; return the list of Chips.
return chips
-
-
