Merge branch 'branch-21.08' of https://github.com/rapidsai/cugraph into fea_dcsr_prim

Author: seunghwak

cpp/cmake/thirdparty/get_faiss.cmake

@@ -40,7 +40,10 @@ function(find_and_configure_faiss)
 
     if(FAISS_ADDED)
       set(FAISS_GPU_HEADERS ${FAISS_SOURCE_DIR} PARENT_SCOPE)
-      add_library(FAISS::FAISS ALIAS faiss)
+    endif()
+
+    if(TARGET faiss AND NOT TARGET FAISS::FAISS)
+        add_library(FAISS::FAISS ALIAS faiss)
     endif()
 
 endfunction()

cpp/include/cugraph/prims/copy_v_transform_reduce_key_aggregated_out_nbr.cuh

@@ -36,6 +36,22 @@
 namespace cugraph {
 namespace experimental {
 
+namespace detail {
+
+// a workaround for cudaErrorInvalidDeviceFunction error when device lambda is used
+template <typename VertexIterator>
+struct minor_to_key_t {
+  using vertex_t = typename std::iterator_traits<VertexIterator>::value_type;
+  VertexIterator adj_matrix_col_key_first{};
+  vertex_t minor_first{};
+  __device__ vertex_t operator()(vertex_t minor)
+  {
+    return *(adj_matrix_col_key_first + (minor - minor_first));
+  }
+};
+
+}  // namespace detail
+
 /**
  * @brief Iterate over every vertex's key-aggregated outgoing edges to update vertex properties.
  *
@@ -255,10 +271,8 @@ void copy_v_transform_reduce_key_aggregated_out_nbr(
     if (matrix_partition.get_major_size() > 0) {
       auto minor_key_first = thrust::make_transform_iterator(
         matrix_partition.get_indices(),
-        [adj_matrix_col_key_first, matrix_partition] __device__(auto minor) {
-          return *(adj_matrix_col_key_first +
-                   matrix_partition.get_minor_offset_from_minor_nocheck(minor));
-        });
+        detail::minor_to_key_t<VertexIterator0>{adj_matrix_col_key_first,
+                                                matrix_partition.get_minor_first()});
       thrust::copy(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
                    minor_key_first,
                    minor_key_first + matrix_partition.get_number_of_edges(),

cpp/tests/community/louvain_test.cpp

@@ -312,6 +312,11 @@ TEST_P(Tests_Louvain, CheckInt32Int32FloatFloat)
   run_current_test<int32_t, int32_t, float, float>(GetParam());
 }
 
+TEST_P(Tests_Louvain, CheckInt64Int64FloatFloat)
+{
+  run_current_test<int64_t, int64_t, float, float>(GetParam());
+}
+
 // FIXME: Expand testing once we evaluate RMM memory use
 INSTANTIATE_TEST_SUITE_P(
   simple_test,

python/setup.py

@@ -13,6 +13,7 @@
 
 import os
 import sys
+import sysconfig
 import shutil
 
 from setuptools import setup, find_packages, Command
@@ -29,13 +30,25 @@
 
 
 INSTALL_REQUIRES = ['numba', 'cython']
+CYTHON_FILES = ['cugraph/**/*.pyx']
+
+UCX_HOME = get_environment_option("UCX_HOME")
+CUDA_HOME = get_environment_option('CUDA_HOME')
+CONDA_PREFIX = get_environment_option('CONDA_PREFIX')
 
 conda_lib_dir = os.path.normpath(sys.prefix) + '/lib'
 conda_include_dir = os.path.normpath(sys.prefix) + '/include'
 
-CYTHON_FILES = ['cugraph/**/*.pyx']
+if CONDA_PREFIX:
+    conda_include_dir = CONDA_PREFIX + '/include'
+    conda_lib_dir = CONDA_PREFIX + '/lib'
+
+if not UCX_HOME:
+    UCX_HOME = CONDA_PREFIX if CONDA_PREFIX else os.sys.prefix
+
+ucx_include_dir = os.path.join(UCX_HOME, "include")
+ucx_lib_dir = os.path.join(UCX_HOME, "lib")
 
-CUDA_HOME = os.environ.get("CUDA_HOME", False)
 if not CUDA_HOME:
     path_to_cuda_gdb = shutil.which("cuda-gdb")
     if path_to_cuda_gdb is None:
@@ -53,11 +66,7 @@
     )
 
 cuda_include_dir = os.path.join(CUDA_HOME, "include")
-
-if (os.environ.get('CONDA_PREFIX', None)):
-    conda_prefix = os.environ.get('CONDA_PREFIX')
-    conda_include_dir = conda_prefix + '/include'
-    conda_lib_dir = conda_prefix + '/lib'
+cuda_lib_dir = os.path.join(CUDA_HOME, "lib64")
 
 # Optional location of C++ build folder that can be configured by the user
 libcugraph_path = get_environment_option('CUGRAPH_BUILD_PATH')
@@ -69,6 +78,9 @@
 # https://github.com/rapidsai/raft/issues/83
 raft_include_dir = use_raft_package(raft_path, libcugraph_path)
 
+if not libcugraph_path:
+    libcugraph_path = conda_lib_dir
+
 
 class CleanCommand(Command):
     """Custom clean command to tidy up the project root."""
@@ -101,16 +113,25 @@ def run(self):
 EXTENSIONS = [
     Extension("*",
               sources=CYTHON_FILES,
-              include_dirs=[conda_include_dir,
-                            '../cpp/include',
-                            "../thirdparty/cub",
-                            raft_include_dir,
-                            os.path.join(
-                                conda_include_dir, "libcudacxx"),
-                            cuda_include_dir],
-              library_dirs=[get_python_lib()],
-              runtime_library_dirs=[conda_lib_dir],
-              libraries=['cugraph', 'nccl'],
+              include_dirs=[
+                  conda_include_dir,
+                  ucx_include_dir,
+                  '../cpp/include',
+                  "../thirdparty/cub",
+                  raft_include_dir,
+                  os.path.join(conda_include_dir, "libcudacxx"),
+                  cuda_include_dir,
+                  os.path.dirname(sysconfig.get_path("include"))
+              ],
+              library_dirs=[
+                  get_python_lib(),
+                  conda_lib_dir,
+                  libcugraph_path,
+                  ucx_lib_dir,
+                  cuda_lib_dir,
+                  os.path.join(os.sys.prefix, "lib")
+              ],
+              libraries=['cudart', 'cusparse', 'cusolver', 'cugraph', 'nccl'],
               language='c++',
               extra_compile_args=['-std=c++17'])
 ]