[Code] Minor fixes in setElement logic

EgorOrachyov · EgorOrachyov · commit 9098085f1acc · 2021-03-06T12:00:35.000+03:00
diff --git a/cubool/CMakeLists.txt b/cubool/CMakeLists.txt
@@ -140,6 +140,7 @@ if (CUBOOL_WITH_CUDA)
 
     # Settings: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
     target_compile_options(cubool PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:
+        -arch=sm_30
         -gencode=arch=compute_30,code=sm_30
         -gencode=arch=compute_35,code=sm_35
         -gencode=arch=compute_50,code=sm_50
diff --git a/cubool/include/cubool/cubool.h b/cubool/include/cubool/cubool.h
@@ -84,11 +84,11 @@ typedef enum cuBool_Hint {
     CUBOOL_HINT_ACCUMULATE = 0x8,
     /** Finalize library state, even if not all resources were explicitly released */
     CUBOOL_HINT_RELAXED_FINALIZE = 0x16,
-    /** Logging hint: log error message */
+    /** Logging hint: log includes error message */
     CUBOOL_HINT_LOG_ERROR = 0x32,
-    /** Logging hint: log warning message */
+    /** Logging hint: log includes warning message */
     CUBOOL_HINT_LOG_WARNING = 0x64,
-    /** Logging hint: log all messages */
+    /** Logging hint: log includes all types of messages */
     CUBOOL_HINT_LOG_ALL = 0x128,
     /** No duplicates in the build data */
     CUBOOL_HINT_NO_DUPLICATES = 0x256
@@ -159,7 +159,7 @@ CUBOOL_EXPORT CUBOOL_API cuBool_Status cuBool_GetVersion(
  * @note Pass `CUBOOL_HINT_LOG_WARNING` to include warning messages into log
  * @note Pass `CUBOOL_HINT_LOG_ALL` to include all messages into log
  *
- * @param logFileName File name in the encoding of the target platform.
+ * @param logFileName UTF-8 encoded file name and path.
  * @param hints Logging hints to filter messages.
  *
  * @return Error code on this operation
diff --git a/cubool/sources/backend/matrix_base.hpp b/cubool/sources/backend/matrix_base.hpp
@@ -38,7 +38,7 @@ namespace cubool {
         virtual ~MatrixBase() = default;
 
         virtual void setElement(index i, index j) = 0;
-        virtual void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) = 0;
+        virtual void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) = 0;
         virtual void extract(index* rows, index* cols, size_t &nvals) = 0;
         virtual void extractSubMatrix(const MatrixBase& otherBase, index i, index j, index nrows, index ncols) = 0;
 
diff --git a/cubool/sources/core/matrix.cpp b/cubool/sources/core/matrix.cpp
@@ -52,12 +52,12 @@ namespace cubool {
         mCachedJ.push_back(j);
     }
 
-    void Matrix::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) {
+    void Matrix::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) {
         CHECK_RAISE_ERROR(rows != nullptr || nvals == 0, InvalidArgument, "Null ptr rows array");
         CHECK_RAISE_ERROR(cols != nullptr || nvals == 0, InvalidArgument, "Null ptr cols array");
 
         this->releaseCache();
-        mHnd->build(rows, cols, nvals, isSorted, hasDuplicates);
+        mHnd->build(rows, cols, nvals, isSorted, noDuplicates);
     }
 
     void Matrix::extract(index *rows, index *cols, size_t &nvals) {
@@ -205,6 +205,15 @@ namespace cubool {
         return mHnd->getNvals();
     }
 
+    void Matrix::setDebugMarker(const char *marker) {
+        CHECK_RAISE_ERROR(marker, InvalidArgument, "Null pointer marker string");
+        mMarker = marker;
+    }
+
+    const char * Matrix::getDebugMarker() const {
+        return mMarker.c_str();
+    }
+
     void Matrix::releaseCache() const {
         mCachedI.clear();
         mCachedJ.clear();
@@ -219,17 +228,22 @@ namespace cubool {
         if (cachedNvals == 0)
             return;
 
-        size_t currentNvals = mHnd->getNvals();
+        bool isSorted = false;
+        bool noDuplicates = false;
 
-        // Read values from backend matrix and join
-        if (currentNvals > 0) {
-            mCachedI.resize(cachedNvals + currentNvals);
-            mCachedJ.resize(cachedNvals + currentNvals);
-            mHnd->extract(mCachedI.data() + cachedNvals, mCachedJ.data() + cachedNvals, currentNvals);
-        }
+        // We will have to join old and new values
+        if (mHnd->getNvals() > 0) {
+            // Build tmp matrix with new values
+            MatrixBase* tmp = mProvider->createMatrix(getNrows(), getNcols());
+            tmp->build(mCachedI.data(), mCachedJ.data(), cachedNvals, isSorted, noDuplicates);
 
-        // Build matrix
-        mHnd->build(mCachedI.data(), mCachedJ.data(), cachedNvals + currentNvals, false, true);
+            // Add new values to current matrix content
+            mHnd->eWiseAdd(*mHnd, *tmp);
+        }
+        // Otherwise, new values are used to build matrix content
+        else {
+            mHnd->build(mCachedI.data(), mCachedJ.data(), cachedNvals, isSorted, noDuplicates);
+        }
 
         // Clear arrays
         releaseCache();
diff --git a/cubool/sources/core/matrix.hpp b/cubool/sources/core/matrix.hpp
@@ -38,7 +38,7 @@ namespace cubool {
         ~Matrix() override;
 
         void setElement(index i, index j) override;
-        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) override;
+        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) override;
         void extract(index *rows, index *cols, size_t &nvals) override;
         void extractSubMatrix(const MatrixBase& otherBase, index i, index j, index nrows, index ncols) override;
 
@@ -54,6 +54,9 @@ namespace cubool {
         index getNcols() const override;
         index getNvals() const override;
 
+        void setDebugMarker(const char* marker);
+        const char* getDebugMarker() const;
+
     private:
 
         void releaseCache() const;
@@ -63,6 +66,9 @@ namespace cubool {
         mutable std::vector<index> mCachedI;
         mutable std::vector<index> mCachedJ;
 
+        // Marker for debugging
+        std::string mMarker;
+
         // Implementation handle references
         MatrixBase* mHnd = nullptr;
         BackendBase* mProvider = nullptr;
diff --git a/cubool/sources/cuBool_Matrix_Build.cpp b/cubool/sources/cuBool_Matrix_Build.cpp
@@ -35,6 +35,6 @@ cuBool_Status cuBool_Matrix_Build(
         CUBOOL_VALIDATE_LIBRARY
         CUBOOL_ARG_NOT_NULL(matrix)
         auto m = (cubool::Matrix *) matrix;
-        m->build(rows, cols, nvals, hints & CUBOOL_HINT_VALUES_SORTED, !(hints & CUBOOL_HINT_NO_DUPLICATES));
+        m->build(rows, cols, nvals, hints & CUBOOL_HINT_VALUES_SORTED, hints & CUBOOL_HINT_NO_DUPLICATES);
     CUBOOL_END_BODY
 }
diff --git a/cubool/sources/cuda/matrix_csr.cu b/cubool/sources/cuda/matrix_csr.cu
@@ -38,7 +38,7 @@ namespace cubool {
         RAISE_ERROR(NotImplemented, "This function is not supported for this matrix class");
     }
 
-    void MatrixCsr::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) {
+    void MatrixCsr::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) {
         if (nvals == 0) {
             mMatrixImpl.zero_dim();  // no content, empty matrix
             return;
@@ -87,7 +87,7 @@ namespace cubool {
         }
 
         // Reduce duplicated values
-        if (hasDuplicates) {
+        if (!noDuplicates) {
             size_t unique = 0;
             for (size_t i = 0; i < getNrows(); i++) {
                 index prev = std::numeric_limits<index>::max();
diff --git a/cubool/sources/cuda/matrix_csr.hpp b/cubool/sources/cuda/matrix_csr.hpp
@@ -44,7 +44,7 @@ namespace cubool {
         ~MatrixCsr() override = default;
 
         void setElement(index i, index j) override;
-        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) override;
+        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) override;
         void extract(index* rows, index* cols, size_t &nvals) override;
         void extractSubMatrix(const MatrixBase& otherBase, index i, index j, index nrows, index ncols) override;
 
diff --git a/cubool/sources/cuda/matrix_dense.hpp b/cubool/sources/cuda/matrix_dense.hpp
@@ -54,7 +54,7 @@ namespace cubool {
         MatrixDense(MatrixDense&& other) noexcept = delete;
         ~MatrixDense() override = default;
 
-        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) override;
+        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) override;
         void extract(index* rows, index* cols, size_t& nvals) override;
 
         void clone(const MatrixBase& other) override;
diff --git a/cubool/sources/sequential/sq_matrix.cpp b/cubool/sources/sequential/sq_matrix.cpp
@@ -50,7 +50,7 @@ namespace cubool {
         RAISE_ERROR(NotImplemented, "This function is not supported for this matrix class");
     }
 
-    void SqMatrix::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) {
+    void SqMatrix::build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) {
         auto nrows = mData.nrows;
         auto ncols = mData.ncols;
 
@@ -98,7 +98,7 @@ namespace cubool {
             }
         }
 
-        if (hasDuplicates) {
+        if (!noDuplicates) {
             size_t unique = 0;
             for (size_t i = 0; i < getNrows(); i++) {
                 index prev = std::numeric_limits<index>::max();
diff --git a/cubool/sources/sequential/sq_matrix.hpp b/cubool/sources/sequential/sq_matrix.hpp
@@ -39,7 +39,7 @@ namespace cubool {
         ~SqMatrix() override = default;
 
         void setElement(index i, index j) override;
-        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool hasDuplicates) override;
+        void build(const index *rows, const index *cols, size_t nvals, bool isSorted, bool noDuplicates) override;
         void extract(index *rows, index *cols, size_t &nvals) override;
         void extractSubMatrix(const MatrixBase &otherBase, index i, index j, index nrows, index ncols) override;
 
diff --git a/cubool/tests/test_matrix_element.cpp b/cubool/tests/test_matrix_element.cpp
@@ -61,13 +61,54 @@ void testMatrixSetElement(cuBool_Index m, cuBool_Index n, float density) {
     ASSERT_EQ(cuBool_Matrix_Free(matrix), CUBOOL_STATUS_SUCCESS);
 }
 
+void testMatrixAppendElement(cuBool_Index m, cuBool_Index n, float density) {
+    cuBool_Matrix matrix = nullptr;
+
+    testing::Matrix tmatrix = std::move(testing::Matrix::generateSparse(m, n, density));
+
+    ASSERT_EQ(cuBool_Matrix_New(&matrix, m, n), CUBOOL_STATUS_SUCCESS);
+    ASSERT_EQ(cuBool_Matrix_Build(matrix, tmatrix.rowsIndex.data(), tmatrix.colsIndex.data(), (cuBool_Index) tmatrix.nvals, CUBOOL_HINT_VALUES_SORTED | CUBOOL_HINT_NO_DUPLICATES), CUBOOL_STATUS_SUCCESS);
+
+    std::vector<cuBool_Index> I;
+    std::vector<cuBool_Index> J;
+    size_t nvals = tmatrix.nvals;
+    size_t dups = nvals * 0.20;
+
+    std::default_random_engine engine(std::chrono::system_clock::now().time_since_epoch().count());
+    auto dist = std::uniform_real_distribution<float>(0.0, 1.0);
+
+    if (nvals > 0) {
+        for (size_t k = 0; k < dups; k++) {
+            size_t id = std::min<size_t>(dist(engine) * nvals, nvals - 1);
+            auto i = tmatrix.rowsIndex[id], j = tmatrix.colsIndex[id];
+            I.push_back(i);
+            J.push_back(j);
+        }
+    }
+
+    nvals = I.size();
+    for (size_t i = 0; i < nvals; i++) {
+        ASSERT_EQ(cuBool_Matrix_SetElement(matrix, I[i], J[i]), CUBOOL_STATUS_SUCCESS);
+    }
+
+    // Compare test matrix and library one
+    ASSERT_TRUE(tmatrix.areEqual(matrix));
+
+    // Remember to release resources
+    ASSERT_EQ(cuBool_Matrix_Free(matrix), CUBOOL_STATUS_SUCCESS);
+}
+
 void testRun(cuBool_Index m, cuBool_Index n, cuBool_Hints setup) {
     ASSERT_EQ(cuBool_Initialize(setup), CUBOOL_STATUS_SUCCESS);
 
     for (size_t i = 0; i < 10; i++) {
         testMatrixSetElement(m, n, 0.001f + (0.05f) * ((float) i));
     }
 
+    for (size_t i = 0; i < 10; i++) {
+        testMatrixAppendElement(m, n, 0.001f + (0.05f) * ((float) i));
+    }
+
     ASSERT_EQ(cuBool_Finalize(), CUBOOL_STATUS_SUCCESS);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ cuBool_Status cuBool_Matrix_Build(`
`35`	`35`	`CUBOOL_VALIDATE_LIBRARY`
`36`	`36`	`CUBOOL_ARG_NOT_NULL(matrix)`
`37`	`37`	`auto m = (cubool::Matrix *) matrix;`
`38`		`- m->build(rows, cols, nvals, hints & CUBOOL_HINT_VALUES_SORTED, !(hints & CUBOOL_HINT_NO_DUPLICATES));`
	`38`	`+ m->build(rows, cols, nvals, hints & CUBOOL_HINT_VALUES_SORTED, hints & CUBOOL_HINT_NO_DUPLICATES);`
`39`	`39`	`CUBOOL_END_BODY`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace cubool {`
`50`	`50`	`RAISE_ERROR(NotImplemented, "This function is not supported for this matrix class");`
`51`	`51`	`}`
`52`	`52`
`53`		`- void SqMatrix::build(const index rows, const index cols, size_t nvals, bool isSorted, bool hasDuplicates) {`
	`53`	`+ void SqMatrix::build(const index rows, const index cols, size_t nvals, bool isSorted, bool noDuplicates) {`
`54`	`54`	`auto nrows = mData.nrows;`
`55`	`55`	`auto ncols = mData.ncols;`
`56`	`56`
`@@ -98,7 +98,7 @@ namespace cubool {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- if (hasDuplicates) {`
	`101`	`+ if (!noDuplicates) {`
`102`	`102`	`size_t unique = 0;`
`103`	`103`	`for (size_t i = 0; i < getNrows(); i++) {`
`104`	`104`	`index prev = std::numeric_limits<index>::max();`