[REVIEW] Updates for RMM being header only (rapidsai#69)

* FIX Updates for RMM being header only

* DOC Added entry to changelog

CHANGELOG.md

@@ -15,6 +15,7 @@
 - PR #64: Remove `cublas_try` from `cusolver_wrappers.h`
 - PR #66: Fixing typo `get_stream` to `getStream` in `handle.pyx`
 - PR #68: Change the type of recvcounts & displs in allgatherv from size_t[] to size_t* and int[] to size_t*, respectively.
+- PR #69: Updates for RMM being header only
 
 # RAFT 0.15.0 (Date TBD)
 

cpp/CMakeLists.txt

@@ -171,19 +171,14 @@ include(cmake/comms.cmake)
 ###################################################################################################
 # - RMM -------------------------------------------------------------------------------------------
 
-find_path(RMM_INCLUDE "rmm"
-          HINTS "$ENV{RMM_ROOT}/include")
+find_path(RMM_INCLUDE_DIRS "rmm"
+    HINTS
+    "$ENV{RMM_ROOT}/include"
+    "$ENV{CONDA_PREFIX}/include/rmm"
+    "$ENV{CONDA_PREFIX}/include")
 
-find_library(RMM_LIBRARY "rmm"
-             HINTS "$ENV{RMM_ROOT}/lib" "$ENV{RMM_ROOT}/build")
+message(STATUS "RMM: RMM_INCLUDE_DIRS set to ${RMM_INCLUDE_DIRS}")
 
-message(STATUS "RMM: RMM_LIBRARY set to ${RMM_LIBRARY}")
-message(STATUS "RMM: RMM_INCLUDE set to ${RMM_INCLUDE}")
-
-add_library(rmm SHARED IMPORTED ${RMM_LIBRARY})
-if(RMM_INCLUDE AND RMM_LIBRARY)
-    set_target_properties(rmm PROPERTIES IMPORTED_LOCATION ${RMM_LIBRARY})
-endif(RMM_INCLUDE AND RMM_LIBRARY)
 
 ##############################################################################
 # - include paths ------------------------------------------------------------
@@ -194,7 +189,7 @@ set(RAFT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE STRING
 set(RAFT_INCLUDE_DIRECTORIES
   ${RAFT_INCLUDE_DIR}
   ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
-  "${RMM_INCLUDE}")
+  ${RMM_INCLUDE_DIRS})
 
 if(DEFINED ENV{CONDA_PREFIX})
   message(STATUS "Using RMM installation from $ENV{CONDA_PREFIX}")
@@ -209,10 +204,10 @@ set(RAFT_LINK_LIBRARIES
   ${CUDA_cusolver_LIBRARY}
   ${CUDA_CUDART_LIBRARY}
   ${CUDA_cusparse_LIBRARY}
-  ${CUDA_curand_LIBRARY}
-  rmm)
+  ${CUDA_curand_LIBRARY})
 
-set(RAFT_LINK_DIRECTORIES "${RMM_LIBRARY}")
+set(RAFT_LINK_DIRECTORIES
+  ${RMM_INCLUDE_DIRS})
 
 if(DEFINED ENV{CONDA_PREFIX})
   list(APPEND RAFT_LINK_DIRECTORIES $ENV{CONDA_PREFIX}/lib)

python/setup.py

@@ -92,7 +92,7 @@
 # - Cython extensions build and parameters -----------------------------------
 
 
-libs = ["nccl", "rmm", "cusolver", "cusparse", "cublas"]
+libs = ["nccl", "cusolver", "cusparse", "cublas"]
 
 include_dirs = [cuda_include_dir,
                 numpy.get_include(),