Initial PropertyGraph implementation and tests

build.sh

@@ -20,24 +20,25 @@ REPODIR=$(cd $(dirname $0); pwd)
 LIBCUGRAPH_BUILD_DIR=${LIBCUGRAPH_BUILD_DIR:=${REPODIR}/cpp/build}
 LIBCUGRAPH_ETL_BUILD_DIR=${LIBCUGRAPH_ETL_BUILD_DIR:=${REPODIR}/cpp/libcugraph_etl/build}
 
-VALIDARGS="clean uninstall libcugraph libcugraph_etl cugraph pylibcugraph cpp-mgtests docs -v -g -n --allgpuarch --skip_cpp_tests -h --help"
+VALIDARGS="clean uninstall uninstall_cmake_deps libcugraph libcugraph_etl cugraph pylibcugraph cpp-mgtests docs -v -g -n --allgpuarch --skip_cpp_tests -h --help"
 HELP="$0 [<target> ...] [<flag> ...]
  where <target> is:
-   clean            - remove all existing build artifacts and configuration (start over)
-   uninstall        - uninstall libcugraph and cugraph from a prior build/install (see also -n)
-   libcugraph       - build libcugraph.so and SG test binaries
-   libcugraph_etl   - build libcugraph_etl.so and SG test binaries
-   cugraph          - build the cugraph Python package
-   pylibcugraph     - build the pylibcugraph Python package
-   cpp-mgtests      - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency.
-   docs             - build the docs
+   clean                - remove all existing build artifacts and configuration (start over)
+   uninstall            - uninstall libcugraph and cugraph from a prior build/install (see also -n)
+   uninstall_cmake_deps - uninstall headers from external dependencies installed by cmake (raft, rmm, cuco, etc.) (see also -n)
+   libcugraph           - build libcugraph.so and SG test binaries
+   libcugraph_etl       - build libcugraph_etl.so and SG test binaries
+   cugraph              - build the cugraph Python package
+   pylibcugraph         - build the pylibcugraph Python package
+   cpp-mgtests          - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency.
+   docs                 - build the docs
  and <flag> is:
-   -v               - verbose build mode
-   -g               - build for debug
-   -n               - do not install after a successful build
-   --allgpuarch     - build for all supported GPU architectures
-   --skip_cpp_tests - do not build the SG test binaries as part of the libcugraph target
-   -h               - print this text
+   -v                   - verbose build mode
+   -g                   - build for debug
+   -n                   - do not install after a successful build
+   --allgpuarch         - build for all supported GPU architectures
+   --skip_cpp_tests     - do not build the SG test binaries as part of the libcugraph and libcugraph_etl targets
+   -h                   - print this text
 
  default action (no args) is to build and install 'libcugraph' then 'libcugraph_etl' then 'pylibcugraph' then 'cugraph' then 'docs' targets
 
@@ -50,6 +51,7 @@ BUILD_DIRS="${LIBCUGRAPH_BUILD_DIR} ${LIBCUGRAPH_ETL_BUILD_DIR} ${CUGRAPH_BUILD_
 
 # Set defaults for vars modified by flags to this script
 VERBOSE_FLAG=""
+CMAKE_VERBOSE_OPTION=""
 BUILD_TYPE=Release
 INSTALL_TARGET=install
 BUILD_CPP_TESTS=ON
@@ -89,6 +91,7 @@ fi
 # Process flags
 if hasArg -v; then
     VERBOSE_FLAG="-v"
+    CMAKE_VERBOSE_OPTION="--log-level=VERBOSE"
 fi
 if hasArg -g; then
     BUILD_TYPE=Debug
@@ -106,16 +109,17 @@ if hasArg cpp-mgtests; then
     BUILD_CPP_MG_TESTS=ON
 fi
 
-# If clean or uninstall given, run them prior to any other steps
+# If clean or uninstall targets given, run them prior to any other steps
 if hasArg uninstall; then
-    # uninstall libcugraph
     if [[ "$INSTALL_PREFIX" != "" ]]; then
         rm -rf ${INSTALL_PREFIX}/include/cugraph
         rm -f ${INSTALL_PREFIX}/lib/libcugraph.so
         rm -rf ${INSTALL_PREFIX}/include/cugraph_c
         rm -f ${INSTALL_PREFIX}/lib/libcugraph_c.so
         rm -rf ${INSTALL_PREFIX}/include/cugraph_etl
         rm -f ${INSTALL_PREFIX}/lib/libcugraph_etl.so
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/cugraph
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/cugraph_etl
     fi
     # This may be redundant given the above, but can also be used in case
     # there are other installed files outside of the locations above.
@@ -124,9 +128,25 @@ if hasArg uninstall; then
     fi
     # uninstall cugraph and pylibcugraph installed from a prior "setup.py
     # install"
+    # FIXME: if multiple versions of these packages are installed, this only
+    # removes the latest one and leaves the others installed. build.sh uninstall
+    # can be run multiple times to remove all of them, but that is not obvious.
     pip uninstall -y cugraph pylibcugraph
 fi
 
+if hasArg uninstall_cmake_deps; then
+    if [[ "$INSTALL_PREFIX" != "" ]]; then
+        rm -rf ${INSTALL_PREFIX}/include/raft
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/raft
+        rm -rf ${INSTALL_PREFIX}/include/cub
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/cub
+        rm -rf ${INSTALL_PREFIX}/include/cuco
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/cuco
+        rm -rf ${INSTALL_PREFIX}/include/rmm
+        rm -rf ${INSTALL_PREFIX}/lib/cmake/rmm
+    fi
+fi
+
 if hasArg clean; then
     # Ignore errors for clean since missing files, etc. are not failures
     set +e
@@ -141,6 +161,7 @@ if hasArg clean; then
         find . -name "__pycache__" -type d -exec rm -rf {} \; > /dev/null 2>&1
         find . -name "*.cpp" -type f -delete
         find . -name "*.cpython*.so" -type f -delete
+        find . -type d -name _external_repositories -exec rm -rf {} \; > /dev/null 2>&1
         popd > /dev/null
     fi
 
@@ -175,8 +196,8 @@ if buildAll || hasArg libcugraph; then
           -DCMAKE_CUDA_ARCHITECTURES=${CUGRAPH_CMAKE_CUDA_ARCHITECTURES} \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
           -DBUILD_TESTS=${BUILD_CPP_TESTS} \
-          -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS}
-
+          -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS} \
+          ${CMAKE_VERBOSE_OPTION}
     cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target ${INSTALL_TARGET} ${VERBOSE_FLAG}
 fi
 
@@ -196,7 +217,8 @@ if buildAll || hasArg libcugraph_etl; then
           -DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
           -DBUILD_TESTS=${BUILD_CPP_TESTS} \
-          -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS} --log-level=VERBOSE \
+          -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS} \
+          ${CMAKE_VERBOSE_OPTION} \
           ${REPODIR}/cpp/libcugraph_etl
     cmake --build "${LIBCUGRAPH_ETL_BUILD_DIR}" -j${PARALLEL_LEVEL} --target ${INSTALL_TARGET} ${VERBOSE_FLAG}
 fi
@@ -233,7 +255,8 @@ if buildAll || hasArg docs; then
         cd ${LIBCUGRAPH_BUILD_DIR}
         cmake -B "${LIBCUGRAPH_BUILD_DIR}" -S "${REPODIR}/cpp" \
               -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-              -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+              -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+              ${CMAKE_VERBOSE_OPTION}
     fi
     cd ${LIBCUGRAPH_BUILD_DIR}
     cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG}

cpp/cmake/thirdparty/get_raft.cmake

@@ -32,7 +32,11 @@ function(find_and_configure_raft)
                 "RAFT_COMPILE_LIBRARIES OFF"
     )
 
-    message(VERBOSE "CUGRAPH: Using RAFT located in ${raft_SOURCE_DIR}")
+    if(raft_ADDED)
+        message(VERBOSE "CUGRAPH: Using RAFT located in ${raft_SOURCE_DIR}")
+    else()
+        message(VERBOSE "CUGRAPH: Using RAFT located in ${raft_DIR}")
+    endif()
 
 endfunction()
 

python/cugraph/cugraph/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION.
+# Copyright (c) 2019-2022, 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
@@ -109,6 +109,8 @@
 
 from cugraph.sampling import random_walks, rw_path
 
+from cugraph import experimental
+
 # Versioneer
 from ._version import get_versions
 

python/cugraph/cugraph/community/ecg_wrapper.pyx

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION.
+# Copyright (c) 2019-2022, 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
@@ -22,7 +22,6 @@ from cugraph.structure import graph_primtypes_wrapper
 from libc.stdint cimport uintptr_t
 
 import cudf
-import rmm
 import numpy as np
 
 

python/cugraph/cugraph/experimental/__init__.py

@@ -0,0 +1,20 @@
+# Copyright (c) 2022, 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from cugraph.utilities.api_tools import experimental_warning_wrapper
+
+from cugraph.structure.property_graph import EXPERIMENTAL__PropertyGraph
+PropertyGraph = experimental_warning_wrapper(EXPERIMENTAL__PropertyGraph)
+
+from cugraph.structure.property_graph import EXPERIMENTAL__PropertySelection
+PropertySelection = experimental_warning_wrapper(EXPERIMENTAL__PropertySelection)

python/cugraph/cugraph/generators/rmat_wrapper.pyx

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2022, 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
@@ -19,7 +19,6 @@ from libcpp.utility cimport move, pair
 from cython.operator cimport dereference as deref
 import numpy as np
 
-import rmm
 from rmm._lib.device_buffer cimport device_buffer
 import cudf
 

python/cugraph/cugraph/sampling/random_walks_wrapper.pyx

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2022, 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
@@ -19,7 +19,6 @@ from libcpp.memory cimport unique_ptr
 from cython.operator cimport dereference as deref
 
 import cudf
-import rmm
 
 from cugraph.structure.graph_utilities cimport (populate_graph_container,
                                                 graph_container_t,

python/cugraph/cugraph/structure/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION.
+# Copyright (c) 2019-2022, 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

python/cugraph/cugraph/structure/graph_primtypes_wrapper.pyx

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION.
+# Copyright (c) 2019-2022, 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
@@ -29,7 +29,6 @@ from dask.distributed import wait, default_client
 from cugraph.dask.common.input_utils import DistributedDataHandler
 
 import cudf
-import rmm
 import numpy as np