revision OrbitGraphProcessor, etfSubgSched fix

eft test

Author: tonibohnlein

include/osp/dag_divider/isomorphism_divider/EftSubgraphScheduler.hpp

@@ -332,7 +332,7 @@ class EftSubgraphScheduler {
         for(const auto& job : jobs_) {
             result.node_assigned_worker_per_type[job.id].resize(num_worker_types);
             for (size_t i = 0; i < num_worker_types; ++i) {
-                result.node_assigned_worker_per_type[job.id][i] = job.assigned_workers[i];
+                result.node_assigned_worker_per_type[job.id][i] = job.assigned_workers[i] / job.multiplicity;
             }
         }
 

include/osp/dag_divider/isomorphism_divider/OrbitGraphProcessor.hpp

@@ -116,11 +116,6 @@ class OrbitGraphProcessor {
         }
 
         coarser_util::construct_coarse_dag(dag, coarse_graph_, contraction_map_);
-
-        // Constr_Graph_t transitive_reduction; 
-        // transitive_reduction_sparse(coarse_graph_, transitive_reduction);
-        // coarse_graph_ = std::move(transitive_reduction);
-
         perform_coarsening(dag, coarse_graph_);
     }
 
@@ -149,15 +144,15 @@ class OrbitGraphProcessor {
 
         bool changed = true;
         while (changed) {
+
+            const std::vector< vertex_idx_t<Constr_Graph_t> > vertexPoset =  get_top_node_distance<Constr_Graph_t, vertex_idx_t<Constr_Graph_t>>(current_coarse_graph);
+
             changed = false;
             for (const auto& edge : edges(current_coarse_graph)) {
                 VertexType u = source(edge, current_coarse_graph);
                 VertexType v = target(edge, current_coarse_graph);
 
-                if (current_coarse_graph.in_degree(v) != 1) {
-                    if constexpr (verbose) { std::cout << "  - Skipping edge " << u << " -> " << v << " target in-degree > 1" << std::endl; }
-                    continue;
-                }
+                if (vertexPoset[u] + 1 != vertexPoset[v]) continue;
 
                 std::vector<std::vector<VertexType>> new_subgraphs;
 

tests/eft_subgraph_scheduler.cpp

@@ -61,20 +61,13 @@ BOOST_AUTO_TEST_CASE(EftSubgraphScheduler_SimpleChain)
 
     // 4. Assertions
     BOOST_CHECK_CLOSE(schedule.makespan, 250.0, 1e-9);
-
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type.size(), 3);
-
-    // Job 0 should use 2 workers of type 0
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[0].size(), 2);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[0][0], 2);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[0][1], 0);
-
-    // Job 1 should use 2 workers of type 0 and 2 of type 1
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[1].size(), 2);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 2);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][1], 2);
-
-    // Job 2 should use 2 workers of type 1
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 1);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][1], 1);
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[2].size(), 2);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][0], 0);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][1], 2);
@@ -132,22 +125,14 @@ BOOST_AUTO_TEST_CASE(EftSubgraphScheduler_ForkJoin)
     BOOST_CHECK_CLOSE(schedule.makespan, 200.0, 1e-9);
 
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type.size(), 4);
-
-    // Job 0 should use 4 workers
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[0].size(), 1);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[0][0], 4);
-
-    // Job 1 should use 2 workers
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[1].size(), 1);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 2);
-
-    // Job 2 should use 2 workers
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 1);
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[2].size(), 1);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][0], 2);
-
-    // Job 3 should use 4 workers
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type[3].size(), 1);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 4);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 1);
 }
 
 BOOST_AUTO_TEST_CASE(EftSubgraphScheduler_Deadlock)
@@ -224,11 +209,11 @@ BOOST_AUTO_TEST_CASE(EftSubgraphScheduler_ComplexDAG)
 
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type.size(), 6);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[0][0], 4);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 4);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 2);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][1], 4);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 4);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][1], 4);
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[4][1], 4);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 1);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][1], 1);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[4][1], 2);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[5][0], 4);
 }
 
@@ -284,15 +269,10 @@ BOOST_AUTO_TEST_CASE(EftSubgraphScheduler_ResourceContention)
     BOOST_CHECK_CLOSE(schedule.makespan, 55.0, 1e-9);
 
     BOOST_REQUIRE_EQUAL(schedule.node_assigned_worker_per_type.size(), 5);
-    // Job 0: 4 workers
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[0][0], 4);
-    // Job 1 (high rank): gets 2 workers
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 2);
-    // Job 2 (mid rank): gets 2 workers
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][0], 2);
-    // Job 3 (low rank): has to wait, then gets 2 workers
-    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 2);
-    // Job 4: gets 4 workers
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[1][0], 1);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[2][0], 1);
+    BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[3][0], 1);
     BOOST_CHECK_EQUAL(schedule.node_assigned_worker_per_type[4][0], 4);
 }