Merge branch 'branch-24.08' of https://github.com/rapidsai/cugraph in…

…to fea_heterogeneous_renumbering_api
rapidsai · Jun 5, 2024 · 0a770bd · 0a770bd
2 parents 681744b + 818c853
commit 0a770bd
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,103 @@
+# cugraph 24.06.00 (5 Jun 2024)
+
+## 🚨 Breaking Changes
+
+- Call New `replicate_edgelist` Function ([#4441](https://github.com/rapidsai/cugraph/pull/4441)) [@nv-rliu](https://github.com/nv-rliu)
+- Enable FutureWarnings and DeprecationWarnings as errors in cugraph ([#4415](https://github.com/rapidsai/cugraph/pull/4415)) [@mroeschke](https://github.com/mroeschke)
+- Distributed Sampling in cuGraph-PyG ([#4384](https://github.com/rapidsai/cugraph/pull/4384)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- Move edge triangle count to the stable API ([#4382](https://github.com/rapidsai/cugraph/pull/4382)) [@jnke2016](https://github.com/jnke2016)
+- Address dask_cudf.read_csv chunksize deprecation ([#4379](https://github.com/rapidsai/cugraph/pull/4379)) [@mroeschke](https://github.com/mroeschke)
+- Convert device_memory_resource* to device_async_resource_ref ([#4365](https://github.com/rapidsai/cugraph/pull/4365)) [@harrism](https://github.com/harrism)
+- Update cugraph-pyg models for PyG 2.5 ([#4335](https://github.com/rapidsai/cugraph/pull/4335)) [@tingyu66](https://github.com/tingyu66)
+
+## 🐛 Bug Fixes
+
+- Fix bug in kv_store_t&#39;s insertion methods ([#4444](https://github.com/rapidsai/cugraph/pull/4444)) [@naimnv](https://github.com/naimnv)
+- Fix a bug in kv_store_t implementation ([#4434](https://github.com/rapidsai/cugraph/pull/4434)) [@naimnv](https://github.com/naimnv)
+- [FIX] Remove Unintentional Expensive Check from SG Uniform Neighbor Sample ([#4421](https://github.com/rapidsai/cugraph/pull/4421)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- BFS fix for exec_policy ([#4417](https://github.com/rapidsai/cugraph/pull/4417)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Skip/adjust doctests for deprecations ([#4380](https://github.com/rapidsai/cugraph/pull/4380)) [@mroeschke](https://github.com/mroeschke)
+- Address dask_cudf.read_csv chunksize deprecation ([#4379](https://github.com/rapidsai/cugraph/pull/4379)) [@mroeschke](https://github.com/mroeschke)
+- Fix bad Leiden result ([#4376](https://github.com/rapidsai/cugraph/pull/4376)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Erdos-Renyi generator had bad logic in thrust calls ([#4362](https://github.com/rapidsai/cugraph/pull/4362)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Change mamba option --force to --yes ([#4357](https://github.com/rapidsai/cugraph/pull/4357)) [@naimnv](https://github.com/naimnv)
+- Fix false C++ HITS test failure on H100 ([#4352](https://github.com/rapidsai/cugraph/pull/4352)) [@seunghwak](https://github.com/seunghwak)
+- Bug fix in cugraph::detail::extract_transform_v_froniter_e ([#4320](https://github.com/rapidsai/cugraph/pull/4320)) [@seunghwak](https://github.com/seunghwak)
+- Refactor CMakeLists.txt to better express usage requirements ([#4309](https://github.com/rapidsai/cugraph/pull/4309)) [@robertmaynard](https://github.com/robertmaynard)
+- [BUG] Always Persist Dask DataFrames in cuGraph-DGL Graph Storage ([#4296](https://github.com/rapidsai/cugraph/pull/4296)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- Fix Bug in MG `ego_graph` ([#4262](https://github.com/rapidsai/cugraph/pull/4262)) [@nv-rliu](https://github.com/nv-rliu)
+- [FIX] Remove Unnecessary CUDA Check Causing Deprecation Warning ([#4239](https://github.com/rapidsai/cugraph/pull/4239)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+
+## 📖 Documentation
+
+- Fixed links and added c++ docs per issue 4431 ([#4435](https://github.com/rapidsai/cugraph/pull/4435)) [@acostadon](https://github.com/acostadon)
+- first copy of general cugraph tutorial. ([#4396](https://github.com/rapidsai/cugraph/pull/4396)) [@acostadon](https://github.com/acostadon)
+- adding notebook to demo nx_cugraph ([#4366](https://github.com/rapidsai/cugraph/pull/4366)) [@acostadon](https://github.com/acostadon)
+- Update operators.rst ([#4339](https://github.com/rapidsai/cugraph/pull/4339)) [@raybellwaves](https://github.com/raybellwaves)
+- Removed obsolete methods from rst file ([#4331](https://github.com/rapidsai/cugraph/pull/4331)) [@acostadon](https://github.com/acostadon)
+- Update DGL_support.md ([#4327](https://github.com/rapidsai/cugraph/pull/4327)) [@raybellwaves](https://github.com/raybellwaves)
+- test sphinx mapping to networkx ([#4323](https://github.com/rapidsai/cugraph/pull/4323)) [@raybellwaves](https://github.com/raybellwaves)
+- Updates the nx-cugraph README.md with the latest upstream URLs ([#4321](https://github.com/rapidsai/cugraph/pull/4321)) [@rlratzel](https://github.com/rlratzel)
+- Fix Table for Synthetic Data notebook ([#4311](https://github.com/rapidsai/cugraph/pull/4311)) [@nv-rliu](https://github.com/nv-rliu)
+- Fix Docstring for `from_dask_cudf_edgelist` ([#4310](https://github.com/rapidsai/cugraph/pull/4310)) [@nv-rliu](https://github.com/nv-rliu)
+- fix PyPI URL in docs ([#4282](https://github.com/rapidsai/cugraph/pull/4282)) [@jameslamb](https://github.com/jameslamb)
+- DOC: doc-update-link-for-cugraphops ([#4279](https://github.com/rapidsai/cugraph/pull/4279)) [@raybellwaves](https://github.com/raybellwaves)
+- Notebook fixes to formulas and outputs ([#4272](https://github.com/rapidsai/cugraph/pull/4272)) [@acostadon](https://github.com/acostadon)
+
+## 🚀 New Features
+
+- [FEA] New WholeGraph Feature Store for PyG ([#4432](https://github.com/rapidsai/cugraph/pull/4432)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- Biased sampling primitive ([#4430](https://github.com/rapidsai/cugraph/pull/4430)) [@seunghwak](https://github.com/seunghwak)
+- Distributed Sampling in cuGraph-PyG ([#4384](https://github.com/rapidsai/cugraph/pull/4384)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- [FEA] Support Seed Retention for Sampling with Renumbering ([#4355](https://github.com/rapidsai/cugraph/pull/4355)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- Always use a static gtest ([#4344](https://github.com/rapidsai/cugraph/pull/4344)) [@robertmaynard](https://github.com/robertmaynard)
+- Update GNN sampling post processing functions to optionally consider seed vertices in renumbering ([#4329](https://github.com/rapidsai/cugraph/pull/4329)) [@seunghwak](https://github.com/seunghwak)
+- MNMG Approximation Algorithm for the Weighted Matching Problem ([#4315](https://github.com/rapidsai/cugraph/pull/4315)) [@naimnv](https://github.com/naimnv)
+- [FEA] cuGraph GNN NCCL-only Setup and Distributed Sampling ([#4278](https://github.com/rapidsai/cugraph/pull/4278)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+
+## 🛠️ Improvements
+
+- Adds benchmark for `nx_cugraph.ego_graph` ([#4451](https://github.com/rapidsai/cugraph/pull/4451)) [@rlratzel](https://github.com/rlratzel)
+- Pin torch version in `cugraph-dgl` wheel test ([#4447](https://github.com/rapidsai/cugraph/pull/4447)) [@tingyu66](https://github.com/tingyu66)
+- Call New `replicate_edgelist` Function ([#4441](https://github.com/rapidsai/cugraph/pull/4441)) [@nv-rliu](https://github.com/nv-rliu)
+- Fix MG Betweenness Centrality Test Bug ([#4429](https://github.com/rapidsai/cugraph/pull/4429)) [@nv-rliu](https://github.com/nv-rliu)
+- Expose graph_view method to count multi edges through C API and PLC ([#4426](https://github.com/rapidsai/cugraph/pull/4426)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Update doxygen comments to specify in,out instead of in/out ([#4425](https://github.com/rapidsai/cugraph/pull/4425)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Enable FutureWarnings and DeprecationWarnings as errors in cugraph ([#4415](https://github.com/rapidsai/cugraph/pull/4415)) [@mroeschke](https://github.com/mroeschke)
+- Add MTMG support for Similarity and test for all-pairs Jaccard ([#4411](https://github.com/rapidsai/cugraph/pull/4411)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Update collect_comm to handle value of tuple type ([#4410](https://github.com/rapidsai/cugraph/pull/4410)) [@naimnv](https://github.com/naimnv)
+- Updates SG `PropertyGraph` and `cugraph-service` to apply `DataFrame.fillna()` based on latest cuDF changes ([#4408](https://github.com/rapidsai/cugraph/pull/4408)) [@rlratzel](https://github.com/rlratzel)
+- Fix building cugraph with CCCL main ([#4404](https://github.com/rapidsai/cugraph/pull/4404)) [@trxcllnt](https://github.com/trxcllnt)
+- Update decompress_to_edgelist to handle edge types ([#4397](https://github.com/rapidsai/cugraph/pull/4397)) [@naimnv](https://github.com/naimnv)
+- nx-cugraph: add `ego_graph` ([#4395](https://github.com/rapidsai/cugraph/pull/4395)) [@eriknw](https://github.com/eriknw)
+- Remove unused benchmark fixture in test_dask_mg_random_walks ([#4391](https://github.com/rapidsai/cugraph/pull/4391)) [@mroeschke](https://github.com/mroeschke)
+- Address do_expensive_check FutureWarnings in Python tests ([#4390](https://github.com/rapidsai/cugraph/pull/4390)) [@mroeschke](https://github.com/mroeschke)
+- Address k_truss_subgraph(use_weights=) deprecation ([#4389](https://github.com/rapidsai/cugraph/pull/4389)) [@mroeschke](https://github.com/mroeschke)
+- Address PendingDeprecationWarning from _from_edgelist ([#4388](https://github.com/rapidsai/cugraph/pull/4388)) [@mroeschke](https://github.com/mroeschke)
+- Adjust deprecated cugraph.subgraph usage in Python tests ([#4386](https://github.com/rapidsai/cugraph/pull/4386)) [@mroeschke](https://github.com/mroeschke)
+- Update `k_truss` to work with many connected components ([#4383](https://github.com/rapidsai/cugraph/pull/4383)) [@eriknw](https://github.com/eriknw)
+- Move edge triangle count to the stable API ([#4382](https://github.com/rapidsai/cugraph/pull/4382)) [@jnke2016](https://github.com/jnke2016)
+- Replace deprecated cupy.sparse with cupyx.scipy.sparse ([#4381](https://github.com/rapidsai/cugraph/pull/4381)) [@mroeschke](https://github.com/mroeschke)
+- Migrate to `{{ stdlib(&quot;c&quot;) }}` ([#4374](https://github.com/rapidsai/cugraph/pull/4374)) [@hcho3](https://github.com/hcho3)
+- Convert device_memory_resource* to device_async_resource_ref ([#4365](https://github.com/rapidsai/cugraph/pull/4365)) [@harrism](https://github.com/harrism)
+- add --rm and --name to devcontainer run args ([#4361](https://github.com/rapidsai/cugraph/pull/4361)) [@trxcllnt](https://github.com/trxcllnt)
+- Update pip devcontainers to UCX v1.15.0 ([#4360](https://github.com/rapidsai/cugraph/pull/4360)) [@trxcllnt](https://github.com/trxcllnt)
+- Add missing `&lt;optional&gt;` include ([#4353](https://github.com/rapidsai/cugraph/pull/4353)) [@trxcllnt](https://github.com/trxcllnt)
+- `nx-cugraph`: support `should_run` that was added in NetworkX 3.3 ([#4348](https://github.com/rapidsai/cugraph/pull/4348)) [@eriknw](https://github.com/eriknw)
+- Update generation and flattening of dendrogram in Leiden ([#4347](https://github.com/rapidsai/cugraph/pull/4347)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Update cugraph-pyg models for PyG 2.5 ([#4335](https://github.com/rapidsai/cugraph/pull/4335)) [@tingyu66](https://github.com/tingyu66)
+- Update pre-commit hooks to include all C and C++ files ([#4332](https://github.com/rapidsai/cugraph/pull/4332)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Enable expression-based Dask Dataframe support ([#4325](https://github.com/rapidsai/cugraph/pull/4325)) [@rjzamora](https://github.com/rjzamora)
+- Use appropriate edge src and dst properties based on is_multi_gpu flag ([#4319](https://github.com/rapidsai/cugraph/pull/4319)) [@naimnv](https://github.com/naimnv)
+- Test GNN Examples and Add CUDA 12 Testing ([#4317](https://github.com/rapidsai/cugraph/pull/4317)) [@alexbarghi-nv](https://github.com/alexbarghi-nv)
+- Adds missing files to `update-version.sh` ([#4314](https://github.com/rapidsai/cugraph/pull/4314)) [@AyodeAwe](https://github.com/AyodeAwe)
+- Fix stream synchronization in MTMG graph construction ([#4275](https://github.com/rapidsai/cugraph/pull/4275)) [@ChuckHastings](https://github.com/ChuckHastings)
+- Get rid of sentinel namespace ([#4274](https://github.com/rapidsai/cugraph/pull/4274)) [@PointKernel](https://github.com/PointKernel)
+- Update more C++ algorithm tests to include edge masked input graphs. ([#4267](https://github.com/rapidsai/cugraph/pull/4267)) [@seunghwak](https://github.com/seunghwak)
+- Update triangle count to internally use edge masking and update Triangle counting &amp; K-hop neighbor tests to include edge masked graph view inputs ([#4261](https://github.com/rapidsai/cugraph/pull/4261)) [@seunghwak](https://github.com/seunghwak)
+- Add Additional Checks to `get_edgelist` and `get_dask_edgelist` ([#4256](https://github.com/rapidsai/cugraph/pull/4256)) [@nv-rliu](https://github.com/nv-rliu)
+- Refactor Several MG Tests ([#4244](https://github.com/rapidsai/cugraph/pull/4244)) [@nv-rliu](https://github.com/nv-rliu)
+
 # cuGraph 24.04.00 (10 Apr 2024)
 
 ## 🚨 Breaking Changes

diff --git a/build.sh b/build.sh
@@ -87,19 +87,13 @@ HELP="$0 [<target> ...] [<flag> ...]
 "
 LIBCUGRAPH_BUILD_DIR=${LIBCUGRAPH_BUILD_DIR:=${REPODIR}/cpp/build}
 LIBCUGRAPH_ETL_BUILD_DIR=${LIBCUGRAPH_ETL_BUILD_DIR:=${REPODIR}/cpp/libcugraph_etl/build}
-PYLIBCUGRAPH_BUILD_DIR=${REPODIR}/python/pylibcugraph/_skbuild
-CUGRAPH_BUILD_DIR=${REPODIR}/python/cugraph/_skbuild
 CUGRAPH_SERVICE_BUILD_DIRS="${REPODIR}/python/cugraph-service/server/build
                             ${REPODIR}/python/cugraph-service/client/build
 "
 CUGRAPH_DGL_BUILD_DIR=${REPODIR}/python/cugraph-dgl/build
 
-# All python build dirs using _skbuild are handled by cleanPythonDir, but
-# adding them here for completeness
 BUILD_DIRS="${LIBCUGRAPH_BUILD_DIR}
             ${LIBCUGRAPH_ETL_BUILD_DIR}
-            ${PYLIBCUGRAPH_BUILD_DIR}
-            ${CUGRAPH_BUILD_DIR}
             ${CUGRAPH_SERVICE_BUILD_DIRS}
             ${CUGRAPH_DGL_BUILD_DIR}
 "
@@ -136,7 +130,7 @@ function cleanPythonDir {
     pushd $1 > /dev/null
     rm -rf dist dask-worker-space cugraph/raft *.egg-info
     find . -type d -name __pycache__ -print | xargs rm -rf
-    find . -type d -name _skbuild -print | xargs rm -rf
+    find . -type d -name build -print | xargs rm -rf
     find . -type d -name dist -print | xargs rm -rf
     find . -type f -name "*.cpp" -delete
     find . -type f -name "*.cpython*.so" -delete

diff --git a/python/cugraph/cugraph/dask/community/induced_subgraph.py b/python/cugraph/cugraph/dask/community/induced_subgraph.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -151,9 +151,9 @@ def induced_subgraph(
     # renumbered, the node ID must also be renumbered.
     if input_graph.renumbered:
         vertices = input_graph.lookup_internal_vertex_id(vertices)
-        vertices_type = input_graph.edgelist.edgelist_df.dtypes[0]
+        vertices_type = input_graph.edgelist.edgelist_df.dtypes.iloc[0]
     else:
-        vertices_type = input_graph.input_df.dtypes[0]
+        vertices_type = input_graph.input_df.dtypes.iloc[0]
 
     if isinstance(vertices, (cudf.Series, cudf.DataFrame)):
         vertices = dask_cudf.from_cudf(vertices, npartitions=input_graph._npartitions)

diff --git a/python/cugraph/cugraph/dask/cores/k_core.py b/python/cugraph/cugraph/dask/cores/k_core.py
@@ -73,7 +73,7 @@ def k_core(input_graph, k=None, core_number=None, degree_type="bidirectional"):
         on input, output, or both directed edges, with valid values being
         "incoming", "outgoing", and "bidirectional" respectively.
 
-    core_number : cudf.DataFrame or das_cudf.DataFrame, optional (default=None)
+    core_number : cudf.DataFrame or dask_cudf.DataFrame, optional (default=None)
         Precomputed core number of the nodes of the graph G containing two
         cudf.Series of size V: the vertex identifiers and the corresponding
         core number values. If set to None, the core numbers of the nodes are
@@ -131,31 +131,25 @@ def k_core(input_graph, k=None, core_number=None, degree_type="bidirectional"):
         core_number = dcg.core_number(input_graph)
 
     if input_graph.renumbered is True:
-
         if len(input_graph.renumber_map.implementation.col_names) > 1:
             cols = core_number.columns[:-1].to_list()
         else:
             cols = "vertex"
-
             core_number = input_graph.add_internal_vertex_id(
                 core_number, "vertex", cols
             )
-
     if not isinstance(core_number, dask_cudf.DataFrame):
         if isinstance(core_number, cudf.DataFrame):
             # convert to dask_cudf in order to distribute the edges
             core_number = dask_cudf.from_cudf(core_number, input_graph._npartitions)
-
         else:
             raise TypeError(
                 f"'core_number' must be either None or of"
                 f"type cudf/dask_cudf, got: {type(core_number)}"
             )
-
     core_number = core_number.rename(columns={"core_number": "values"})
     if k is None:
         k = core_number["values"].max().compute()
-
     core_number = get_distributed_data(core_number)
     wait(core_number)
     core_number = core_number.worker_to_parts

diff --git a/python/cugraph/cugraph/dask/structure/mg_property_graph.py b/python/cugraph/cugraph/dask/structure/mg_property_graph.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, 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
@@ -1123,8 +1123,9 @@ def fillna_edges(self, val=0):
             Series is passed, the index or keys are the columns to fill
             and the values are the fill value for the corresponding column.
         """
-
-        self.__edge_prop_dataframe = self.__edge_prop_dataframe.fillna(val).persist()
+        self.__edge_prop_dataframe["val"] = (
+            self.__edge_prop_dataframe["val"].fillna(val).persist()
+        )
 
     def select_vertices(self, expr, from_previous_selection=None):
         raise NotImplementedError

diff --git a/python/cugraph/cugraph/tests/core/test_core_number_mg.py b/python/cugraph/cugraph/tests/core/test_core_number_mg.py
@@ -70,6 +70,7 @@ def test_sg_core_number(dask_client, dataset, degree_type, benchmark):
 @pytest.mark.parametrize("dataset", DATASETS)
 @pytest.mark.parametrize("degree_type", DEGREE_TYPE)
 def test_core_number(dask_client, dataset, degree_type, benchmark):
+    dataset.get_dask_edgelist(download=True)  # reload with MG edgelist
     dg = dataset.get_dask_graph(create_using=cugraph.Graph(directed=False))
 
     result_core_number = benchmark(dcg.core_number, dg, degree_type)

diff --git a/python/cugraph/cugraph/tests/core/test_k_core_mg.py b/python/cugraph/cugraph/tests/core/test_k_core_mg.py
@@ -48,6 +48,7 @@ def setup_function():
 
 
 def get_sg_results(dataset, core_number, degree_type):
+    dataset.get_edgelist(download=True)
     G = dataset.get_graph(create_using=cugraph.Graph(directed=False))
 
     if core_number:
@@ -105,7 +106,7 @@ def test_dask_mg_k_core(dask_client, dataset, core_number, degree_type, benchmar
     expected_k_core_results, core_number = get_sg_results(
         dataset, core_number, degree_type
     )
-
+    dataset.get_dask_edgelist()  # reload with MG edgelist
     dg = dataset.get_dask_graph(create_using=cugraph.Graph(directed=False))
     k_core_results = benchmark(dcg.k_core, dg, core_number=core_number)
     k_core_results = (
@@ -123,6 +124,7 @@ def test_dask_mg_k_core(dask_client, dataset, core_number, degree_type, benchmar
 @pytest.mark.mg
 def test_dask_mg_k_core_invalid_input(dask_client):
     dataset = DATASETS[0]
+    dataset.get_dask_edgelist(download=True)  # reload with MG edgelist
     dg = dataset.get_dask_graph(create_using=cugraph.Graph(directed=True))
 
     with pytest.raises(ValueError):

diff --git a/python/cugraph/cugraph/tests/data_store/test_property_graph_mg.py b/python/cugraph/cugraph/tests/data_store/test_property_graph_mg.py
@@ -1042,7 +1042,8 @@ def test_add_data_noncontiguous(dask_client, set_index):
     for edge_type in ["cat", "dog", "pig"]:
         cur_df = df[df.edge_type == edge_type]
         if set_index:
-            cur_df = cur_df.set_index("vertex")
+            cur_df["ind_vertex"] = cur_df["vertex"]
+            cur_df = cur_df.set_index("ind_vertex")
         pG.add_vertex_data(cur_df, vertex_col_name="vertex", type_name=edge_type)
     for edge_type in ["cat", "dog", "pig"]:
         cur_df = pG.get_vertex_data(types=edge_type).compute()