Sanitizers and fixes

* added sanitizers

* Clean Eigen Iterator

* bug in hillclimbing

---------

Co-authored-by: Christos Konstantinos Matzoros <christos.konstantinos.matzoros@h-partners.com>
Co-authored-by: papp-pal-andras <pal.andras.papp@huawei.com>

Author: 3 people

CMakeLists.txt

@@ -118,6 +118,22 @@ target_compile_options(ProjectExecutableFlags INTERFACE
     >
 )
 
+# Flag for address sanitizer
+option(ENABLE_ASAN "Enable Address Sanitizer" OFF)
+if (ENABLE_ASAN)
+    message(STATUS "Address sanitizer enabled.")
+    target_compile_options(ProjectExecutableFlags INTERFACE -fsanitize=address)
+    target_link_options(ProjectExecutableFlags INTERFACE -fsanitize=address)
+endif ()
+
+# Flag for undefined behaviour sanitizer
+option(ENABLE_UBSAN "Enable Undefined Behaviour Sanitizer" OFF)
+if (ENABLE_UBSAN)
+    message(STATUS "Undefined behaviour sanitizer enabled.")
+    target_compile_options(ProjectExecutableFlags INTERFACE -fsanitize=undefined)
+    target_link_options(ProjectExecutableFlags INTERFACE -fsanitize=undefined)
+endif ()
+
 # --- Find External Libraries ---
 # Find COPT libraries
 find_package(COPT)

include/osp/bsp/scheduler/GreedySchedulers/CilkScheduler.hpp

@@ -171,7 +171,7 @@ class CilkScheduler : public Scheduler<GraphT> {
 
             // Find new ready jobs
             while (!finishTimes.empty() && finishTimes.begin()->first == time) {
-                const TvPair &currentPair = *finishTimes.begin();
+                const TvPair currentPair = *finishTimes.begin();
                 finishTimes.erase(finishTimes.begin());
                 const VertexIdxT<GraphT> &node = currentPair.second;
                 if (node != std::numeric_limits<VertexIdxT<GraphT>>::max()) {

include/osp/bsp/scheduler/LocalSearch/HillClimbing/hill_climbing.hpp

@@ -579,7 +579,7 @@ void HillClimbingScheduler<GraphT>::AddMoveOption(const VertexIdx node, const un
 template <typename GraphT>
 void HillClimbingScheduler<GraphT>::EraseMoveOption(VertexIdx node, unsigned proc, Direction dir) {
     canMove_[dir][node][proc] = false;
-    if (nextMove_.first == dir && nextMove_.second->first == node && nextMove_.second->second == proc) {
+    if (nextMove_.first == dir && nextMove_.second != moveOptions_[dir].end() && nextMove_.second->first == node && nextMove_.second->second == proc) {
         ++nextMove_.second;
     }
     moveOptions_[dir].erase(movePointer_[dir][node][proc]);

include/osp/graph_implementations/eigen_matrix_adapter/eigen_sparse_iterator.hpp

@@ -20,10 +20,6 @@ limitations under the License.
 
 #ifdef EIGEN_FOUND
 
-#    include <Eigen/SparseCore>
-
-#    include "osp/concepts/graph_traits.hpp"
-
 namespace osp {
 
 template <typename Graph, typename EigenIdxType>
@@ -37,12 +33,10 @@ class EigenCSRRange {
 
     class Iterator {
         Inner it_;
-        EigenIdxType skip_;
-        bool atEnd_;
 
         void SkipDiagonal() {
-            while (((!atEnd_) && (it_.row() == skip_)) & (it_.col() == skip_)) {
-                ++(*this);
+            while (it_ && (it_.row() == it_.col())) {
+                ++it_;
             }
         }
 
@@ -55,28 +49,19 @@ class EigenCSRRange {
 
         Iterator() = default;
 
-        Iterator(const Iterator &other) : it_(other.it_), skip_(other.skip_), atEnd_(other.atEnd_) {}
+        Iterator(const Iterator &other) : it_(other.it_) {}
 
         Iterator &operator=(const Iterator &other) {
             it_ = other.it_;
-            skip_ = other.skip_;
-            atEnd_ = other.atEnd_;
             return *this;
         }
 
-        Iterator(const CSRMatrix &mat, EigenIdxType idx, bool end = false) : skip_(idx), atEnd_(end) {
-            if (!end) {
-                it_ = Inner(mat, idx);
-                atEnd_ = !it_;
-                SkipDiagonal();
-            }
-        }
+        Iterator(const CSRMatrix &mat, EigenIdxType idx) : it_(mat, idx) { SkipDiagonal(); }
 
         reference operator*() const { return static_cast<std::size_t>(it_.col()); }
 
         Iterator &operator++() {
             ++it_;
-            atEnd_ = !it_;
             SkipDiagonal();
             return *this;
         }
@@ -87,16 +72,15 @@ class EigenCSRRange {
             return temp;
         }
 
-        bool operator==(const Iterator &) const { return atEnd_; }
-
-        bool operator!=(const Iterator &) const { return !atEnd_; }
+        bool operator==(const Iterator &other) const {return it_ == other.it_;}
+        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
     };
 
     EigenCSRRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}
 
     Iterator begin() const { return Iterator(*graph_.GetCSR(), index_); }
 
-    Iterator end() const { return Iterator(*graph_.GetCSR(), index_, true); }
+    Iterator end() const { return Iterator(); }
 };
 
 template <typename Graph, typename EigenIdxType>
@@ -110,12 +94,10 @@ class EigenCSCRange {
 
     class Iterator {
         Inner it_;
-        EigenIdxType skip_;
-        bool atEnd_;
 
         void SkipDiagonal() {
-            while ((!atEnd_) & (it_.row() == skip_) & (it_.col() == skip_)) {
-                ++(*this);
+            while (it_ && (it_.row() == it_.col())) {
+                ++it_;
             }
         }
 
@@ -128,28 +110,19 @@ class EigenCSCRange {
 
         Iterator() = default;
 
-        Iterator(const Iterator &other) : it_(other.it_), skip_(other.skip_), atEnd_(other.atEnd_) {}
+        Iterator(const Iterator &other) : it_(other.it_) {}
 
         Iterator &operator=(const Iterator &other) {
             it_ = other.it_;
-            skip_ = other.skip_;
-            atEnd_ = other.atEnd_;
             return *this;
         }
 
-        Iterator(const CSCMatrix &mat, EigenIdxType idx, bool end = false) : skip_(idx), atEnd_(end) {
-            if (!end) {
-                it_ = Inner(mat, idx);
-                atEnd_ = !it_;
-                SkipDiagonal();
-            }
-        }
+        Iterator(const CSCMatrix &mat, EigenIdxType idx) : it_(mat, idx) { SkipDiagonal(); }
 
         reference operator*() const { return static_cast<std::size_t>(it_.row()); }
 
         Iterator &operator++() {
             ++it_;
-            atEnd_ = !it_;
             SkipDiagonal();
             return *this;
         }
@@ -160,16 +133,15 @@ class EigenCSCRange {
             return temp;
         }
 
-        bool operator==(const Iterator &) const { return atEnd_; }
-
-        bool operator!=(const Iterator &) const { return !atEnd_; }
+        bool operator==(const Iterator &other) const {return it_ == other.it_;}
+        bool operator!=(const Iterator &other) const { return it_ != other.it_;}
     };
 
     EigenCSCRange(const Graph &graph, EigenIdxType idx) : graph_(graph), index_(idx) {}
 
     Iterator begin() const { return Iterator(*graph_.GetCSC(), index_); }
 
-    Iterator end() const { return Iterator(*graph_.GetCSC(), index_, true); }
+    Iterator end() const { return Iterator(); }
 };
 
 }    // namespace osp