[Tests] Tests setup fixes

Author: EgorOrachyov

CMakeLists.txt

@@ -12,6 +12,7 @@ option(CUBOOL_BUILD_TESTS     "Build project unit-tests with gtest" ON)
 
 set(CUBOOL_VERSION_MAJOR 1)
 set(CUBOOL_VERSION_MINOR 0)
+set(CUBOOL_VERSION_SUB 0)
 
 # Configure cuda dependencies
 if (CUBOOL_WITH_CUDA)

README.md

@@ -24,7 +24,7 @@ as well as python high-level wrapper with automated resources management.
 - [X] Library setup
 - [X] CSR matrix
 - [X] CSR multiplication
-- [X] CSR addition
+- [X] CSR element-wise addition
 - [X] CSR kronecker
 - [X] CSR transpose
 - [X] CSR submatrix
@@ -136,6 +136,7 @@ By default, the following cmake options will be automatically enabled:
 
 - `CUBOOL_WITH_CUDA` - build library with actual cuda backend
 - `CUBOOL_WITH_CPU` - build library witt cpu based backend
+- `CUBOOL_WITH_TESTS` - build library unit-tests collection
 
 > Note: in order to provide correct GCC version for CUDA sources compiling,
 > you will have to provide custom paths to the CC and CXX compilers before 

cubool/CMakeLists.txt

@@ -116,6 +116,7 @@ target_include_directories(cubool PRIVATE ${CMAKE_CURRENT_LIST_DIR}/sources)
 target_compile_definitions(cubool PRIVATE CUBOOL_EXPORTS)
 target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_MAJOR=${CUBOOL_VERSION_MAJOR})
 target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_MINOR=${CUBOOL_VERSION_MINOR})
+target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_SUB=${CUBOOL_VERSION_SUB})
 
 target_compile_features(cubool PUBLIC cxx_std_14)
 

cubool/include/cubool/cubool.h

@@ -131,14 +131,14 @@ CUBOOL_EXPORT CUBOOL_API const char* cuBool_LicenseInfo_Get(
  *
  * @param major Major version number part
  * @param minor Minor version number part
- * @param version Composite integer version
+ * @param sub Sub version number part
  *
  * @return Error if failed to query version info
  */
 CUBOOL_EXPORT CUBOOL_API cuBool_Status cuBool_Version_Get(
     int* major,
     int* minor,
-    int* version
+    int* sub
 );
 
 /**

cubool/sources/core/version.hpp

@@ -31,8 +31,7 @@
 /** Defined in cmake */
 #define CUBOOL_MINOR CUBOOL_VERSION_MINOR
 
-/** Nice utility */
-#define CUBOOL_VERSION ((uint32_t) CUBOOL_VERSION_MAJOR << 4u) | ((uint32_t) CUBOOL_VERSION_MINOR)
-#define CUBOOL_VERSION_STRING #CUBOOL_VERSION_MAJOR "." #CUBOOL_VERSION_MINOR
+/** Defined in cmake */
+#define CUBOOL_SUB CUBOOL_VERSION_SUB
 
 #endif //CUBOOL_VERSION_HPP

cubool/sources/cuBool_Version_Get.cpp

@@ -27,16 +27,20 @@
 cuBool_Status cuBool_Version_Get(
         int *major,
         int *minor,
-        int *version
+        int *sub
 ) {
+    auto MAJOR = (uint32_t)(CUBOOL_MAJOR);
+    auto MINOR = (uint32_t)(CUBOOL_MINOR);
+    auto SUB = (uint32_t)(CUBOOL_SUB);
+
     if (major)
-        *major = CUBOOL_MAJOR;
+        *major = MAJOR;
 
     if (minor)
-        *minor = CUBOOL_MINOR;
+        *minor = MINOR;
 
-    if (version)
-        *version = CUBOOL_VERSION;
+    if (sub)
+        *sub = SUB;
 
     return CUBOOL_STATUS_SUCCESS;
 }

cubool/sources/sequential/sq_kronecker.cpp

@@ -27,15 +27,6 @@
 
 namespace cubool {
 
-    void scan(std::vector<index> &v) {
-        index sum = 0;
-        for (auto& val: v) {
-            index next = sum + val;
-            val = sum;
-            sum = next;
-        }
-    }
-
     void sq_kronecker(const CsrData& a, const CsrData& b, CsrData& out) {
         size_t nvals = a.nvals * b.nvals;
 

cubool/sources/sequential/sq_matrix.cpp

@@ -45,12 +45,6 @@ namespace cubool {
     }
 
     void SqMatrix::build(const index *rows, const index *cols, size_t nvals, bool isSorted) {
-        if (nvals == 0)
-            return;
-
-        assert(rows);
-        assert(cols);
-
         auto nrows = mData.nrows;
         auto ncols = mData.ncols;
 
@@ -59,6 +53,12 @@ namespace cubool {
         mData.colIndices.clear();
         mData.colIndices.reserve(nvals);
 
+        if (nvals == 0)
+            return;
+
+        assert(rows);
+        assert(cols);
+
         if (isSorted) {
             for (size_t k = 0; k < nvals; k++) {
                 auto i = rows[k];

cubool/sources/sequential/sq_spgemm.cpp

@@ -61,6 +61,7 @@ namespace cubool {
         // Row offsets
         sq_exclusive_scan(out.rowOffsets.begin(), out.rowOffsets.end(), 0);
 
+        out.nvals = nvals;
         out.colIndices.resize(nvals);
 
         // Fill column indices per row and sort

cubool/tests/test_library_api.cpp

@@ -87,20 +87,20 @@ TEST(cuBoolInstance, Example) {
 
     testing::Matrix ta = testing::Matrix::generateSparse(n , n, 0.2);
 
-    cuBool_Matrix_Build(A, ta.mRowsIndex.data(), ta.mColsIndex.data(), ta.mNvals, CUBOOL_HINT_VALUES_SORTED);
+    cuBool_Matrix_Build(A, ta.rowsIndex.data(), ta.colsIndex.data(), ta.nvals, CUBOOL_HINT_VALUES_SORTED);
 
     TransitiveClosure(A, &T);
 
     testing::Matrix tr = ta;
-    size_t total = 0;
+    size_t total;
 
     do {
-        total = tr.mNvals;
+        total = tr.nvals;
 
         testing::MatrixMultiplyFunctor functor;
-        tr = std::move(functor(tr, tr, tr));
+        tr = std::move(functor(tr, tr, tr, true));
     }
-    while (tr.mNvals != total);
+    while (tr.nvals != total);
 
     ASSERT_TRUE(tr.areEqual(T));