aschaffer/21.08 <- rapidsai/21.08

CHANGELOG.md

@@ -1,6 +1,10 @@
-# cuGraph 0.20.0 (Date TBD)
+# cuGraph 21.08.00 (Date TBD)
 
-Please see https://github.com/rapidsai/cugraph/releases/tag/v0.20.0a for the latest changes to this development branch.
+Please see https://github.com/rapidsai/cugraph/releases/tag/v21.08.00a for the latest changes to this development branch.
+
+# cuGraph 21.06.00 (Date TBD)
+
+Please see https://github.com/rapidsai/cugraph/releases/tag/v21.06.00a for the latest changes to this development branch.
 
 # cuGraph 0.19.0 (21 Apr 2021)
 

build.sh

@@ -19,18 +19,19 @@ ARGS=$*
 REPODIR=$(cd $(dirname $0); pwd)
 LIBCUGRAPH_BUILD_DIR=${LIBCUGRAPH_BUILD_DIR:=${REPODIR}/cpp/build}
 
-VALIDARGS="clean libcugraph cugraph docs -v -g -n --allgpuarch --buildfaiss --show_depr_warn -h --help"
+VALIDARGS="clean uninstall libcugraph cugraph docs -v -g -n --allgpuarch --buildfaiss --show_depr_warn -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 the cugraph C++ code
    cugraph          - build the cugraph Python package
    cpp-mgtests      - build libcugraph mnmg 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               - no install step
+   -n               - do not install after a successful build
    --allgpuarch     - build for all supported GPU architectures
    --buildfaiss     - build faiss statically into cugraph
    --show_depr_warn - show cmake deprecation warnings
@@ -52,7 +53,7 @@ INSTALL_TARGET=install
 BUILD_DISABLE_DEPRECATION_WARNING=ON
 BUILD_CPP_MG_TESTS=OFF
 BUILD_STATIC_FAISS=OFF
-GPU_ARCH=""
+BUILD_ALL_GPU_ARCH=0
 
 # Set defaults for vars that may not have been defined externally
 #  FIXME: if PREFIX is not set, check CONDA_PREFIX, but there is no fallback
@@ -95,7 +96,7 @@ if hasArg -n; then
     INSTALL_TARGET=""
 fi
 if hasArg --allgpuarch; then
-    GPU_ARCH="-DGPU_ARCHS=ALL"
+    BUILD_ALL_GPU_ARCH=1
 fi
 if hasArg --buildfaiss; then
         BUILD_STATIC_FAISS=ON
@@ -107,12 +108,36 @@ if hasArg cpp-mgtests; then
     BUILD_CPP_MG_TESTS=ON
 fi
 
-# If clean given, run it prior to any other steps
+# If clean or uninstall 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
+    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.
+    if [ -e ${LIBCUGRAPH_BUILD_DIR}/install_manifest.txt ]; then
+        xargs rm -f < ${LIBCUGRAPH_BUILD_DIR}/install_manifest.txt > /dev/null 2>&1
+    fi
+    # uninstall cugraph installed from a prior "setup.py install"
+    pip uninstall -y cugraph
+fi
+
 if hasArg clean; then
-    # FIXME: ideally the "setup.py clean" command below would also be run to
-    # remove all the "inplace" python build artifacts, but currently, running
-    # any setup.py command has side effects (eg. cloning repos).
-    #(cd ${REPODIR}/python && python setup.py clean)
+    # remove artifacts generated inplace
+    # FIXME: ideally the "setup.py clean" command would be used for this, but
+    # currently running any setup.py command has side effects (eg. cloning
+    # repos).
+    # (cd ${REPODIR}/python && python setup.py clean)
+    if [[ -d ${REPODIR}/python ]]; then
+        pushd ${REPODIR}/python > /dev/null
+        rm -rf dist dask-worker-space cugraph/raft *.egg-info
+        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
+        popd > /dev/null
+    fi
 
     # If the dirs to clean are mounted dirs in a container, the contents should
     # be removed but the mounted dirs will remain.  The find removes all
@@ -129,15 +154,17 @@ fi
 ################################################################################
 # Configure, build, and install libcugraph
 if buildAll || hasArg libcugraph; then
-    if [[ ${GPU_ARCH} == "" ]]; then
+    if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then
+        CUGRAPH_CMAKE_CUDA_ARCHITECTURES="NATIVE"
         echo "Building for the architecture of the GPU in the system..."
     else
+        CUGRAPH_CMAKE_CUDA_ARCHITECTURES="ALL"
         echo "Building for *ALL* supported GPU architectures..."
     fi
     mkdir -p ${LIBCUGRAPH_BUILD_DIR}
     cd ${LIBCUGRAPH_BUILD_DIR}
     cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-          ${GPU_ARCH} \
+          -DCMAKE_CUDA_ARCHITECTURES=${CUGRAPH_CMAKE_CUDA_ARCHITECTURES} \
           -DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
           -DBUILD_STATIC_FAISS=${BUILD_STATIC_FAISS} \

ci/benchmark/build.sh

@@ -74,7 +74,7 @@ gpuci_conda_retry install -c nvidia -c rapidsai -c rapidsai-nightly -c conda-for
       "cudatoolkit=$CUDA_REL" \
       "dask-cudf=${MINOR_VERSION}" \
       "dask-cuda=${MINOR_VERSION}" \
-      "ucx-py=${MINOR_VERSION}" \
+      "ucx-py=0.20.*" \
       "ucx-proc=*=gpu" \
       "rapids-build-env=${MINOR_VERSION}" \
       rapids-pytest-benchmark

ci/docs/build.sh

@@ -15,7 +15,6 @@ export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
 export HOME=$WORKSPACE
 export PROJECT_WORKSPACE=/rapids/cugraph
 export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache"
-export NIGHTLY_VERSION=$(echo $BRANCH_VERSION | awk -F. '{print $2}')
 export PROJECTS=(cugraph libcugraph)
 
 gpuci_logger "Check environment"

ci/gpu/build.sh

@@ -62,7 +62,7 @@ gpuci_conda_retry install -y \
       "cudatoolkit=$CUDA_REL" \
       "dask-cudf=${MINOR_VERSION}" \
       "dask-cuda=${MINOR_VERSION}" \
-      "ucx-py=${MINOR_VERSION}" \
+      "ucx-py=0.20.*" \
       "ucx-proc=*=gpu" \
       "rapids-build-env=$MINOR_VERSION.*" \
       "rapids-notebook-env=$MINOR_VERSION.*" \

ci/release/update-version.sh

@@ -1,5 +1,5 @@
 #!/bin/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
@@ -13,42 +13,25 @@
 # limitations under the License.
 
 ## Usage
-# bash update-version.sh <type>
-#     where <type> is either `major`, `minor`, `patch`
+# bash update-version.sh <new_version>
 
-set -e
 
-# Grab argument for release type
-RELEASE_TYPE=$1
+# Format is YY.MM.PP - no leading 'v' or trailing 'a'
+NEXT_FULL_TAG=$1
 
-# Get current version and calculate next versions
-CURRENT_TAG=`git tag | grep -xE 'v[0-9\.]+' | sort --version-sort | tail -n 1 | tr -d 'v'`
-CURRENT_MAJOR=`echo $CURRENT_TAG | awk '{split($0, a, "."); print a[1]}'`
-CURRENT_MINOR=`echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}'`
-CURRENT_PATCH=`echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}'`
+# Get current version
+CURRENT_TAG=$(git tag --merged HEAD | grep -xE '^v.*' | sort --version-sort | tail -n 1 | tr -d 'v')
+CURRENT_MAJOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[1]}')
+CURRENT_MINOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}')
+CURRENT_PATCH=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}')
 CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
-NEXT_MAJOR=$((CURRENT_MAJOR + 1))
-NEXT_MINOR=$((CURRENT_MINOR + 1))
-NEXT_PATCH=$((CURRENT_PATCH + 1))
-NEXT_FULL_TAG=""
-NEXT_SHORT_TAG=""
 
-# Determine release type
-if [ "$RELEASE_TYPE" == "major" ]; then
-  NEXT_FULL_TAG="${NEXT_MAJOR}.0.0"
-  NEXT_SHORT_TAG="${NEXT_MAJOR}.0"
-elif [ "$RELEASE_TYPE" == "minor" ]; then
-  NEXT_FULL_TAG="${CURRENT_MAJOR}.${NEXT_MINOR}.0"
-  NEXT_SHORT_TAG="${CURRENT_MAJOR}.${NEXT_MINOR}"
-elif [ "$RELEASE_TYPE" == "patch" ]; then
-  NEXT_FULL_TAG="${CURRENT_MAJOR}.${CURRENT_MINOR}.${NEXT_PATCH}"
-  NEXT_SHORT_TAG="${CURRENT_MAJOR}.${CURRENT_MINOR}"
-else
-  echo "Incorrect release type; use 'major', 'minor', or 'patch' as an argument"
-  exit 1
-fi
+#Get <major>.<minor> for next version
+NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
+NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
+NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 
-echo "Preparing '$RELEASE_TYPE' release [$CURRENT_TAG -> $NEXT_FULL_TAG]"
+echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
 
 # Inplace sed replace; workaround for Linux and Mac
 function sed_runner() {
@@ -67,6 +50,5 @@ for FILE in conda/environments/*.yml; do
    sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/dask-cudf=${CURRENT_SHORT_TAG}/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
-   sed_runner "s/ucx-py=${CURRENT_SHORT_TAG}/ucx-py=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" ${FILE};
-done
+done

conda/environments/cugraph_dev_cuda11.0.yml

@@ -6,22 +6,22 @@ channels:
 - conda-forge
 dependencies:
 - cudatoolkit=11.0
-- cudf=0.20.*
-- libcudf=0.20.*
-- rmm=0.20.*
-- librmm=0.20.*
+- cudf=21.08.*
+- libcudf=21.08.*
+- rmm=21.08.*
+- librmm=21.08.*
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.20*
-- dask-cudf=0.20*
-- nccl>=2.8.4
-- ucx-py=0.20*
+- dask-cuda=21.08.*
+- dask-cudf=21.08.*
+- nccl>=2.9.9
+- ucx-py=0.21.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
 - clang=8.0.1
 - clang-tools=8.0.1
-- cmake>=3.18
+- cmake>=3.20.1
 - python>=3.6,<3.9
 - notebook>=0.5.0
 - boost

conda/environments/cugraph_dev_cuda11.1.yml

@@ -6,22 +6,22 @@ channels:
 - conda-forge
 dependencies:
 - cudatoolkit=11.1
-- cudf=0.20.*
-- libcudf=0.20.*
-- rmm=0.20.*
-- librmm=0.20.*
+- cudf=21.08.*
+- libcudf=21.08.*
+- rmm=21.08.*
+- librmm=21.08.*
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.20*
-- dask-cudf=0.20*
-- nccl>=2.8.4
-- ucx-py=0.20*
+- dask-cuda=21.08.*
+- dask-cudf=21.08.*
+- nccl>=2.9.9
+- ucx-py=0.21.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
 - clang=8.0.1
 - clang-tools=8.0.1
-- cmake>=3.18
+- cmake>=3.20.1
 - python>=3.6,<3.9
 - notebook>=0.5.0
 - boost

conda/environments/cugraph_dev_cuda11.2.yml

@@ -6,22 +6,22 @@ channels:
 - conda-forge
 dependencies:
 - cudatoolkit=11.2
-- cudf=0.20.*
-- libcudf=0.20.*
-- rmm=0.20.*
-- librmm=0.20.*
+- cudf=21.08.*
+- libcudf=21.08.*
+- rmm=21.08.*
+- librmm=21.08.*
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.20*
-- dask-cudf=0.20*
-- nccl>=2.8.4
-- ucx-py=0.20*
+- dask-cuda=21.08.*
+- dask-cudf=21.08.*
+- nccl>=2.9.9
+- ucx-py=0.21.*
 - ucx-proc=*=gpu
 - scipy
 - networkx>=2.5.1
 - clang=8.0.1
 - clang-tools=8.0.1
-- cmake>=3.18
+- cmake>=3.20.1
 - python>=3.6,<3.9
 - notebook>=0.5.0
 - boost

conda/recipes/cugraph/meta.yaml

@@ -27,7 +27,7 @@ requirements:
     - cython>=0.29,<0.30
     - libcugraph={{ version }}
     - cudf={{ minor_version }}
-    - ucx-py {{ minor_version }}
+    - ucx-py 0.21
     - ucx-proc=*=gpu
   run:
     - python x.x
@@ -37,8 +37,7 @@ requirements:
     - dask-cuda {{ minor_version }}
     - dask>=2.12.0
     - distributed>=2.12.0
-    - nccl>=2.8.4
-    - ucx-py {{ minor_version }}
+    - ucx-py 0.21
     - ucx-proc=*=gpu
 
 #test:

conda/recipes/libcugraph/meta.yaml

@@ -31,19 +31,19 @@ build:
 
 requirements:
   build:
-    - cmake>=3.12.4
+    - cmake>=3.20.1
     - cudatoolkit {{ cuda_version }}.*
     - librmm {{ minor_version }}.*
     - boost-cpp>=1.66
-    - nccl>=2.8.4
+    - nccl>=2.9.9
     - ucx-proc=*=gpu
     - gtest
     - gmock
     - faiss-proc=*=cuda
     - conda-forge::libfaiss=1.7.0
   run:
     - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
-    - nccl>=2.8.4
+    - nccl>=2.9.9
     - ucx-proc=*=gpu
     - faiss-proc=*=cuda
     - conda-forge::libfaiss=1.7.0