Added -Wall (gcc) & /W4 (MVC) flags and fixed warnings for gcc.

francois141 · Oct 24, 2023 · 5567e82 · 5567e82
1 parent b399c5c
commit 5567e82
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 45 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -38,6 +38,12 @@ set(SRC_FILES
 
 add_executable(dphpc ${SRC_FILES})
 
+if(MSVC)
+  target_compile_options(dphpc PRIVATE /W4)
+else()
+  target_compile_options(dphpc PRIVATE -Wall)
+endif()
+
 if(MSVC)
     source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${SRC_FILES})
 endif()

diff --git a/src/competitors/cpu/cpu_basic.hpp b/src/competitors/cpu/cpu_basic.hpp
@@ -16,8 +16,8 @@ namespace Competitors {
             {}
 
             virtual inline void run_csr(Dense<T> &A, Dense<T> &B, CSR<T> &S, CSR<T> &P) {
-                const unsigned int K = B.getCols();
-                const unsigned int M = S.getRows();
+                const int K = B.getCols();
+                const int M = S.getRows();
 
                 for (int i = 0; i < M; i++) {
                     for (int j = S.getRowPositions()[i]; j < S.getRowPositions()[i+1]; j++) {
@@ -28,7 +28,7 @@ namespace Competitors {
                     }
                 }
 
-                for (int i = 0; i < S.getRowPositions().size() - 1; i++) {
+                for (uint32_t i = 0; i < S.getRowPositions().size() - 1; i++) {
                     for (int j = S.getRowPositions()[i]; j < S.getRowPositions()[i+1]; j++) {
                         (*P.getValue(j)) *= S.getValues()[j];
                     }
@@ -37,17 +37,16 @@ namespace Competitors {
             }
 
             virtual inline void run_coo(Dense<T> &A, Dense<T> &B, COO<T> &S, COO<T> &P) {
-                const unsigned int K = B.getCols();
-                const unsigned int M = S.getRows();
+                const int K = B.getCols();
 
-                for (int i = 0; i < S.getValues().size(); i++) {
+                for (uint32_t i = 0; i < S.getValues().size(); i++) {
                     *P.getValue(i) = static_cast<T>(0);
                     for (int k = 0; k < K; k++) {
                         (*P.getValue(i)) += A.getValue(S.getRowPositions()[i], k) * B.getValue(S.getColPositions()[i], k);
                     }
                 }
 
-                for (int i = 0; i < S.getValues().size(); i++) {
+                for (uint32_t i = 0; i < S.getValues().size(); i++) {
                     (*P.getValue(i)) *= S.getValues()[i];
                 }
             }

diff --git a/src/main.cpp b/src/main.cpp
@@ -77,7 +77,7 @@ static void print_config(Config config) {
     DEBUG_OUT("----------------------------------------" << std::endl);
 }
 
-static void usage(const char *argv0) {
+static void usage() {
     std::cout << "----------------------------------------" << std::endl;
     std::cout << "Options:" << std::endl;
     std::cout << "  -d, --data_folder <folder> (folder to read datasets from)" << std::endl;
@@ -97,7 +97,6 @@ int main(int argc, char* argv[]) {
     };
 
     #ifndef _WIN32
-    int K = 32;
     static struct option long_options[] = {
         { .name = "data_folder", .has_arg = 1, .val = 'd' },
 		{ .name = "K", .has_arg = 1, .val = 'k' },
@@ -111,7 +110,7 @@ int main(int argc, char* argv[]) {
         } else if (c == 'k') {
             config.K = std::stoi(optarg);
         } else {
-            usage(argv[0]);
+            usage();
             return 1;
         }
 	}

diff --git a/src/matrices/COO.hpp b/src/matrices/COO.hpp
@@ -20,21 +20,14 @@ template<class T>
 class COO {
 public:
 
-    COO() {
-        this->rows = 0;
-        this->cols = 0;
-
-        this->rowPositions = std::vector<int>(0);
-        this->colPositions = std::vector<int>(0);
-        this->values       = std::vector<T>(0);
-    }
+    COO()
+    : rows(0), cols(0), rowPositions(std::vector<int>(0)), colPositions(std::vector<int>(0)), values(std::vector<T>(0))
+    { }
 
-    COO(int rows, int cols, std::vector<Triplet<T>> values) {
+    COO(int rows, int cols, std::vector<Triplet<T>> values)
+    : rows(rows), cols(cols) {
         assert(values.size() > 0);
 
-        this->rows = rows;
-        this->cols = cols;
-
         this->rowPositions = std::vector<int>(0);
         this->colPositions = std::vector<int>(0);
         this->values       = std::vector<T>(0);
@@ -50,7 +43,9 @@ class COO {
         }
     }
 
-    COO(const COO &other) : rows(other.rows), cols(other.cols), values(other.values), colPositions(other.colPositions), rowPositions(other.rowPositions) {}
+    COO(const COO &other)
+    : rows(other.rows), cols(other.cols),  rowPositions(other.rowPositions), colPositions(other.colPositions), values(other.values)
+    {}
 
     COO(CSR<T> &csr) {
         this->rows = csr.getRows();
@@ -107,7 +102,7 @@ class COO {
                 return false;
             }
 
-            for(int i = 0; i < lhs.values.size();i++) {
+            for(uint32_t i = 0; i < lhs.values.size();i++) {
                 valMatch &= abs(rhs.values[i] - lhs.values[i]) <= 1e-6;
             }
         }
@@ -156,11 +151,11 @@ class COO {
     }
 
 private:
-    std::vector<int> colPositions;
-    std::vector<int> rowPositions;
-    std::vector<T> values;
     int rows;
     int cols;
+    std::vector<int> rowPositions;
+    std::vector<int> colPositions;
+    std::vector<T> values;
 };
 
 

diff --git a/src/matrices/CSR.hpp b/src/matrices/CSR.hpp
@@ -20,31 +20,26 @@ template<class T>
 class CSR {
 public:
 
-    CSR() {
-        this->rows = 0;
-        this->cols = 0;
-
-        this->rowPositions = std::vector<int>(0);
-        this->colPositions = std::vector<int>(0);
-        this->values       = std::vector<T>(0);
-    }
-
-    CSR(int rows, int cols, std::vector<Triplet<T>> triplets) {
-        this->rows = rows;
-        this->cols = cols;
+    CSR()
+    : rows(0), cols(0), rowPositions(std::vector<int>(0)), colPositions(std::vector<int>(0)), values(std::vector<T>(0))
+    {}
 
+    CSR(int rows, int cols, std::vector<Triplet<T>> triplets)
+    : rows(rows), cols(cols) {
         init_csr(triplets);
     }
 
-    CSR(const CSR &other) : rows(other.rows), cols(other.cols), values(other.values), colPositions(other.colPositions), rowPositions(other.rowPositions) {}
+    CSR(const CSR &other)
+    : rows(other.rows), cols(other.cols), rowPositions(other.rowPositions), colPositions(other.colPositions), values(other.values)
+    {}
 
     CSR(COO<T> &coo) {
         this->rows = coo.getRows();
         this->cols = coo.getCols();
 
         std::vector<Triplet<T>> triplets(coo.getValues().size());
 
-        for (int i = 0; i < coo.getValues().size(); i++) {
+        for (uint32_t i = 0; i < coo.getValues().size(); i++) {
             triplets[i].row = coo.getRowPositions()[i];
             triplets[i].col = coo.getColPositions()[i];
             triplets[i].value = coo.getValues()[i];
@@ -86,7 +81,7 @@ class CSR {
                 return false;
             }
 
-            for(int i = 0; i < lhs.values.size();i++) {
+            for(uint32_t i = 0; i < lhs.values.size();i++) {
                 valMatch &= abs(rhs.values[i] - lhs.values[i]) <= 1e-6;
             }
         }
@@ -135,11 +130,11 @@ class CSR {
     }
 
 private:
-    std::vector<int> colPositions;
-    std::vector<int> rowPositions;
-    std::vector<T> values;
     int rows;
     int cols;
+    std::vector<int> rowPositions;
+    std::vector<int> colPositions;
+    std::vector<T> values;
 
     void init_csr(std::vector<Triplet<T>> triplets) {
         assert(triplets.size() > 0);