Merge branch 'master' into hill_climbing_for_maxBSP

Author: papp-pal-andras

CMakeLists.txt

@@ -31,15 +31,62 @@ add_subdirectory(.githooks)
 # --- Compile Options Configuration ---
 # Common compile options including strict warnings and error-on-warning
 set(COMMON_CXX_WARNING_FLAGS
-    "-Wall"
-    "-Wextra"
     "-Wfatal-errors"
     "-Wconversion"
     "-Wsign-conversion"
-    "-Wunused"
     "-Wunreachable-code"
     "-Wuninitialized"
+    "-pedantic"
+    "-Wpedantic"
+    "-Wold-style-cast"
+    "-Wcast-align"
     "-Werror"
+    "-Wall"
+    "-Wextra"
+    "-Wundef"
+    "-Wunused"
+    "-Wcast-qual"
+    "-Wpointer-arith"
+    "-Wdate-time"
+    "-Wfloat-equal"
+    "-Wformat=2"
+    "-Wshadow"
+    "-Wsign-compare"
+    "-Wunused-macros"
+    "-Wvla"
+    "-Wdisabled-optimization"
+    "-Wempty-body"
+    "-Wignored-qualifiers"
+    "-Wtype-limits"
+    "-Wshift-negative-value"
+    "-Wswitch-default"
+    "-Woverloaded-virtual"
+    "-Wnon-virtual-dtor"
+    "-Wshift-overflow=2"
+    "-Wshift-count-overflow"
+    "-Wwrite-strings"
+    "-Wmissing-format-attribute"
+    "-Wformat-nonliteral"
+    "-Wduplicated-cond"
+    "-Wtrampolines"
+    "-Wsized-deallocation"
+    "-Wlogical-op"
+    "-Wsuggest-attribute=format"
+    "-Wduplicated-branches"
+    "-Wmissing-include-dirs"
+    "-Wformat-signedness"
+    "-Wreturn-local-addr"
+    "-Wredundant-decls"
+    "-Wfloat-conversion"
+    "-fno-common"
+    "-fno-strict-aliasing"
+    "-Wno-return-type"
+    "-Wno-array-bounds"
+    "-Wno-maybe-uninitialized"
+    "-Wno-unused-but-set-variable"
+    "-Wno-unused-variable"
+    "-Wno-unused-parameter"
+    "-Wno-unused-result"
 )
 
 # --- Project-specific Compile Flags ---

README.md

@@ -114,7 +114,7 @@ If no build type is given, CMake applies default optimizations and warnings.
   cmake -DBUILD_TESTS=OFF ..
   ```
 
-## Dependencies
+## Optional Functionality
 Some algorithms and executables are only enabled with following optional dependencies:
   - [Boost (≥ 1.71)]
   - [Eigen3 (≥ 3.4)](https://eigen.tuxfamily.org/)

apps/coarser_plotter.cpp

@@ -100,4 +100,4 @@ int main(int argc, char *argv[]) {
     }
 
     return 0;
-};
+}

apps/graph_analyser.cpp

@@ -58,7 +58,7 @@ void add_graph_stats(const ComputationalDag &graph, std::ofstream &outfile) {
     Get_Median(edge_lengths);
 
     if (graph.num_edges() != 0) {
-        avg_edge_length = (float)sum_edge_length / (float)graph.num_edges();
+        avg_edge_length = static_cast<float>(sum_edge_length) / static_cast<float>(graph.num_edges());
     }
 
     // Longest Path
@@ -72,15 +72,15 @@ void add_graph_stats(const ComputationalDag &graph, std::ofstream &outfile) {
         //     wavefront[top_level[i]] = 1;
         // }
     }
-    float avg_wavefront = (float)graph.num_vertices() / (float)longest_path;
+    float avg_wavefront = static_cast<float>(graph.num_vertices()) / static_cast<float>(longest_path);
 
     // Average bottom distance
     std::vector<unsigned> bot_level = get_bottom_node_distance(graph);
     size_t bot_level_sum = 0;
     for (size_t i = 0; i < bot_level.size(); i++) {
         bot_level_sum += bot_level[i];
     }
-    float avg_bot_level = (float)bot_level_sum / (float)bot_level.size();
+    float avg_bot_level = static_cast<float>(bot_level_sum) / static_cast<float>(bot_level.size());
 
     // // Number of Triangles
     // size_t number_triangles = 0;

apps/graph_generator/gen_Erdos-Renyi_graph.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
     std::uniform_real_distribution<double> unif_log(-std::log(upper_bound), std::log(upper_bound));
     std::default_random_engine re;
 
-    for (size_t i = 0; i < num_graphs; i++) {
+    for (size_t j = 0; j < num_graphs; j++) {
         // Generating the graph
         ComputationalDag graph;
         erdos_renyi_graph_gen(graph, num_vert, chance);
@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) {
         }
         graph_name += graph_edge_size;
 
-        graph_name += std::to_string(i);
+        graph_name += std::to_string(j);
 
         graph_name += ".mtx";
 

apps/graph_generator/gen_near_diag_random_graph.cpp

@@ -64,8 +64,8 @@ int main(int argc, char *argv[]) {
 
         //  Generating graph name
         std::string graph_name = "RandomBand_";
-        graph_name += "p" + std::to_string((int)(100 * prob)) + "_";
-        graph_name += "b" + std::to_string((int)bandwidth) + "_";
+        graph_name += "p" + std::to_string(static_cast<int>(100 * prob)) + "_";
+        graph_name += "b" + std::to_string(static_cast<int>(bandwidth)) + "_";
         std::string graph_size_name;
         if (graph.num_vertices() < 1000) {
             graph_size_name = std::to_string(graph.num_vertices()) + "_";
@@ -105,12 +105,12 @@ int main(int argc, char *argv[]) {
         graph_write << header;
         graph_write << std::to_string(graph.num_vertices()) + " " + std::to_string(graph.num_vertices()) + " " +
                            std::to_string(graph.num_edges() + graph.num_vertices()) + "\n";
-        for (VertexType i = 0; i < num_vert; i++) {
+        for (VertexType j = 0; j < num_vert; j++) {
             double val = (1 - 2 * randInt(2)) * std::exp(unif_log(re));
-            graph_write << std::to_string(i + 1) + " " + std::to_string(i + 1) + " " + std::to_string(val) + "\n";
-            for (const auto &chld : graph.children(i)) {
+            graph_write << std::to_string(j + 1) + " " + std::to_string(j + 1) + " " + std::to_string(val) + "\n";
+            for (const auto &chld : graph.children(j)) {
                 val = unif(re);
-                graph_write << std::to_string(chld + 1) + " " + std::to_string(i + 1) + " " + std::to_string(val) +
+                graph_write << std::to_string(chld + 1) + " " + std::to_string(j + 1) + " " + std::to_string(val) +
                                    "\n";
             }
         }

apps/test_suite_runner/StatsModules/BspSptrsvStatsModule.hpp

@@ -66,13 +66,13 @@ bool compare_vectors(Eigen::VectorXd &v1, Eigen::VectorXd &v2) {
         }
     }
     return same;
-};
+}
 
 template<typename TargetObjectType>
 class BspSptrsvStatsModule : public IStatisticModule<TargetObjectType> {
 public:
-    explicit BspSptrsvStatsModule(SCHEDULE_NODE_PERMUTATION_MODES mode = NO_PERMUTE)
-        : mode(mode) {}
+    explicit BspSptrsvStatsModule(SCHEDULE_NODE_PERMUTATION_MODES _mode = NO_PERMUTE)
+        : mode(_mode) {}
 
 
     std::vector<std::string> get_metric_headers() const override {

apps/test_suite_runner/StringToScheduler/run_bsp_recomp_scheduler.hpp

@@ -65,6 +65,6 @@ RETURN_STATUS run_bsp_recomp_scheduler(const ConfigParser &parser, const boost::
 
         throw std::invalid_argument("Parameter error: Unknown algorithm.\n");
     }
-};
+}
 
 } // namespace osp

apps/test_suite_runner/StringToScheduler/run_bsp_scheduler.hpp

@@ -198,7 +198,8 @@ RETURN_STATUS run_bsp_scheduler(const ConfigParser &parser, const boost::propert
             if (status != RETURN_STATUS::OSP_SUCCESS && status != RETURN_STATUS::BEST_FOUND) {
                 throw std::invalid_argument("Error while computing initial solution.\n");
             }
-            scheduler.setInitialSolutionFromBspSchedule(initial_schedule);
+            BspScheduleCS<Graph_t> initial_schedule_cs(initial_schedule);
+            scheduler.setInitialSolutionFromBspSchedule(initial_schedule_cs);
         }
 
         // intermediate solutions
@@ -241,6 +242,6 @@ RETURN_STATUS run_bsp_scheduler(const ConfigParser &parser, const boost::propert
         auto scheduler = get_base_bsp_scheduler_by_name<Graph_t>(parser, algorithm);
         return scheduler->computeSchedule(schedule);
     }
-};
+}
 
 } // namespace osp

include/osp/auxiliary/Balanced_Coin_Flips.hpp

@@ -33,6 +33,8 @@ class BalancedCoinFlips {
     /// @brief Returns true/false in a pseudo-random balanced manner
     /// @return true/false
     virtual bool get_flip() = 0;
+
+    virtual ~BalancedCoinFlips() = default;
 };
 
 class Biased_Random : public BalancedCoinFlips {