From daa0e3a92e03a89baf7ea3750df374df79123245 Mon Sep 17 00:00:00 2001 From: Jonathan Herman Date: Fri, 19 Apr 2013 11:52:51 -0400 Subject: Made default generator behavior more intuitive. GenOption defaults can be specified as a single value in addition to a list of values. PartitionedEdfGenerator's now use worst-fit partitioning for the most even distribution of tasks. --- gen/generator.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gen/generator.py') diff --git a/gen/generator.py b/gen/generator.py index f35a22b..6a07616 100644 --- a/gen/generator.py +++ b/gen/generator.py @@ -69,10 +69,10 @@ class Generator(object): else: cpus = num_cpus() try: - config = get_config_option("RELEASE_MASTER") and True + rm_config = get_config_option("RELEASE_MASTER") and True except: - config = False - release_master = list(set([False, config])) + rm_config = False + release_master = list(set([False, bool(rm_config)])) return [GenOption('tasks', int, range(cpus, 5*cpus, cpus), @@ -147,7 +147,10 @@ class Generator(object): '''Set default parameter values and check that values are valid.''' for option in self.options: if option.name not in params: - params[option.name] = option.default + val = option.default + val = val if type(val) == type([]) else [val] + + params[option.name] = val else: option.hidden = True params[option.name] = self._check_value(option.name, -- cgit v1.2.2