Merge pull request #2 from JetBrains-Research/master

[Pull] Pulling changes from main repository

Author: Krekep

.gitignore

@@ -6,4 +6,4 @@
 /build
 
 # Python cache
-/python/pycubool/__pycache__/
+/**/__pycache__/

CMakeLists.txt

@@ -1,28 +1,16 @@
 # CuBool library Cmake config file
 # Add this file as sub-directory to your project to use library functionality
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
 project(CUBOOL LANGUAGES CXX CUDA)
 
 # Exposed to the user build options
-option(CUBOOL_DEBUG "Build library in debug mode" ON)
-option(CUBOOL_RELEASE "Build library in release mode" OFF)
 option(CUBOOL_WITH_CUB "Build project with locally stored CUB library" ON)
 option(CUBOOL_WITH_NSPARSE "Build library with nsparse crs matrix multiplication backend" ON)
 option(CUBOOL_WITH_NAIVE "Build library with naive and naive-shared dense matrix multiplication" ON)
 option(CUBOOL_BUILD_TESTS "Build project unit-tests with gtest" ON)
 
-SET(CUBOOL_WITH_CUB ON CACHE BOOL "" FORCE)
-SET(CUBOOL_WITH_NSPARSE ON CACHE BOOL "" FORCE)
-SET(CUBOOL_WITH_NAIVE ON CACHE BOOL "" FORCE)
-SET(CUBOOL_BUILD_TESTS ON CACHE BOOL "" FORCE)
-
-# Library version setup
-set(CUBOOL_VERSION_MAJOR 0)
-set(CUBOOL_VERSION_MINOR 1)
-
-configure_file(
-    ${CMAKE_CURRENT_LIST_DIR}/src/cubool/build.hpp.in
-    ${CMAKE_BINARY_DIR}/src/cubool/build.hpp)
+set(CUBOOL_VERSION_MAJOR 1)
+set(CUBOOL_VERSION_MINOR 0)
 
 # Configure dependencies
 if (CUBOOL_WITH_CUB)
@@ -37,7 +25,6 @@ endif()
 
 if (CUBOOL_WITH_NSPARSE)
     message(STATUS "Add nsparse library as crs matrix multiplication backend")
-    add_subdirectory(thirdparty/nsparse)
     add_subdirectory(thirdparty/nsparse-um)
 endif()
 
@@ -65,12 +52,18 @@ set(CUBOOL_SOURCES
     src/cubool/matrix_base.hpp
     src/cubool/matrix_dense.cu
     src/cubool/matrix_dense.hpp
-    src/cubool/matrix_csr.cu
     src/cubool/matrix_csr.hpp
+    src/cubool/matrix_csr.cu
+    src/cubool/matrix_csr_multiply_sum.cu
+    src/cubool/matrix_csr_multiply_add.cu
+    src/cubool/matrix_csr_ewise_add.cu
+    src/cubool/matrix_csr_kron.cu
+    src/cubool/matrix_csr_transpose.cu
     src/cubool/kernels/matrix_dense_multiply_add.cuh
     src/cubool/kernels/matrix_dense_common.cuh
     src/cubool/kernels/matrix_csr_spkron.cuh
     src/cubool/kernels/matrix_csr_spmerge.cuh
+    src/cubool/kernels/matrix_csr_sptranspose.cuh
     src/cubool/details/error.hpp
     src/cubool/details/device_allocator.cuh
     src/cubool/details/host_allocator.hpp
@@ -81,7 +74,9 @@ add_library(cubool SHARED ${CUBOOL_SOURCES})
 
 target_include_directories(cubool PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
 target_include_directories(cubool PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src)
-target_include_directories(cubool PRIVATE ${CMAKE_BINARY_DIR}/src)
+
+target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_MAJOR=${CUBOOL_VERSION_MAJOR})
+target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_MINOR=${CUBOOL_VERSION_MINOR})
 
 target_link_libraries(cubool PRIVATE nsparse_um)
 target_compile_features(cubool PUBLIC cxx_std_14)
@@ -106,7 +101,9 @@ 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_definitions(cubool_dummy PRIVATE CUBOOL_VERSION_MAJOR=${CUBOOL_VERSION_MAJOR})
+target_compile_definitions(cubool_dummy PRIVATE CUBOOL_VERSION_MINOR=${CUBOOL_VERSION_MINOR})
 
 target_compile_features(cubool_dummy PUBLIC cxx_std_11)
 
@@ -116,4 +113,10 @@ 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)
-endif()
+endif()
+
+# Copy scripts into binary directory
+file(COPY scripts DESTINATION ${CMAKE_BINARY_DIR}/)
+
+# Copy python related stuff
+file(COPY python DESTINATION ${CMAKE_BINARY_DIR}/)

CODE_OF_CONDUCT.md

@@ -0,0 +1,38 @@
+# JetBrains Open Source and Community Code of Conduct
+
+This code of conduct outlines our expectations for all those who participate in our 
+open source projects and communities (community programs), as well as the consequences 
+for unacceptable behaviour. We invite all those who participate to help us create safe 
+and positive experiences for everyone. Communities mirror the societies in which they 
+exist and positive action is essential to counteract the many forms of inequality and 
+abuses of power that exist in society. 
+
+## How to behave
+
+The following behaviours are expected and requested of all community members:
+
+- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+- Exercise consideration, respect and empathy in your speech and actions. Remember, we have all been through different stages of learning when adopting technologies.
+- Refrain from demeaning, discriminatory, or harassing behaviour and speech.
+- Disagreements on things are fine, argumentative behaviour or trolling are not.
+
+## How not to behave
+
+- Do not perform threats of violence or use violent language directed against another person.
+- Do not make jokes of sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory nature, or use language of this nature.
+- Do not post or display sexually explicit or violent material.
+- Do not post or threaten to post other people’s personally identifying information ("doxing").
+- Do not make personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+- Do not engage in sexual attention. This includes, sexualised comments or jokes and sexual advances.
+- Do not advocate for, or encourage, any of the above behaviour.
+
+
+Please take into account that online communities bring together people from many 
+different cultures and backgrounds. It's important to understand that sometimes
+the combination of cultural differences and online interaction can lead to misunderstandings.
+That is why having empathy is very important.
+
+## Also 
+
+You can access original text at 
+[JetBrains Open Source and Community Code of Conduct](https://confluence.jetbrains.com/display/ALL/JetBrains+Open+Source+and+Community+Code+of+Conduct).

LICENSE renamed to LICENSE.md

@@ -1,4 +1,4 @@
-MIT License
+# MIT License
 
 Copyright (c) 2020 JetBrains-Research