2 files changed, 4 insertions, 10 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index 6cca933..c7267f7 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -1,6 +1,5 @@
 import generator as gen
 import random
-import run.litmus_util as lu
 import schedcat.generator.tasks as tasks
 
 class EdfGenerator(gen.Generator):
@@ -12,14 +11,7 @@ class EdfGenerator(gen.Generator):
 
     def __make_options(self, params):
         '''Return generic EDF options.'''
-        if 'cpus' in params:
-            cpus = min(map(int, params['cpus']))
-        else:
-            cpus = lu.num_cpus()
-
-        return [gen.GenOption('num_tasks', int, range(cpus, 5*cpus, cpus),
-                              'Number of tasks per experiment.'),
-                gen.Generator._dist_option('utils', ['uni-medium'],
+        return [gen.Generator._dist_option('utils', ['uni-medium'],
                                            gen.NAMED_UTILIZATIONS,
                                            'Task utilization distributions.'),
                 gen.Generator._dist_option('periods', ['harmonic'],
diff --git a/gen/generator.py b/gen/generator.py
index 28a6387..aed8da3 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -77,7 +77,9 @@ class Generator(object):
         release_master = list(set([False, config]))
 
 
-        return [GenOption('cpus', int, [cpus],
+        return [GenOption('num_tasks', int, range(cpus, 5*cpus, cpus),
+                              'Number of tasks per experiment.'),
+                GenOption('cpus', int, [cpus],
                           'Number of processors on target system.'),
                 GenOption('release_master', [True,False], release_master,
                           'Redirect release interrupts to a single CPU.'),