Merge branch 'branch-0.20' of github.com:rapidsai/cugraph into enh_tr…

…aversal_prims

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
@@ -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

ci/release/update-version.sh

@@ -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 | 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]}')
 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() {
@@ -69,4 +52,4 @@ for FILE in conda/environments/*.yml; do
    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

cpp/include/cugraph/experimental/graph_functions.hpp

@@ -338,6 +338,10 @@ coarsen_graph(
  * @param labels Labels to be relabeled. This initially holds old labels. Old labels are updated to
  * new labels in-place ([INOUT] parameter).
  * @param num_labels Number of labels to be relabeled.
+ * @param skip_missing_labels Flag dictating the behavior on missing labels (@p labels contains old
+ * labels missing in @p old_new_label_pairs). If set to true, missing elements are skipped (not
+ * relabeled). If set to false, undefined behavior (if @p do_expensive_check is set to true, this
+ * function will throw an exception).
  * @param do_expensive_check A flag to run expensive checks for input arguments (if set to `true`).
  * @return rmm::device_uvector<vertex_t> New labels corresponding to the @p old_labels.
  */
@@ -347,6 +351,7 @@ void relabel(raft::handle_t const& handle,
              vertex_t num_label_pairs,
              vertex_t* labels /* [INOUT] */,
              vertex_t num_labels,
+             bool skip_missing_labels,
              bool do_expensive_check = false);
 
 /**

cpp/src/community/flatten_dendrogram.cuh

@@ -51,7 +51,8 @@ void partition_at_level(raft::handle_t const &handle,
                                                        dendrogram.get_level_ptr_nocheck(l)),
         dendrogram.get_level_size_nocheck(l),
         d_partition,
-        local_num_verts);
+        local_num_verts,
+        false);
     });
 }
 

cpp/src/experimental/coarsen_graph.cu

@@ -284,7 +284,7 @@ coarsen_graph(
       store_transposed ? graph_view.get_number_of_local_adj_matrix_partition_cols(i)
                        : graph_view.get_number_of_local_adj_matrix_partition_rows(i),
       handle.get_stream());
-    if (col_comm_rank == i) {
+    if (col_comm_rank == static_cast<int>(i)) {
       // FIXME: this copy is unnecessary, beter fix RAFT comm's bcast to take const iterators for
       // input
       thrust::copy(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),

cpp/src/experimental/louvain.cuh

@@ -527,7 +527,8 @@ class Louvain {
                       static_cast<vertex_t const *>(numbering_indices.begin())),
       current_graph_view_.get_number_of_local_vertices(),
       dendrogram_->current_level_begin(),
-      dendrogram_->current_level_size());
+      dendrogram_->current_level_size(),
+      false);
 
     timer_stop(handle_.get_stream());
   }

cpp/src/experimental/relabel.cu

@@ -49,6 +49,7 @@ void relabel(raft::handle_t const& handle,
              vertex_t num_label_pairs,
              vertex_t* labels /* [INOUT] */,
              vertex_t num_labels,
+             bool skip_missing_labels,
              bool do_expensive_check)
 {
   double constexpr load_factor = 0.7;
@@ -156,11 +157,24 @@ void relabel(raft::handle_t const& handle,
         CUDA_TRY(cudaStreamSynchronize(
           handle.get_stream()));  // cuco::static_map currently does not take stream
 
-        relabel_map.find(
-          rx_unique_old_labels.begin(),
-          rx_unique_old_labels.end(),
-          rx_unique_old_labels
-            .begin());  // now rx_unique_old_lables hold new labels for the corresponding old labels
+        if (skip_missing_labels) {
+          thrust::transform(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
+                            rx_unique_old_labels.begin(),
+                            rx_unique_old_labels.end(),
+                            rx_unique_old_labels.begin(),
+                            [view = relabel_map.get_device_view()] __device__(auto old_label) {
+                              auto found = view.find(old_label);
+                              return found != view.end() ? view.find(old_label)->second.load(
+                                                             cuda::std::memory_order_relaxed)
+                                                         : old_label;
+                            });
+        } else {
+          relabel_map.find(
+            rx_unique_old_labels.begin(),
+            rx_unique_old_labels.end(),
+            rx_unique_old_labels.begin());  // now rx_unique_old_lables hold new labels for the
+                                            // corresponding old labels
+        }
 
         std::tie(new_labels_for_unique_old_labels, std::ignore) = shuffle_values(
           handle.get_comms(), rx_unique_old_labels.begin(), rx_value_counts, handle.get_stream());
@@ -201,10 +215,23 @@ void relabel(raft::handle_t const& handle,
       });
 
     relabel_map.insert(pair_first, pair_first + num_label_pairs);
-    relabel_map.find(labels, labels + num_labels, labels);
+    if (skip_missing_labels) {
+      thrust::transform(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
+                        labels,
+                        labels + num_labels,
+                        labels,
+                        [view = relabel_map.get_device_view()] __device__(auto old_label) {
+                          auto found = view.find(old_label);
+                          return found != view.end() ? view.find(old_label)->second.load(
+                                                         cuda::std::memory_order_relaxed)
+                                                     : old_label;
+                        });
+    } else {
+      relabel_map.find(labels, labels + num_labels, labels);
+    }
   }
 
-  if (do_expensive_check) {
+  if (do_expensive_check && !skip_missing_labels) {
     CUGRAPH_EXPECTS(
       thrust::count(rmm::exec_policy(handle.get_stream())->on(handle.get_stream()),
                     labels,
@@ -224,6 +251,7 @@ template void relabel<int32_t, true>(raft::handle_t const& handle,
                                      int32_t num_label_pairs,
                                      int32_t* labels,
                                      int32_t num_labels,
+                                     bool skip_missing_labels,
                                      bool do_expensive_check);
 
 template void relabel<int32_t, false>(
@@ -232,13 +260,15 @@ template void relabel<int32_t, false>(
   int32_t num_label_pairs,
   int32_t* labels,
   int32_t num_labels,
+  bool skip_missing_labels,
   bool do_expensive_check);
 
 template void relabel<int64_t, true>(raft::handle_t const& handle,
                                      std::tuple<int64_t const*, int64_t const*> old_new_label_pairs,
                                      int64_t num_label_pairs,
                                      int64_t* labels,
                                      int64_t num_labels,
+                                     bool skip_missing_labels,
                                      bool do_expensive_check);
 
 template void relabel<int64_t, false>(
@@ -247,6 +277,7 @@ template void relabel<int64_t, false>(
   int64_t num_label_pairs,
   int64_t* labels,
   int64_t num_labels,
+  bool skip_missing_labels,
   bool do_expensive_check);
 
 }  // namespace experimental

python/cugraph/utilities/utils.py

@@ -62,8 +62,8 @@ def get_traversed_path(df, id):
     ----------
     df : cudf.DataFrame
         The dataframe containing the results of a BFS or SSSP call
-    id : Int
-        The vertex ID
+    id : vertex ID
+        most be the same data types as what is in the dataframe
 
     Returns
     ---------
@@ -97,8 +97,9 @@ def get_traversed_path(df, id):
             "DataFrame does not appear to be a BFS or "
             "SSP result - 'predecessor' column missing"
         )
-    if type(id) != int:
-        raise ValueError("The vertex 'id' needs to be an integer")
+    if isinstance(id, type(df['vertex'].iloc[0])):
+        raise ValueError(
+            "The vertex 'id' needs to be the same as df['vertex']")
 
     # There is no guarantee that the dataframe has not been filtered
     # or edited.  Therefore we cannot assume that using the vertex ID
@@ -161,8 +162,9 @@ def get_traversed_path_list(df, id):
             "DataFrame does not appear to be a BFS or "
             "SSP result - 'predecessor' column missing"
         )
-    if type(id) != int:
-        raise ValueError("The vertex 'id' needs to be an integer")
+    if isinstance(id, type(df['vertex'].iloc[0])):
+        raise ValueError(
+            "The vertex 'id' needs to be the same as df['vertex']")
 
     # There is no guarantee that the dataframe has not been filtered
     # or edited.  Therefore we cannot assume that using the vertex ID