Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Forward-Merger Conflicts #2474

Merged
merged 20 commits into from
Aug 5, 2022
Merged

Fix Forward-Merger Conflicts #2474

merged 20 commits into from
Aug 5, 2022

Conversation

ajschmidt8
Copy link
Member

This PR fixes the forward-merge conflicts in #2470.

jnke2016 and others added 5 commits July 29, 2022 13:18
@jnke2016
Update cugraph python build (rapidsai#2378)
a1ef1de 
This PR updates cugraph python build to use scikit-build instead of setuptools. 
Scikit-build leverages cmake to build the python extension

closes rapidsai#2333

Authors:
  - Joseph Nke (https://github.com/jnke2016)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)
  - Sevag H (https://github.com/sevagh)
  - Rick Ratzel (https://github.com/rlratzel)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#2378
@eriknw
Add get_num_vertices and get_num_edges methods to PropertyGraph. (rap…
6b62002 
…idsai#2434)

Closes rapidsai#2422.  I'll add this to MGPG when we finalize the API and behavior.

Authors:
  - Erik Welch (https://github.com/eriknw)

Approvers:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Brad Rees (https://github.com/BradReesWork)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2434
@rlratzel
Added get_vertex_data() and get_edge_data() to SG/MG PropertyGraph (
2263011 
rapidsai#2444)

closes rapidsai#2421 

Added `get_vertex_data()` and `get_edge_data()` to SG and MG PropertyGraph, and corresponding tests.

Prior to these methods, users had to either call `pG.annotate_dataframe()` to get properties for edges or access the internal debug dataframes directly via `pG._vertex_prop_dataframe` and `pG._edge_prop_dataframe`.

Users can now call `pG.get_vertex_data(vertex_ids, types, columns)` to get vertex properties for the vertices specified by `vertex_ids`, and 'types', with data for each column specified. All args are optional and default to "all" for each category.  `pG.get_edge_data(edge_ids, types, columns)` works the same for edges.  The return value for both is a dataframe.

Authors:
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Vibhu Jawa (https://github.com/VibhuJawa)
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Erik Welch (https://github.com/eriknw)
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2444
@galipremsagar
Fix issues with day & night modes in python docs (rapidsai#2471)
1a29434 
Fixes similar issue found in: rapidsai/cudf#11400

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2471
@rlratzel
Updated imports to be compatible with latest version of cupy (rapidsa…
93e15c0 
…i#2473)

Updated imports to be compatible with latest version of cupy and also changed corresponding scipy imports for consistency.

Authors:
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2473
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 1, 2022
@ajschmidt8 ajschmidt8 requested review from a team as code owners August 1, 2022 15:13
@ajschmidt8 ajschmidt8 changed the base branch from branch-22.08 to branch-22.10 August 1, 2022 15:32
@ajschmidt8 ajschmidt8 requested a review from a team as a code owner August 1, 2022 15:32
@BradReesWork BradReesWork added this to the 22.10 milestone Aug 1, 2022
oorliu and others added 11 commits August 1, 2022 23:17
@oorliu
Datasets API Update: Add Extra Params and Improve Testing (rapidsai#2453
2a57740 
)

Adding two new parameters to the `get_graph()` method within the datasets API.

- `default_direction` allows users to get only undirected graph objects.
- `weights` will specify whether or not the cugraph.Graph object has an `edge_attr` field.

`test_dataset.py` has been updated to:
1. Add coverage for the new parameters
2. Removing fetching datasets from the web when it's unnecessary. 

Docstrings have also been updated for clarity.

Authors:
  - Ralph Liu (https://github.com/oorliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2453
@galipremsagar
Centralize common css & js code in docs (rapidsai#2472)
2e319e3 
This PR will utilize the common `css` & `js` code being merged here: rapidsai/docs#286

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Chuck Hastings (https://github.com/ChuckHastings)

URL: rapidsai#2472
@ChuckHastings
fix non-deterministic bug in uniform neighborhood sampling (rapidsai#…
0f2befb 
…2477)

Found a bug in uniform neighborhood sampling.  Called a function that returns an optional.  In SG mode the optional is always null.  It was being dereferenced and passed to a function where random memory contents were being used.

Fixed the SG code to not use those values.

Closes rapidsai#2446

Authors:
  - Chuck Hastings (https://github.com/ChuckHastings)

Approvers:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Seunghwa Kang (https://github.com/seunghwak)

URL: rapidsai#2477
@vyasr
Fix typos in Python CMakeLists CUDA arch file (rapidsai#2475)
4372f31 
These typos would prevent properly handling required CMake features as determined by `rapids_cuda_init_architectures`. This only affects compilations where `FIND_CUGRAPH_CPP=OFF`.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2475
@galipremsagar
Pin dask & distributed for release (rapidsai#2478)
5c7303c 
This PR pins `dask` & `distributed` to `2022.7.1` for `22.08` release.

xref: rapidsai/cudf#11433

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: rapidsai#2478
@oorliu
Use Datasets API to Update Notebook Examples (rapidsai#2440)
b74e22a 
Addresses issue rapidsai#2364 

All of the SG notebook examples have been updated to use the newly added Datasets API. Previously, Graph objects were created by specifying a path to the `.csv` file, calling `cuDF` to read in the file, and then converting the edge list to a graph. 

Now, a dataset object is imported and can create graphs by calling the `get_graph()` method. Comments and headings have also been updated for continuity.

Authors:
  - Ralph Liu (https://github.com/oorliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2440
@eriknw
Don't store redundant columns in PropertyGraph Dataframes (rapidsai#2449
ac42e0b 
)

The main purpose of this is to reduce memory usage.

Closes rapidsai#2400

I still need to update MG tests.

I'll also remove the in-code assertions, since they won't always be True, because a column name could have previously been used as a property. Nevertheless, seeing these assertions pass should give us warm-fuzzies :)

Authors:
  - Erik Welch (https://github.com/eriknw)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Vibhu Jawa (https://github.com/VibhuJawa)
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2449
@VibhuJawa
Uniform neighbor sample (rapidsai#2450)
d50622f 
This PR switches `cugraphstore` to use  uniform neighbor sampling. 

Opening this in favor of rapidsai#2426

Authors:
  - Vibhu Jawa (https://github.com/VibhuJawa)
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2450
@oorliu
Use Datasets API to Update Docstring Examples (rapidsai#2441)
4dc286e 
closes rapidsai#2361

Docstring examples now use the new method of creating graphs by using the `datasets` API. This change cleans up the code by eliminating the usage of `cuDF`.

Old docstring example:
```
>>> M = cudf.read_csv(datasets_path / 'karate.csv', delimiter=' ',
...                   dtype=['int32', 'int32', 'float32'], header=None)
>>> G = cugraph.Graph()
>>> G.from_cudf_edgelist(M, source='0', destination='1')
```

Updated docstring example:
```
>>> from cugraph.experimental.datasets import karate
>>> G = karate.get_graph()
```

Authors:
  - Ralph Liu (https://github.com/oorliu)
  - Dylan Chima-Sanchez (https://github.com/betochimas)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2441
@acostadon
Updates to Link Notebooks (rapidsai#2456)
5c32161 
Move, test and update Link analysis and link prediction notebooks to the new organization. Also respond to some review comments on some earlier notebook changes. This is part of epic relates to rapidsai#1405 but does not close it.

Authors:
  - Don Acosta (https://github.com/acostadon)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2456
@jnke2016
Update PageRank to leverage pylibcugraph (rapidsai#2467)
cdc563f 
This PR 

1. Extends the capabilities of the `PageRank CAPI` to the `python cuGraph API`
2. Update or Add support for the parameters `personalization` `precomputed_vertex_out_weight` and `nstart` for both the SG and MG implementation

closes rapidsai#2455
closes rapidsai#2430

Authors:
  - Joseph Nke (https://github.com/jnke2016)
  - Chuck Hastings (https://github.com/ChuckHastings)

Approvers:
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Seunghwa Kang (https://github.com/seunghwak)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2467
oorliu and others added 4 commits August 4, 2022 18:39
@oorliu
Update k_core.py to Check for Graph Direction (rapidsai#2507)
e70fc6f 
closes rapidsai#2505 

`cugraph.k_core()` will check if the input graph is directed or undirected. If directed, the method will raise a `ValueError`, specifying that the input must be an undirected instance.

Authors:
  - Ralph Liu (https://github.com/oorliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2507
@galipremsagar
Defer loading of custom.js (rapidsai#2506)
f8e4aaa 
This PR switches the loading of `custom.js` to defer because we will need the entire page to be loading until the methods in this script can even execute correctly.

xref: rapidsai/cudf#11465

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Rick Ratzel (https://github.com/rlratzel)

URL: rapidsai#2506
@ajschmidt8
Merge branch-22.08 into fix-merge-conflicts
f94f526
@ajschmidt8
fix versions for branch-22.10
f24b066
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (branch-22.10@c84c8bf). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff               @@
##             branch-22.10    #2474   +/-   ##
===============================================
  Coverage                ?   61.32%           
===============================================
  Files                   ?      106           
  Lines                   ?     5624           
  Branches                ?        0           
===============================================
  Hits                    ?     3449           
  Misses                  ?     2175           
  Partials                ?        0

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ajschmidt8 ajschmidt8 merged commit 13c761a into rapidsai:branch-22.10 Aug 5, 2022
@ajschmidt8 ajschmidt8 deleted the fix-merge-conflicts branch August 5, 2022 01:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rlratzel rlratzel rlratzel approved these changes

@jjacobelli jjacobelli jjacobelli approved these changes

@ChuckHastings ChuckHastings ChuckHastings approved these changes

Assignees
No one assigned
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Milestone
22.10
Development

Successfully merging this pull request may close these issues.