bug fix

Author: tonibohnlein

include/osp/dag_divider/isomorphism_divider/MerkleHashComputer.hpp

@@ -161,10 +161,19 @@ struct bwd_merkle_node_hash_func {
 
     MerkleHashComputer<Graph_t, uniform_node_hash_func<vertex_idx_t<Graph_t>>, false> bw_merkle_hash;
 
-    bwd_merkle_node_hash_func(const Graph_t & graph) : bw_merkle_hash(graph) {}
+    const Graph_t & graph_;
+
+    bwd_merkle_node_hash_func(const Graph_t & graph) : bw_merkle_hash(graph), graph_(graph) {}
 
     std::size_t operator()(const vertex_idx_t<Graph_t> & v) const {
-        return bw_merkle_hash.get_vertex_hash(v);
+        std::size_t hash = bw_merkle_hash.get_vertex_hash(v);
+        hash_combine(hash, graph_.vertex_work_weight(v));
+        
+        if constexpr (has_typed_vertices_v<Graph_t>) {
+            hash_combine(hash, graph_.vertex_type(v));
+        }
+
+        return hash;
     }
 };
 

include/osp/dag_divider/isomorphism_divider/OrbitGraphProcessor.hpp

@@ -148,7 +148,6 @@ class OrbitGraphProcessor {
             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);
             const std::vector< vertex_idx_t<Constr_Graph_t> > vertexBotPoset = get_bottom_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);
@@ -190,7 +189,7 @@ class OrbitGraphProcessor {
                     continue;
                 }
 
-                const bool crtical_path_longer = critical_path_weight(temp_coarse_graph) > critical_path_weight(current_coarse_graph);                
+                const bool crtical_path_longer = critical_path_weight(temp_coarse_graph) > (80 * new_subgraphs.size() + critical_path_weight(current_coarse_graph));                
                 // Check if merging increases the critical path
                 if (crtical_path_longer) {
                     if constexpr (verbose) { std::cout << "  - Merge of " << u << " and " << v << " increases critical path. Skipping.\n"; }
@@ -282,14 +281,15 @@ class OrbitGraphProcessor {
         std::sort(all_nodes.begin(), all_nodes.end());
 
         Constr_Graph_t induced_subgraph;
-        create_induced_subgraph(original_dag, induced_subgraph, all_nodes);
+        auto map = create_induced_subgraph_map(original_dag, induced_subgraph, all_nodes);
 
         std::vector<VertexType> components; // local -> component_id
         size_t num_components = compute_weakly_connected_components(induced_subgraph, components);
 
         out_new_subgraphs.assign(num_components, std::vector<VertexType>());
-        for (VertexType i = 0; i < induced_subgraph.num_vertices(); ++i) {
-            out_new_subgraphs[components[i]].push_back(all_nodes[i]);
+
+        for (const auto & node : all_nodes) {
+            out_new_subgraphs[components[map[node]]].push_back(node);
         }
 
         if (num_components < symmetry_threshold_) {

tests/CMakeLists.txt

@@ -68,8 +68,6 @@ _add_test( isomorphism_mapper )
 
 _add_test( merkle_hash_computer )
 
-#_add_test( merkle_hash_divider )
-
 _add_test( orbit_graph_processor )
 
 _add_test( eft_subgraph_scheduler )
@@ -78,6 +76,11 @@ _add_test( wavefront_component_divider )
 
 _add_test( hill_climbing )
 
+# --- Standalone Debugging Executables ---
+add_executable(debug_merkle_divider debug_merkle_divider.cpp)
+target_link_libraries(debug_merkle_divider PRIVATE OneStopParallel ProjectExecutableFlags)
+
+
 ## bsp model
 _add_test( bsp_architecture )
 

tests/debug_merkle_divider.cpp

@@ -0,0 +1,73 @@
+/*
+Copyright 2024 Huawei Technologies Co., Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+@author Toni Boehnlein, Benjamin Lozes, Pal Andras Papp, Raphael S. Steiner
+*/
+
+#include <iostream>
+#include "osp/auxiliary/io/dot_graph_file_reader.hpp"
+#include "osp/auxiliary/io/DotFileWriter.hpp"
+#include "osp/bsp/scheduler/GreedySchedulers/BspLocking.hpp"
+#include "osp/bsp/scheduler/LocalSearch/KernighanLin_v2/kl_include_mt.hpp"
+#include "osp/coarser/coarser_util.hpp"
+#include "osp/dag_divider/isomorphism_divider/IsomorphicSubgraphScheduler.hpp"
+#include "osp/graph_implementations/adj_list_impl/computational_dag_vector_impl.hpp"
+
+using namespace osp;
+
+int main(int argc, char* argv[]) {
+    if (argc < 2) {
+        std::cerr << "Usage: " << argv[0] << " <path_to_dot_file>" << std::endl;
+        return 1;
+    }
+
+    std::string dot_file_path = argv[1];
+
+    using graph_t = computational_dag_vector_impl_def_t;
+    using graph_t2 = graph_t;
+
+    BspInstance<graph_t2> instance;
+    if (!file_reader::readComputationalDagDotFormat(dot_file_path, instance.getComputationalDag())) {
+        std::cerr << "Failed to read graph from " << dot_file_path << std::endl;
+        return 1;
+    }
+
+    std::cout << "Graph loaded successfully. " << instance.numberOfVertices() << " vertices." << std::endl;
+
+    // Set up architecture
+    instance.getArchitecture().setProcessorsWithTypes({0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 , 1, 1, 1, 1, 1, 1, 1, 1 , 1, 1, 1, 1, 1, 1, 1, 1 , 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1});
+    instance.setDiagonalCompatibilityMatrix(2);
+    instance.setSynchronisationCosts(20000);
+    instance.setCommunicationCosts(10);
+
+    // Set up the scheduler
+    BspLocking<graph_t> greedy;
+    kl_total_lambda_comm_improver_mt<graph_t> kl;
+    ComboScheduler<graph_t> combo(greedy, kl);
+
+    IsomorphicSubgraphScheduler<graph_t2, graph_t> iso_scheduler(combo);
+    iso_scheduler.set_symmetry(4);
+    iso_scheduler.set_plot_dot_graphs(true); // Enable plotting for debug
+
+    std::cout << "Starting partition computation..." << std::endl;
+
+    // This is the call that is expected to throw the exception
+    auto partition = iso_scheduler.compute_partition(instance);
+
+    std::cout << "Partition computation finished." << std::endl;
+    std::cout << "Generated " << std::set<vertex_idx_t<graph_t>>(partition.begin(), partition.end()).size() << " partitions." << std::endl;
+
+    return 0;
+}