Merge pull request #1 from JetBrains-Research/master

Pulling changes from the main repository

Author: Krekep

.gitignore

@@ -3,4 +3,7 @@
 
 # Build files
 /cmake-build-debug
-/build
+/build
+
+# Python cache
+/python/pycubool/__pycache__/

CMakeLists.txt

@@ -92,6 +92,27 @@ set_target_properties(cubool PROPERTIES CUDA_STANDARD 14)
 set_target_properties(cubool PROPERTIES CUDA_STANDARD_REQUIRED ON)
 set_target_properties(cubool PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 
+
+set(CUBOOL_DUMMY_SOURCES
+    include/cubool/cubool.h
+    src/cubool-dummy/cubool.cpp
+    src/cubool-dummy/version.hpp
+    src/cubool-dummy/instance.hpp
+    src/cubool-dummy/matrix.hpp
+        )
+
+# Create dummy library instance for testing purposes
+add_library(cubool_dummy SHARED ${CUBOOL_DUMMY_SOURCES})
+
+target_include_directories(cubool_dummy PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(cubool_dummy PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src)
+target_include_directories(cubool_dummy PRIVATE ${CMAKE_BINARY_DIR}/src)
+
+target_compile_features(cubool_dummy PUBLIC cxx_std_11)
+
+set_target_properties(cubool_dummy PROPERTIES CXX_STANDARD 11)
+set_target_properties(cubool_dummy PROPERTIES CXX_STANDARD_REQUIRED ON)
+
 # If tests enabled, add tests sources to the build
 if (CUBOOL_BUILD_TESTS)
     add_subdirectory(tests)

README.md

@@ -29,9 +29,11 @@ the programming language *COBOL*.
 - [ ] Block CSR multiplication
 - [ ] Block CSR kronecker
 - [ ] Sparse matrix wrapper ?
-- [ ] Wrapper for Python API 
+- [X] Wrapper for Python API
+- [ ] Wrapper test in Python 
 - [ ] User guide
 - [ ] Unit Tests collection
+- [X] Dummy library implementation for testing
 - [ ] Publish built artifacts and shared lib
 
 ## Requirements
@@ -126,6 +128,9 @@ cuBool
 ├── docs - documents, text files and various helpful stuff
 ├── tests - gtest-based unit-tests collection
 ├── scripts - short utility programs 
+├── python - project python sources
+│   ├── pycubool - cubool library wrapper for python (similar to pygraphblas)
+│   └── tests - tests for python wrapper
 ├── thirdparty - project dependencies
 │   ├── cub - cuda utility, required for nsparse
 │   ├── gtest - google test framework for unit testing
@@ -143,4 +148,4 @@ This project is licensed under MIT License. License text can be found in the
 ## Contributors
 
 - Semyon Grigorev (Github: [gsvgit](https://github.com/gsvgit))
-- Egor Orachyov (Github: [EgorOrachyov](https://github.com/EgorOrachyov))
+- Egor Orachyov (Github: [EgorOrachyov](https://github.com/EgorOrachyov))

include/cubool/cubool.h

@@ -293,7 +293,7 @@ CUBOOL_EXPERIMENTAL CUBOOL_API CuBoolStatus CuBool_MatrixDense_Build(
  *
  * @return Error code on this operation
  */
-CUBOOL_EXPERIMENTAL CUBOOL_API CuBoolStatus CuBool_MatrixDense_ExtractPairs(
+CUBOOL_EXPERIMENTAL CUBOOL_API CuBoolStatus CuBool_MatrixDense_ExtractPairsExt(
     CuBoolInstance              instance,
     CuBoolMatrixDense           matrix,
     CuBoolIndex_t**             rows,
@@ -403,6 +403,27 @@ CUBOOL_API CuBoolStatus CuBool_Matrix_Build(
     CuBoolSize_t                nvals
 );
 
+/**
+ * Reads matrix data to the host visible CPU buffer as an array of values pair.
+ * The arrays must be provided by the user and the size of this arrays must
+ * be greater or equal the values count of the matrix.
+ *
+ * @param instance An instance object reference to perform this operation
+ * @param matrix Matrix handle to perform operation on
+ * @param[in,out] rows Allocated buffer with row indices
+ * @param[in,out] cols Allocated buffer with column indices
+ * @param[in,out] nvals Total number of the pairs
+ *
+ * @return Error code on this operation
+ */
+CUBOOL_API CuBoolStatus CuBool_Matrix_ExtractPairs(
+        CuBoolInstance              instance,
+        CuBoolMatrix                matrix,
+        CuBoolIndex_t*              rows,
+        CuBoolIndex_t*              cols,
+        CuBoolSize_t*               nvals
+);
+
 /**
  * Reads matrix data to the host visible CPU buffer as an array of values pair.
  * The indices of the i-th pair can be evaluated as (r=rows[i],c=cols[i]).
@@ -418,7 +439,7 @@ CUBOOL_API CuBoolStatus CuBool_Matrix_Build(
  *
  * @return Error code on this operation
  */
-CUBOOL_API CuBoolStatus CuBool_Matrix_ExtractPairs(
+CUBOOL_API CuBoolStatus CuBool_Matrix_ExtractPairsExt(
     CuBoolInstance              instance,
     CuBoolMatrix                matrix,
     CuBoolIndex_t**             rows,

python/pycubool/CuBoolWrapper/__init__.py

@@ -0,0 +1,7 @@
+from .wrapper import *
+
+from .matrix import *
+from .add import *
+
+# Setup global module state
+init_wrapper()