merge latest release branch-0.20

README.md

@@ -151,14 +151,14 @@ Install and update cuGraph using the conda command:
 
 ```bash
 
-# CUDA 10.1
-conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=10.1
-
-# CUDA 10.2
-conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=10.2
-
 # CUDA 11.0
 conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=11.0
+
+# CUDA 11.1
+conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=11.1
+
+# CUDA 11.2
+conda install -c nvidia -c rapidsai -c numba -c conda-forge -c defaults cugraph cudatoolkit=11.2
 ```
 
 Note: This conda installation only applies to Linux and Python versions 3.7/3.8.

SOURCEBUILD.md

@@ -7,13 +7,13 @@ The cuGraph package include both a C/C++ CUDA portion and a python portion.  Bot
 ## Prerequisites
 
 __Compiler__:
-* `gcc`         version 5.4+
-* `nvcc`        version 10.0+
+* `gcc`         version 9.3+
+* `nvcc`        version 11.0+
 * `cmake`       version 3.18+
 
 __CUDA:__
-* CUDA 10.1+
-* NVIDIA driver 396.44+
+* CUDA 11.0+
+* NVIDIA driver 450.80.02+
 * Pascal architecture or better
 
 __Other__
@@ -47,16 +47,14 @@ __Create the conda development environment__
 ```bash
 # create the conda environment (assuming in base `cugraph` directory)
 
+# for CUDA 11.0
+conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.0.yml
 
+# for CUDA 11.1
+conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.1.yml
 
-# for CUDA 10.1
-conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda10.1.yml
-
-# for CUDA 10.2
-conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda10.2.yml
-
-# for CUDA 11
-conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.0.yml
+# for CUDA 11.2
+conda env create --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.2.yml
 
 # activate the environment
 conda activate cugraph_dev
@@ -70,14 +68,14 @@ conda deactivate
 
 ```bash
 
-# for CUDA 10.1
-conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda10.1.yml
+# for CUDA 11.0
+conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.0.yml
 
-# for CUDA 10.2
-conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda10.2.yml
+# for CUDA 11.1
+conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.1.yml
 
-# for CUDA 11
-conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.0.yml
+# for CUDA 11.2
+conda env update --name cugraph_dev --file conda/environments/cugraph_dev_cuda11.2.yml
 
 conda activate cugraph_dev
 ```
@@ -232,8 +230,8 @@ Next the env_vars.sh file needs to be edited
 vi ./etc/conda/activate.d/env_vars.sh
 
 #!/bin/bash
-export PATH=/usr/local/cuda-10.1/bin:$PATH # or cuda-10.2 if using CUDA 10.2
-export LD_LIBRARY_PATH=/usr/local/cuda-10.1/lib64:$LD_LIBRARY_PATH # or cuda-10.2 if using CUDA 10.2
+export PATH=/usr/local/cuda-11.0/bin:$PATH # or cuda-11.1 if using CUDA 11.1 and cuda-11.2 if using CUDA 11.2, respectively
+export LD_LIBRARY_PATH=/usr/local/cuda-11.0/lib64:$LD_LIBRARY_PATH # or cuda-11.1 if using CUDA 11.1 and cuda-11.2 if using CUDA 11.2, respectively
 ```
 
 ```

benchmarks/bench_algos.py

@@ -51,9 +51,9 @@ def createGraph(csvFileName, graphType=None):
         # complexity lower, and assume tests have coverage to verify
         # correctness for those combinations.
         if "/directed/" in csvFileName:
-            graphType = cugraph.structure.graph.DiGraph
+            graphType = cugraph.structure.graph_classes.DiGraph
         else:
-            graphType = cugraph.structure.graph.Graph
+            graphType = cugraph.structure.graph_classes.Graph
 
     return cugraph.from_cudf_edgelist(
         utils.read_csv_file(csvFileName),
@@ -122,7 +122,7 @@ def graphWithAdjListComputed(request):
     csvFileName = request.param[0]
     reinitRMM(request.param[1], request.param[2])
 
-    G = createGraph(csvFileName, cugraph.structure.graph.Graph)
+    G = createGraph(csvFileName, cugraph.structure.graph_classes.Graph)
     G.view_adj_list()
     return G
 
@@ -166,7 +166,7 @@ def bench_create_graph(gpubenchmark, edgelistCreated):
     gpubenchmark(cugraph.from_cudf_edgelist,
                  edgelistCreated,
                  source="0", destination="1",
-                 create_using=cugraph.structure.graph.Graph,
+                 create_using=cugraph.structure.graph_classes.Graph,
                  renumber=False)
 
 
@@ -183,7 +183,7 @@ def bench_create_digraph(gpubenchmark, edgelistCreated):
     gpubenchmark(cugraph.from_cudf_edgelist,
                  edgelistCreated,
                  source="0", destination="1",
-                 create_using=cugraph.structure.graph.DiGraph,
+                 create_using=cugraph.structure.graph_classes.DiGraph,
                  renumber=False)
 
 

build.sh

@@ -170,6 +170,6 @@ if buildAll || hasArg docs; then
     fi
     cd ${LIBCUGRAPH_BUILD_DIR}
     cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG}
-    cd ${REPODIR}/docs
+    cd ${REPODIR}/docs/cugraph
     make html
 fi

ci/cpu/prebuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2018-2020, NVIDIA CORPORATION.
+# Copyright (c) 2018-2021, NVIDIA CORPORATION.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -18,7 +18,7 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
     export BUILD_LIBCUGRAPH=1
 fi
 
-if [[ "$CUDA" == "10.1" ]]; then
+if [[ "$CUDA" == "11.0" ]]; then
     export UPLOAD_CUGRAPH=1
 else
     export UPLOAD_CUGRAPH=0

ci/docs/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020, NVIDIA CORPORATION.
+# Copyright (c) 2021, NVIDIA CORPORATION.
 #################################
 # cuGraph Docs build script for CI #
 #################################
@@ -28,11 +28,6 @@ gpuci_logger "Activate conda env"
 . /opt/conda/etc/profile.d/conda.sh
 conda activate rapids
 
-# TODO: Move installs to docs-build-env meta package
-gpuci_conda_retry install -c anaconda markdown beautifulsoup4 jq
-pip install sphinx-markdown-tables
-
-
 gpuci_logger "Check versions"
 python --version
 $CC --version
@@ -47,10 +42,10 @@ conda list --show-channel-urls
 gpuci_logger "Build Doxygen docs"
 cd $PROJECT_WORKSPACE/cpp/build
 make docs_cugraph
-	
+
 # Build Python docs
 gpuci_logger "Build Sphinx docs"
-cd $PROJECT_WORKSPACE/docs
+cd $PROJECT_WORKSPACE/docs/cugraph
 make html
 
 #Commit to Website
@@ -60,10 +55,10 @@ for PROJECT in ${PROJECTS[@]}; do
     if [ ! -d "api/$PROJECT/$BRANCH_VERSION" ]; then
         mkdir -p api/$PROJECT/$BRANCH_VERSION
     fi
-    rm -rf $DOCS_WORKSPACE/api/$PROJECT/$BRANCH_VERSION/*	
+    rm -rf $DOCS_WORKSPACE/api/$PROJECT/$BRANCH_VERSION/*
 done
 
 
 mv $PROJECT_WORKSPACE/cpp/doxygen/html/* $DOCS_WORKSPACE/api/libcugraph/$BRANCH_VERSION
-mv $PROJECT_WORKSPACE/docs/build/html/* $DOCS_WORKSPACE/api/cugraph/$BRANCH_VERSION
+mv $PROJECT_WORKSPACE/docs/cugraph/build/html/* $DOCS_WORKSPACE/api/cugraph/$BRANCH_VERSION
 

conda/environments/cugraph_dev_cuda11.0.yml

@@ -5,10 +5,10 @@ channels:
 - rapidsai-nightly
 - conda-forge
 dependencies:
+- cudatoolkit=11.0
 - cudf=0.20.*
 - libcudf=0.20.*
 - rmm=0.20.*
-- cuxfilter=0.20.*
 - librmm=0.20.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -19,8 +19,6 @@ dependencies:
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
-- python-louvain
-- cudatoolkit=11.0
 - clang=8.0.1
 - clang-tools=8.0.1
 - cmake>=3.18
@@ -32,18 +30,16 @@ dependencies:
 - libfaiss=1.7.0
 - faiss-proc=*=cuda
 - scikit-learn>=0.23.1
-- colorcet
-- holoviews
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-websupport
 - sphinx-markdown-tables
+- sphinx-copybutton
 - nbsphinx
 - numpydoc
 - ipython
 - recommonmark
 - pip
-- libcypher-parser
 - rapids-pytest-benchmark
 - doxygen
 - pytest-cov

conda/environments/cugraph_dev_cuda10.1.yml → conda/environments/cugraph_dev_cuda11.1.yml

@@ -5,10 +5,10 @@ channels:
 - rapidsai-nightly
 - conda-forge
 dependencies:
+- cudatoolkit=11.1
 - cudf=0.20.*
 - libcudf=0.20.*
 - rmm=0.20.*
-- cuxfilter=0.20.*
 - librmm=0.20.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -19,8 +19,6 @@ dependencies:
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
-- python-louvain
-- cudatoolkit=10.1
 - clang=8.0.1
 - clang-tools=8.0.1
 - cmake>=3.18
@@ -32,18 +30,16 @@ dependencies:
 - libfaiss=1.7.0
 - faiss-proc=*=cuda
 - scikit-learn>=0.23.1
-- colorcet
-- holoviews
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-websupport
 - sphinx-markdown-tables
+- sphinx-copybutton
 - nbsphinx
 - numpydoc
 - ipython
 - recommonmark
 - pip
-- libcypher-parser
 - rapids-pytest-benchmark
 - doxygen
 - pytest-cov

conda/environments/cugraph_dev_cuda10.2.yml → conda/environments/cugraph_dev_cuda11.2.yml

@@ -5,10 +5,10 @@ channels:
 - rapidsai-nightly
 - conda-forge
 dependencies:
+- cudatoolkit=11.2
 - cudf=0.20.*
 - libcudf=0.20.*
 - rmm=0.20.*
-- cuxfilter=0.20.*
 - librmm=0.20.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -19,8 +19,6 @@ dependencies:
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
-- python-louvain
-- cudatoolkit=10.2
 - clang=8.0.1
 - clang-tools=8.0.1
 - cmake>=3.18
@@ -32,18 +30,16 @@ dependencies:
 - libfaiss=1.7.0
 - faiss-proc=*=cuda
 - scikit-learn>=0.23.1
-- colorcet
-- holoviews
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-websupport
 - sphinx-markdown-tables
+- sphinx-copybutton
 - nbsphinx
 - numpydoc
 - ipython
 - recommonmark
 - pip
-- libcypher-parser
 - rapids-pytest-benchmark
 - doxygen
 - pytest-cov

cpp/CMakeLists.txt

@@ -52,12 +52,12 @@ option(BUILD_STATIC_FAISS "Build the FAISS library for nearest neighbors search
 ###################################################################################################
 # - compiler options ------------------------------------------------------------------------------
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_CUDA_STANDARD 14)
+set(CMAKE_CUDA_STANDARD 17)
 set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -225,8 +225,7 @@ message("Fetching Thrust")
 FetchContent_Declare(
     thrust
     GIT_REPOSITORY https://github.com/thrust/thrust.git
-    # August 28, 2020
-    GIT_TAG        52a8bda46c5c2128414d1d47f546b486ff0be2f0
+    GIT_TAG        1.12.0
 )
 
 FetchContent_GetProperties(thrust)
@@ -242,7 +241,7 @@ message("Fetching cuco")
 FetchContent_Declare(
     cuco
     GIT_REPOSITORY https://github.com/NVIDIA/cuCollections.git
-    GIT_TAG        2196040f0562a0280292eebef5295d914f615e63
+    GIT_TAG        7678a5ecaa192b8983b02a0191a140097171713e
 )
 
 FetchContent_GetProperties(cuco)
@@ -276,7 +275,7 @@ message("set LIBCUDACXX_INCLUDE_DIR to: ${LIBCUDACXX_INCLUDE_DIR}")
 FetchContent_Declare(
     cuhornet
     GIT_REPOSITORY    https://github.com/rapidsai/cuhornet.git
-    GIT_TAG           e58d0ecdbc270fc28867d66c965787a62a7a882c
+    GIT_TAG           6d2fc894cc56dd2ca8fc9d1523a18a6ec444b663
     GIT_SHALLOW       true
     SOURCE_SUBDIR     hornet
 )
@@ -302,8 +301,7 @@ else(DEFINED ENV{RAFT_PATH})
   FetchContent_Declare(
     raft
     GIT_REPOSITORY    https://github.com/rapidsai/raft.git
-    GIT_TAG           f0cd81fb49638eaddc9bf18998cc894f292bc293
-
+    GIT_TAG           66f82b4e79a3e268d0da3cc864ec7ce4ad065296
     SOURCE_SUBDIR     raft
   )
 

cpp/include/algorithms.hpp

@@ -1280,5 +1280,6 @@ random_walks(raft::handle_t const &handle,
              typename graph_t::vertex_type const *ptr_d_start,
              index_t num_paths,
              index_t max_depth);
+
 }  // namespace experimental
 }  // namespace cugraph