Removed temporary solutions for preparing PR

Author: mitya-y

cubool/include/cubool/cubool.h

@@ -926,20 +926,20 @@ CUBOOL_EXPORT CUBOOL_API cuBool_Status cuBool_Kronecker(
 );
 
 /**
- * Performs result = left + ~right, where
- *     '+' is boolean semiring 'or' operation
+ * Performs result = left * ~right, where
+ *     '*' is boolean semiring 'and' operation
  *     '~' is operation for invert matrix (0 swaps to 1 and 1 to 0)
  *
- * @note Matrices must be compatible
+ * @note To perform this operation matrices must be compatible
+ *          dim(left) = M x T
+ *          dim(right) = T x N
  *          dim(result) = M x N
- *          dim(left) = M x N
- *          dim(right) = M x N
  *
  * @note Pass `CUBOOL_HINT_TIME_CHECK` hint to measure operation time
  *
  * @param result[out] Destination matrix to store result
- * @param left Source matrix to be added
- * @param right Source matrix to be inverted and added
+ * @param left Source matrix to be multiplied
+ * @param right Source matrix to be inverted and multiplied
  * @param hints Hints for the operation
  *
  * @return Error code on this operation

cubool/sources/core/matrix.cpp

@@ -370,21 +370,19 @@ namespace cubool {
         msk->commitCache();
         this->releaseCache();
 
-        /*
         if (checkTime) {
-            TIMER_ACTION(timer, mHnd->eWiseMult(*a->mHnd, *b->mHnd, false));
+            TIMER_ACTION(timer, mHnd->eWiseMultInverted(*mat->mHnd, *msk->mHnd, false));
 
             LogStream stream(*Library::getLogger());
             stream << Logger::Level::Info
                    << "Time: " << timer.getElapsedTimeMs() << " ms "
-                   << "Matrix::eWiseMult: "
+                   << "Matrix::eWiseMultInverted: "
                    << this->getDebugMarker() << " = "
-                   << a->getDebugMarker() << " + "
-                   << b->getDebugMarker() << LogStream::cmt;
+                   << mat->getDebugMarker() << " + "
+                   << msk->getDebugMarker() << LogStream::cmt;
 
             return;
         }
-        */
 
         mHnd->eWiseMultInverted(*mat->mHnd, *msk->mHnd, false);
     }

cubool/sources/cuda/kernels/spmerge.cuh

@@ -104,7 +104,6 @@ namespace cubool {
             MatrixType operator()(const MatrixType& a, const MatrixType& b) {
                 auto aNvals = a.m_vals;
                 auto bNvals = b.m_vals;
-                // auto worst = std::min(aNvals, bNvals);
                 auto worst = aNvals + bNvals;
 
                 // Allocate memory for the worst case scenario

cubool/tests/test_matrix_ewisemult_inverted.cpp

@@ -4,31 +4,6 @@
 
 using DataMatrix = std::vector<std::vector<int>>;
 
-static void printTestingMatrix(const testing::Matrix &matrix, std::string name = "") {
-    if (name != "") {
-        std::cout << name << std::endl;
-    }
-
-    for (int i = 0; i < matrix.nvals; i++) {
-        printf("(%d, %d)\n", matrix.rowsIndex[i], matrix.colsIndex[i]);
-    }
-}
-
-static void printCuboolMatrix(cuBool_Matrix matrix, std::string name = "") {
-    if (name != "") {
-        std::cout << name << std::endl;
-    }
-
-    cuBool_Index nvals;
-    cuBool_Matrix_Nvals(matrix, &nvals);
-    std::vector<cuBool_Index> rows(nvals), cols(nvals);
-    cuBool_Matrix_ExtractPairs(matrix, rows.data(), cols.data(), &nvals);
-
-    for (int i = 0; i < nvals; i++) {
-        printf("(%d, %d)\n", rows[i], cols[i]);
-    }
-}
-
 void testApplyNotMask(const DataMatrix &matrix_data, const DataMatrix &mask_data) {
     cuBool_Index nrows, ncols;
     nrows = matrix_data.size();

deps/nsparse-um/CMakeLists.txt

@@ -3,7 +3,6 @@ project(nsparse_um LANGUAGES CXX CUDA)
 
 add_library(nsparse_um INTERFACE)
 target_include_directories(nsparse_um INTERFACE include/)
-# target_link_libraries(nsparse_um INTERFACE cub)
 target_link_libraries(nsparse_um INTERFACE)
 target_compile_options(nsparse_um INTERFACE $<$<COMPILE_LANGUAGE:CUDA>: --expt-relaxed-constexpr --expt-extended-lambda>)
 

deps/nsparse-um/include/nsparse/unified_allocator.h

@@ -3,7 +3,6 @@
 #include <thrust/detail/config.h>
 #include <thrust/device_ptr.h>
 #include <thrust/mr/allocator.h>
-// #include <thrust/memory/detail/device_system_resource.h>
 
 #include <limits>
 #include <stdexcept>

deps/nsparse-um/test/CMakeLists.txt

@@ -3,7 +3,6 @@ project(nsparse_um_test CXX CUDA)
 
 add_executable(${PROJECT_NAME} src/nsparse_test.cu src/utils.cpp)
 
-# target_link_libraries(${PROJECT_NAME} PRIVATE gtest_main nsparse_um cub)
 target_link_libraries(${PROJECT_NAME} PRIVATE gtest_main nsparse_um)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
 

deps/nsparse/test/CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.11)
 project(nsparse_test CXX CUDA)
 
 add_executable(${PROJECT_NAME} src/nsparse_test.cu src/utils.cpp)
-# target_link_libraries(${PROJECT_NAME} PRIVATE gtest_main nsparse cub)
 target_link_libraries(${PROJECT_NAME} PRIVATE gtest_main nsparse)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)