[Code] Fix cubool hint flags & build in py tset_app

Author: EgorOrachyov

cubool/include/cubool/cubool.h

@@ -73,27 +73,27 @@ typedef enum cuBool_Status {
 /** Generic lib hits for matrix processing */
 typedef enum cuBool_Hint {
     /** No hints passed */
-    CUBOOL_HINT_NO = 0x0,
+    CUBOOL_HINT_NO = 0,
     /** Force Cpu based backend usage */
-    CUBOOL_HINT_CPU_BACKEND = 0x1,
+    CUBOOL_HINT_CPU_BACKEND = 1,
     /** Use managed gpu memory type instead of default (device) memory */
-    CUBOOL_HINT_GPU_MEM_MANAGED = 0x2,
+    CUBOOL_HINT_GPU_MEM_MANAGED = 2,
     /** Mark input data as row-col sorted */
-    CUBOOL_HINT_VALUES_SORTED = 0x4,
+    CUBOOL_HINT_VALUES_SORTED = 4,
     /** Accumulate result of the operation in the result matrix */
-    CUBOOL_HINT_ACCUMULATE = 0x8,
+    CUBOOL_HINT_ACCUMULATE = 8,
     /** Finalize library state, even if not all resources were explicitly released */
-    CUBOOL_HINT_RELAXED_FINALIZE = 0x16,
+    CUBOOL_HINT_RELAXED_FINALIZE = 16,
     /** Logging hint: log includes error message */
-    CUBOOL_HINT_LOG_ERROR = 0x32,
+    CUBOOL_HINT_LOG_ERROR = 32,
     /** Logging hint: log includes warning message */
-    CUBOOL_HINT_LOG_WARNING = 0x64,
+    CUBOOL_HINT_LOG_WARNING = 64,
     /** Logging hint: log includes all types of messages */
-    CUBOOL_HINT_LOG_ALL = 0x128,
+    CUBOOL_HINT_LOG_ALL = 128,
     /** No duplicates in the build data */
-    CUBOOL_HINT_NO_DUPLICATES = 0x256,
+    CUBOOL_HINT_NO_DUPLICATES = 256,
     /** Performs time measurement and logs elapsed operation time */
-    CUBOOL_HINT_TIME_CHECK = 0x512
+    CUBOOL_HINT_TIME_CHECK = 512
 } cuBool_Hint;
 
 /** Hit mask */

cubool/sources/core/matrix.cpp

@@ -69,6 +69,13 @@ namespace cubool {
         CHECK_RAISE_ERROR(cols != nullptr || nvals == 0, InvalidArgument, "Null ptr cols array");
 
         this->releaseCache();
+
+        LogStream stream(*Library::getLogger());
+        stream << Logger::Level::Info
+               << "Matrix:build:" << this->getDebugMarker() << " "
+               << "isSorted=" << isSorted << ", "
+               << "noDuplicates=" << noDuplicates << LogStream::cmt;
+
         mHnd->build(rows, cols, nvals, isSorted, noDuplicates);
     }
 

cubool/sources/io/logger.cpp

@@ -67,6 +67,10 @@ namespace cubool {
         return mEntries.size();
     }
 
+    bool TextLogger::isDummy() const {
+        return false;
+    }
+
     void TextLogger::addFilter(Filter filter) {
         mFilters.emplace_back(std::move(filter));
     }
@@ -90,4 +94,8 @@ namespace cubool {
     size_t DummyLogger::getMessagesCount() const {
         return 0;
     }
+
+    bool DummyLogger::isDummy() const {
+        return true;
+    }
 }

cubool/sources/io/logger.hpp

@@ -49,6 +49,7 @@ namespace cubool {
         virtual void logInfo(const std::string &message);
         virtual void logWarning(const std::string &message);
         virtual void logError(const std::string &message);
+        virtual bool isDummy() const = 0;
         virtual size_t getMessagesCount() const = 0;
     };
 
@@ -69,6 +70,7 @@ namespace cubool {
         ~TextLogger() override = default;
         void log(Level level, const std::string &message) override;
         size_t getMessagesCount() const override;
+        bool isDummy() const override;
 
         void addFilter(Filter filter);
         void removeAllFilters();
@@ -97,6 +99,7 @@ namespace cubool {
         ~DummyLogger() override = default;
         void log(Level level, const std::string &message) override;
         size_t getMessagesCount() const override;
+        bool isDummy() const override;
     };
 
     /**
@@ -110,27 +113,39 @@ namespace cubool {
         explicit LogStream(Logger& logger)
             : mLogger(logger), mLevel(Logger::Level::Info) {
         };
+
         LogStream(LogStream&& other) noexcept = default;
         ~LogStream() = default;
 
         void commit() {
-            mLogger.log(mLevel, mStream.str());
-            mStream.str(std::string());
+            if (!mLogger.isDummy()) {
+                mLogger.log(mLevel, mStream.str());
+                mStream.str(std::string());
+            }
         }
 
         friend LogStream& operator<<(LogStream& stream, Logger::Level level) {
-            stream.mLevel = level;
+            if (!stream.mLogger.isDummy()) {
+                stream.mLevel = level;
+            }
+
             return stream;
         }
 
         friend LogStream& operator<<(LogStream& stream, Commit commit) {
-            stream.commit();
+            if (!stream.mLogger.isDummy()) {
+                stream.commit();
+            }
+
             return stream;
         }
 
         template<typename T>
         friend LogStream& operator<<(LogStream& stream, T&& t) {
-            stream.mStream << std::forward<T>(t);
+            if (!stream.mLogger.isDummy()) {
+                stream.mStream << std::forward<T>(t);
+            }
+
             return stream;
         }
 

cubool/sources/sequential/sq_matrix.cpp

@@ -34,8 +34,6 @@
 #include <algorithm>
 #include <cassert>
 
-#include <iostream>
-
 namespace cubool {
 
     SqMatrix::SqMatrix(size_t nrows, size_t ncols) {

cubool/tests/test_matrix_ewiseadd.cpp

@@ -73,32 +73,32 @@ void testRun(cuBool_Index m, cuBool_Index n, cuBool_Hints setup) {
     EXPECT_EQ(cuBool_Finalize(), CUBOOL_STATUS_SUCCESS);
 }
 
-TEST(cuBool_Matrix, AddSmall) {
+TEST(cuBool_Matrix, EWiseAddSmall) {
     cuBool_Index m = 60, n = 80;
     testRun(m, n, CUBOOL_HINT_NO);
 }
 
-TEST(cuBool_Matrix, AddMedium) {
+TEST(cuBool_Matrix, EWiseAddMedium) {
     cuBool_Index m = 500, n = 800;
     testRun(m, n, CUBOOL_HINT_NO);
 }
 
-TEST(cuBool_Matrix, AddLarge) {
+TEST(cuBool_Matrix, EWiseAddLarge) {
     cuBool_Index m = 2500, n = 1500;
     testRun(m, n, CUBOOL_HINT_NO);
 }
 
-TEST(cuBool_Matrix, AddSmallFallback) {
+TEST(cuBool_Matrix, EWiseAddSmallFallback) {
     cuBool_Index m = 60, n = 80;
     testRun(m, n, CUBOOL_HINT_CPU_BACKEND);
 }
 
-TEST(cuBool_Matrix, AddMediumFallback) {
+TEST(cuBool_Matrix, EWiseAddMediumFallback) {
     cuBool_Index m = 500, n = 800;
     testRun(m, n, CUBOOL_HINT_CPU_BACKEND);
 }
 
-TEST(cuBool_Matrix, AddLargeFallback) {
+TEST(cuBool_Matrix, EWiseAddLargeFallback) {
     cuBool_Index m = 2500, n = 1500;
     testRun(m, n, CUBOOL_HINT_CPU_BACKEND);
 }

python/pycubool/bridge.py

@@ -13,17 +13,17 @@
     "check"
 ]
 
-_hint_no = 0x0
-_hint_cpu_backend = 0x1
-_hint_gpu_mem_managed = 0x2
-_hint_values_sorted = 0x4
-_hint_accumulate = 0x8
-_hint_relaxed_release = 0x16
-_hint_log_error = 0x32
-_hint_log_warning = 0x64
-_hint_log_all = 0x128
-_hint_no_duplicates = 0x256
-_hint_time_check = 0x512
+_hint_no = 0
+_hint_cpu_backend = 1
+_hint_gpu_mem_managed = 2
+_hint_values_sorted = 4
+_hint_accumulate = 8
+_hint_relaxed_release = 16
+_hint_log_error = 32
+_hint_log_warning = 64
+_hint_log_all = 128
+_hint_no_duplicates = 256
+_hint_time_check = 512
 
 
 def get_log_hints(default=True, error=False, warning=False):

python/pycubool/matrix.py

@@ -4,6 +4,7 @@
 from . import wrapper
 from . import bridge
 
+
 __all__ = [
     "Matrix"
 ]
@@ -12,6 +13,30 @@
 class Matrix:
     """
     Wrapper for cuBool Sparse boolean matrix type.
+
+    Matrix class supports all cuBool C API Matrix functions.
+    Also Matrix class provides additional fancy functions/operators for better user experience.
+
+    Matrix creation:
+    - empty
+    - from lists data
+    - random generated
+
+    Matrix operations:
+    - mxm
+    - ewiseadd
+    - kronecker
+    - reduce
+    - transpose
+    - matrix extraction
+
+    Matrix functions:
+    - to string
+    - values iterating
+    - equality check
+
+    Debug features:
+    - String markers
     """
 
     __slots__ = ["hnd"]
@@ -492,6 +517,7 @@ def mxm(self, other, out=None, accumulate=False, time_check=False):
         if out is None:
             shape = (self.nrows, other.ncols)
             out = Matrix.empty(shape)
+            accumulate = False
 
         status = wrapper.loaded_dll.cuBool_MxM(
             out.hnd,

python/test_app.py

@@ -1,6 +1,6 @@
 import random
-from python import pycubool
-from python.tests import test_transitive_closure
+import pycubool
+from tests import test_transitive_closure
 
 
 def lists_to_pairs(rows, cols):
@@ -34,20 +34,23 @@ def gen_matrix_data(size, seed):
 def gen_matrix(size, seed):
     rows, cols, nvals = gen_matrix_data(size, seed)
     mat = pycubool.Matrix.empty(size)
-    mat.build(rows, cols, nvals)
+    mat.build(rows, cols, no_duplicates=True)
     return mat, lists_to_pairs(rows, cols)
 
 
-dim = (100, 100)
-to_gen = 500
+dim = (10, 10)
+to_gen = 50
 
+# pycubool.setup_logger(pycubool.get_default_log_name())
 a, a_set = gen_matrix(dim, to_gen)
 b, b_set = gen_matrix(dim, to_gen)
 
 print("Matrix a din:", a.shape, "values count:", a.nvals)
 print("Matrix b dim:", b.shape, "values count:", b.nvals)
 
 r = a.ewiseadd(b, time_check=True)
+c = a.mxm(b, accumulate=True)
+print(a, b, c, sep="\n")
 
 print("Matrix r values count:", r.nvals)