Updated cuxfilter to 0.18, removed datashader indirect dependency in …

…conda dev .yml files(#1311) Updated cuxfilter to 0.18 and removed datashader indirect dependency in cugraph conda dev environment files. Authors: - Rick Ratzel <[email protected]> Approvers: - Hugo Linsenmaier - Hugo Linsenmaier - Seunghwa Kang - AJ Schmidt - Alex Fender - Alex Fender URL: #1311
rapidsai · Dec 17, 2020 · 70d9abd · 70d9abd
1 parent 2fb0725
commit 70d9abd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -68,4 +68,5 @@ for FILE in conda/environments/*.yml; do
    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
diff --git a/conda/environments/cugraph_dev_cuda10.1.yml b/conda/environments/cugraph_dev_cuda10.1.yml
@@ -8,7 +8,7 @@ dependencies:
 - cudf=0.18.*
 - libcudf=0.18.*
 - rmm=0.18.*
-- cuxfilter=0.17.*
+- cuxfilter=0.18.*
 - librmm=0.18.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -32,7 +32,6 @@ dependencies:
 - scikit-learn>=0.23.1
 - colorcet
 - holoviews
-- datashader
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-websupport

diff --git a/conda/environments/cugraph_dev_cuda10.2.yml b/conda/environments/cugraph_dev_cuda10.2.yml
@@ -8,7 +8,7 @@ dependencies:
 - cudf=0.18.*
 - libcudf=0.18.*
 - rmm=0.18.*
-- cuxfilter=0.17.*
+- cuxfilter=0.18.*
 - librmm=0.18.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -32,7 +32,6 @@ dependencies:
 - scikit-learn>=0.23.1
 - colorcet
 - holoviews
-- datashader
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-websupport

diff --git a/conda/environments/cugraph_dev_cuda11.0.yml b/conda/environments/cugraph_dev_cuda11.0.yml
@@ -8,7 +8,7 @@ dependencies:
 - cudf=0.18.*
 - libcudf=0.18.*
 - rmm=0.18.*
-- cuxfilter=0.17.*
+- cuxfilter=0.18.*
 - librmm=0.18.*
 - dask>=2.12.0
 - distributed>=2.12.0
@@ -31,7 +31,6 @@ dependencies:
 - pytest
 - scikit-learn>=0.23.1
 - colorcet
-- datashader
 - holoviews
 - sphinx
 - sphinx_rtd_theme

diff --git a/python/cugraph/centrality/betweenness_centrality.py b/python/cugraph/centrality/betweenness_centrality.py
@@ -233,7 +233,6 @@ def edge_betweenness_centrality(
     >>> G.from_cudf_edgelist(gdf, source='0', destination='1')
     >>> ebc = cugraph.edge_betweenness_centrality(G)
     """
-
     if weight is not None:
         raise NotImplementedError(
             "weighted implementation of betweenness "
@@ -254,8 +253,16 @@ def edge_betweenness_centrality(
         df = G.unrenumber(df, "dst")
 
     if type(G) is cugraph.Graph:
+        # select the lower triangle of the df based on src/dst vertex value
         lower_triangle = df['src'] >= df['dst']
-        df[["src", "dst"]][lower_triangle] = df[["dst", "src"]][lower_triangle]
+        # swap the src and dst vertices for the lower triangle only. Because
+        # this is a symmeterized graph, this operation results in a df with
+        # multiple src/dst entries.
+        df['src'][lower_triangle], df['dst'][lower_triangle] = \
+            df['dst'][lower_triangle], df['src'][lower_triangle]
+        # overwrite the df with the sum of the values for all alike src/dst
+        # vertex pairs, resulting in half the edges of the original df from the
+        # symmeterized graph.
         df = df.groupby(by=["src", "dst"]).sum().reset_index()
 
     if isNx is True:

diff --git a/python/cugraph/structure/graph_primtypes.pyx b/python/cugraph/structure/graph_primtypes.pyx
@@ -93,6 +93,9 @@ cdef GraphCOOViewType get_coo_graph_view(input_graph, bool weighted=True, GraphC
     if not input_graph.edgelist:
         input_graph.view_edge_list()
 
+    num_edges = input_graph.number_of_edges(directed_edges=True)
+    num_verts = input_graph.number_of_vertices()
+
     cdef uintptr_t c_src = input_graph.edgelist.edgelist_df['src'].__cuda_array_interface__['data'][0]
     cdef uintptr_t c_dst = input_graph.edgelist.edgelist_df['dst'].__cuda_array_interface__['data'][0]
     cdef uintptr_t c_weights = <uintptr_t>NULL
@@ -101,8 +104,6 @@ cdef GraphCOOViewType get_coo_graph_view(input_graph, bool weighted=True, GraphC
     if input_graph.edgelist.weights and weighted:
         c_weights = input_graph.edgelist.edgelist_df['weights'].__cuda_array_interface__['data'][0]
 
-    num_verts = input_graph.number_of_vertices()
-    num_edges = input_graph.number_of_edges(directed_edges=True)
     cdef GraphCOOViewType in_graph
     if GraphCOOViewType is GraphCOOViewFloat:
         in_graph = GraphCOOViewFloat(<int*>c_src, <int*>c_dst, <float*>c_weights, num_verts, num_edges)