[Code] Fixes:

- Core object marker logic
- Sub-vector extraction (fix indices numeration)
- Cuda matrix^t to vec reduce fixes

Author: EgorOrachyov

cubool/sources/core/matrix.cpp

@@ -40,11 +40,6 @@ namespace cubool {
     Matrix::Matrix(size_t nrows, size_t ncols, BackendBase &backend) {
         mHnd = backend.createMatrix(nrows, ncols);
         mProvider = &backend;
-
-        // By default marker is the address of the matrix
-        std::stringstream s;
-        s << this;
-        mMarker = s.str();
     }
 
     Matrix::~Matrix() {

cubool/sources/core/object.cpp

@@ -27,6 +27,13 @@
 
 namespace cubool {
 
+    Object::Object() {
+        // By default marker is the address of the object
+        std::stringstream s;
+        s << this;
+        mMarker = s.str();
+    }
+
     void Object::setDebugMarker(const char *marker) {
         CHECK_RAISE_ERROR(marker, InvalidArgument, "Null pointer marker string");
 

cubool/sources/core/object.hpp

@@ -32,6 +32,7 @@ namespace cubool {
 
     class Object {
     public:
+        Object();
         void setDebugMarker(const char* marker);
         const char* getDebugMarker() const;
         index getDebugMarkerSizeWithNullT() const;

cubool/sources/core/vector.cpp

@@ -40,11 +40,6 @@ namespace cubool {
     Vector::Vector(size_t nrows, BackendBase &backend) {
         mHnd = backend.createVector(nrows);
         mProvider = &backend;
-
-        // By default marker is the address of the vector
-        std::stringstream s;
-        s << this;
-        mMarker = s.str();
     }
 
     Vector::~Vector() {

cubool/sources/core/vector.hpp

@@ -65,9 +65,6 @@ namespace cubool {
         // Cached values by the set functions
         mutable std::vector<index> mCachedI;
 
-        // Marker for debugging
-        std::string mMarker;
-
         // Implementation handle references
         VectorBase* mHnd = nullptr;
         BackendBase* mProvider = nullptr;

cubool/sources/cuda/cuda_vector.cu

@@ -124,8 +124,8 @@ namespace cubool {
         index firstToCopy = region.front();
 
         VectorImplType::container_type result(resultSize);
-        thrust::copy(vec.m_rows_index.begin() + firstToCopy, vec.m_rows_index.begin() + firstToCopy + resultSize,
-                     result.begin());
+        thrust::transform(vec.m_rows_index.begin() + firstToCopy, vec.m_rows_index.begin() + firstToCopy + resultSize,result.begin(),
+                          [i]__device__(index id) { return id - i; });
 
         // Update this impl data
         mVectorImpl = std::move(VectorImplType(std::move(result), nrows, resultSize));

cubool/sources/sequential/sq_subvector.cpp

@@ -48,7 +48,7 @@ namespace cubool {
 
         for (auto v: a.indices) {
             if (first <= v && v < last) {
-                out.indices.push_back(v);
+                out.indices.push_back(v - i);
             }
         }
     }

cubool/tests/test_vector_misc.cpp

@@ -109,6 +109,12 @@ TEST(cuBool_Vector, Marker) {
 
     ASSERT_EQ(cuBool_Initialize(CUBOOL_HINT_NO), CUBOOL_STATUS_SUCCESS);
     ASSERT_EQ(cuBool_Vector_New(&vector, m), CUBOOL_STATUS_SUCCESS);
+
+    ASSERT_EQ(cuBool_Vector_Marker(vector, nullptr, &size), CUBOOL_STATUS_SUCCESS);
+    ASSERT_LE(size, BUFFER_SIZE);
+    ASSERT_EQ(cuBool_Vector_Marker(vector, buffer, &size), CUBOOL_STATUS_SUCCESS);
+    std::cout << "Default marker: " << buffer << std::endl;
+
     ASSERT_EQ(cuBool_Vector_SetMarker(vector, marker), CUBOOL_STATUS_SUCCESS);
     ASSERT_EQ(cuBool_Vector_Marker(vector, nullptr, &size), CUBOOL_STATUS_SUCCESS);
     ASSERT_LE(size, BUFFER_SIZE);

cubool/utils/testing/vector.hpp

@@ -46,7 +46,7 @@ namespace testing {
 
             for (auto v: index) {
                 if (i <= v && v < (i + m))
-                    out.index.push_back(v);
+                    out.index.push_back(v - i);
             }
 
             out.nrows = m;