(1)fix merge conflict. (2)fix schedcat integr. bug

1 files changed, 7 insertions, 2 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index e8507f6..bd32f47 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -111,10 +111,10 @@ class EdfPgmGenerator(gen.Generator):
                 gen.Generator._dist_option('task_util', ['uni-medium'],
                                            NAMED_UTILIZATIONS,
                                            'Task utilization.'),
-                gen.Generator._dist_option('polluters', [False, True],
+                gen.Generator._dist_option('polluters', [False],
                                            {},
                                            'Polluters.'),
-                gen.Generator._dist_option('job_splitting', True,
+                gen.Generator._dist_option('job_splitting', [True],
                                            {},
                                            'Job splitting.'),
                 gen.Generator._dist_option('ovh_type', 'max',
@@ -258,6 +258,11 @@ class CflSplitPgmGenerator(EdfPgmGenerator):
         overheads = get_overheads(dp, dp.system)
         # do the partition here
         ts = partition.clear_partitioning(ts)
+
+        if overheads.consumer is not None:
+            for t in ts:
+                overheads.consumer.place_production(t)
+
         try:
             ts = PARTITION_METHOD[exp_params['partitions']](ts, graphs, subts, cluster_sz, dp.nr_clusters, dp.system, dp.heur_aggressiveness, overheads)
         except DidNotFit: