various small bugfixes (#22)

Author: papp-pal-andras

include/osp/auxiliary/io/hdag_graph_file_reader.hpp

@@ -252,12 +252,17 @@ bool readComputationalDagHyperdagFormatDB(std::ifstream& infile, Graph_t& graph)
             graph.set_vertex_comm_weight(static_cast<vertex_idx_t<Graph_t>>(node), hyperedge_comm_weights[edgeIdx]);
             graph.set_vertex_mem_weight(static_cast<vertex_idx_t<Graph_t>>(node), hyperedge_mem_weights[edgeIdx]);
         } else {
-            auto edge = graph.add_edge(static_cast<vertex_idx_t<Graph_t>>(edgeSource[edgeIdx]),
+            if constexpr (is_modifiable_cdag_comm_edge_v<Graph_t>) {
+
+                auto edge = graph.add_edge(static_cast<vertex_idx_t<Graph_t>>(edgeSource[edgeIdx]),
                                     static_cast<vertex_idx_t<Graph_t>>(nodeIdx));
 
-            if constexpr (is_modifiable_cdag_comm_edge_v<Graph_t>) {
                 graph.set_edge_comm_weight(edge.first,
                     static_cast<e_commw_t<Graph_t>>(hyperedge_comm_weights[edgeIdx]));
+
+            } else {
+                graph.add_edge(static_cast<vertex_idx_t<Graph_t>>(edgeSource[edgeIdx]),
+                                    static_cast<vertex_idx_t<Graph_t>>(nodeIdx));
             }
         }
     }

include/osp/bsp/scheduler/IlpSchedulers/TotalCommunicationScheduler.hpp

@@ -76,7 +76,7 @@ class TotalCommunicationScheduler : public Scheduler<Graph_t> {
 
                         auto sched = constructBspScheduleFromCallback();
                         DotFileWriter sched_writer;
-                        sched_writer.write_dot(write_solutions_path_cb + "intmed_sol_" + solution_file_prefix_cb + "_" +
+                        sched_writer.write_schedule(write_solutions_path_cb + "intmed_sol_" + solution_file_prefix_cb + "_" +
                                                    std::to_string(counter) + "_schedule.dot",
                                                sched);
                         counter++;

include/osp/pebbling/pebblers/pebblingILP/partialILP/AcyclicDagDivider.hpp

@@ -151,7 +151,7 @@ std::vector<unsigned> AcyclicDagDivider<Graph_t>::computePartitioning(const BspI
                 partitioner.setNumberOfParts(2); // note - if set to more than 2, ILP is MUCH more inefficient
                 BspInstance partial_instance(dag, instance.getArchitecture(), instance.getNodeProcessorCompatibilityMatrix());
                 RETURN_STATUS status = partitioner.computePartitioning(partial_instance, ILP_assignment);
-                if(status == SUCCESS || status == RETURN_STATUS::BEST_FOUND)
+                if(status == RETURN_STATUS::OSP_SUCCESS || status == RETURN_STATUS::BEST_FOUND)
                     ILPCost = getSplitCost(dag, ILP_assignment);
 
                 std::vector<unsigned> assignment = ILPCost < heuristicCost ? ILP_assignment : heuristic_assignment;

tests/ilp_pebbling_scheduler.cpp

@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(test_full) {
 
     GreedyBspScheduler<graph> greedy;
     BspSchedule<graph> bsp_initial(instance);
-    BOOST_CHECK_EQUAL(SUCCESS, greedy.computeSchedule(bsp_initial));
+    BOOST_CHECK_EQUAL(RETURN_STATUS::OSP_SUCCESS, greedy.computeSchedule(bsp_initial));
 
     std::vector<v_memw_t<graph> > minimum_memory_required_vector = PebblingSchedule<graph>::minimumMemoryRequiredPerNodeType(instance);
     v_memw_t<graph> max_required = *std::max_element(minimum_memory_required_vector.begin(), minimum_memory_required_vector.end());