[Project] Try-fix build-flags

Author: EgorOrachyov

CMakeLists.txt

@@ -17,15 +17,16 @@ set(CUBOOL_VERSION_SUB 0)
 set(CUBOOL_DEBUG OFF)
 set(CUBOOL_RELEASE OFF)
 
-if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+if (${CMAKE_BUILD_TYPE} MATCHES Release)
     message(STATUS "Build cubool in release mode")
     set(CUBOOL_RELEASE ON)
-elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+elseif (${CMAKE_BUILD_TYPE} MATCHES Debug)
     message(STATUS "Build cubool in debug mode")
     set(CUBOOL_DEBUG ON)
 else()
     message(STATUS "Build cubool in release mode (default: was not specified)")
     set(CUBOOL_RELEASE ON)
+    set(CMAKE_BUILD_TYPE Release)
 endif()
 
 # Configure cuda dependencies

cubool/CMakeLists.txt

@@ -1,9 +1,8 @@
+project(cubool-cpp LANGUAGES CXX)
+
 if (CUBOOL_WITH_CUDA)
     # If Cuda backend is compiled, we must tell cmake, that we will use Cuda
-    project(cubool-cpp LANGUAGES CXX CUDA)
-else()
-    # Otherwise only C++
-    project(cubool-cpp LANGUAGES CXX)
+    enable_language(CUDA)
 endif()
 
 # Notify user about selected backend options
@@ -120,9 +119,9 @@ target_compile_definitions(cubool PRIVATE CUBOOL_VERSION_SUB=${CUBOOL_VERSION_SU
 
 target_compile_features(cubool PUBLIC cxx_std_14)
 
-target_compile_options(cubool PRIVATE $<$<COMPILE_LANGUAGE:CXX>: -Wall -Werror>)
-target_compile_options(cubool PRIVATE $<$<AND:$<BOOL:CUBOOL_RELEASE>,$<COMPILE_LANGUAGE:CXX>>: -O2>)
-target_compile_options(cubool PRIVATE $<$<AND:$<BOOL:CUBOOL_DEBUG>,$<COMPILE_LANGUAGE:CXX>>: -O0>)
+target_compile_options(cubool PRIVATE $<$<COMPILE_LANGUAGE:CXX>: -Wall>)
+target_compile_options(cubool PRIVATE $<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:CXX>>: -O2>)
+target_compile_options(cubool PRIVATE $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:CXX>>: -O0>)
 
 set_target_properties(cubool PROPERTIES CXX_STANDARD 17)
 set_target_properties(cubool PROPERTIES CXX_STANDARD_REQUIRED ON)
@@ -135,7 +134,7 @@ if (CUBOOL_WITH_CUDA)
 
     # Settings: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
     target_compile_options(cubool PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:
-            -arch=sm_50
+            -arch=sm_30
              -gencode=arch=compute_50,code=sm_50
              -gencode=arch=compute_52,code=sm_52
              -gencode=arch=compute_60,code=sm_60
@@ -144,8 +143,8 @@ if (CUBOOL_WITH_CUDA)
              -gencode=arch=compute_75,code=sm_75
              -gencode=arch=compute_75,code=compute_75>)
 
-    target_compile_options(cubool PRIVATE $<$<AND:$<BOOL:CUBOOL_RELEASE>,$<COMPILE_LANGUAGE:CUDA>>: -Xptxas -O2>)
-    target_compile_options(cubool PRIVATE $<$<AND:$<BOOL:CUBOOL_DEBUG>,$<COMPILE_LANGUAGE:CUDA>>: -Xptxas -O0>)
+    target_compile_options(cubool PRIVATE $<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:CUDA>>: -Xptxas -O2>)
+    target_compile_options(cubool PRIVATE $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:CUDA>>: -Xptxas -O0>)
 
     target_compile_definitions(cubool PRIVATE CUBOOL_WITH_CUDA)
     target_link_libraries(cubool PRIVATE nsparse_um)

cubool/sources/sequential/sq_matrix.cpp

@@ -253,10 +253,10 @@ namespace cubool {
         auto M = a->getNrows();
         auto N = a->getNcols();
 
-        assert(M== this->getNrows());
-        assert(N== this->getNcols());
-        assert(M== b->getNrows());
-        assert(N== b->getNcols());
+        assert(M == this->getNrows());
+        assert(N == this->getNcols());
+        assert(M == b->getNrows());
+        assert(N == b->getNcols());
 
         CsrData out;
         out.nrows = this->getNrows();

deps/nsparse-um/CMakeLists.txt

@@ -6,6 +6,6 @@ target_include_directories(nsparse_um INTERFACE include/)
 target_link_libraries(nsparse_um INTERFACE cub)
 target_compile_options(nsparse_um INTERFACE $<$<COMPILE_LANGUAGE:CUDA>: --expt-relaxed-constexpr --expt-extended-lambda>)
 
-if (CUBOOL_BUILD_TESTS)
+if (CUBOOL_BUILD_NSPARSE_TESTS)
     add_subdirectory(test)
 endif()

deps/nsparse-um/test/src/nsparse_test.cu

@@ -1,5 +1,4 @@
 #include <gtest/gtest.h>
-#include <cub/cub.cuh>
 #include <nsparse/detail/masked_mult.cuh>
 #include <nsparse/masked_spgemm.h>
 #include <nsparse/spgemm.h>
@@ -280,4 +279,4 @@ TEST_F(NsparseCountNonZeroTest, countNzGeneratedGlobalHashTable) {
   size_t c = 5000;
 
   eval(matrix_generator(a, c, 0.5), matrix_generator(a, b, 0.5), matrix_generator(b, c, 0.5));
-}
+}