From 01222247a2a5634eb26e95a1c2f5ba2a9d21a624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Thu, 23 Nov 2017 17:40:19 +0100 Subject: [PATCH] Run only required instances Due to a mistake, all instances were tested for all configurations. This commit checks whether a specific instance is actually required for the tested configuration and skips it if not. --- benchmark.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/benchmark.py b/benchmark.py index ef2c045fa..914df8f8c 100644 --- a/benchmark.py +++ b/benchmark.py @@ -139,7 +139,7 @@ def nextJob(config): configurations = benchmarkConfig["configurations"]["configurations"] instances = benchmarkConfig["instances"] - for instanceSetName, instanceSet in instances.items(): + for instanceSetID, instanceSet in instances.items(): for instance in instanceSet: for configuration in configurations: filenames = outputFilenames(configuration, instance, config) @@ -147,6 +147,9 @@ def nextJob(config): errorFile = os.path.join(config["storage"]["local"], filenames["errorFile"]) environmentFile = os.path.join(config["storage"]["local"], filenames["environmentFile"]) + if not instanceSetID in configuration["instanceSets"]: + continue + if not os.path.exists(outputFile) or not os.path.exists(errorFile) or not os.path.exists(environmentFile): return {"configuration": configuration, "instance": instance}