From c557f0bdec624caf57ce3b6916c17f5b777277ba Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 15 Nov 2017 12:25:34 +0100 Subject: [PATCH] Add support of overriding scenes list --- benchmark/farm.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/benchmark/farm.py b/benchmark/farm.py index b36f703..fcd2473 100755 --- a/benchmark/farm.py +++ b/benchmark/farm.py @@ -32,10 +32,10 @@ def configureArgumentParser(): parser.add_argument("-d", "--scenes-dir", help="Directory with scenes", default="") - # parser.add_argument('-s', '--scenes', - # nargs='+', - # help='Scenes to be rendered', - # default=[]) + parser.add_argument('-c', '--scenes', + nargs='+', + help='Scenes to be rendered', + default=[]) parser.add_argument('-t', '--device-type', help="Type of the device to render on", default="") @@ -68,6 +68,7 @@ def injectDefaultConfiguration(config): """ root_dir = util.getBundleRootDirectory() section = { + "scenes": "", "scenes_dir": os.path.join(root_dir, "scenes"), "device_name": "", "device_single": "False", @@ -82,6 +83,8 @@ def injectArgparseConfiguration(config, args): section = config['farm'] if args.blender: section['blender'] = args.blender + if args.scenes: + section['scenes'] = ",".join(args.scenes) if args.scenes_dir: section['scenes_dir'] = args.scenes_dir if args.device_type: @@ -339,7 +342,10 @@ def main(): if args.system_info: ctx.scenes = [] else: - ctx.scenes = ctx.listAllScenes(ctx.scenes_dir) + if farm_config['scenes']: + ctx.scenes = farm_config['scenes'].split(",") + else: + ctx.scenes = ctx.listAllScenes(ctx.scenes_dir) # Print prelmiinary information. blender_dvice_info = benchrunner.benchmarkGetDeviceInfo(ctx) if not blender_dvice_info['device_type']: