[Misc] Provide a "return 1s instead of edge IDs" option in scipy adjacency matrix #730
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yzh119
reviewed
Jul 29, 2019
yzh119
reviewed
Jul 29, 2019
python/dgl/graph_index.py
Outdated
| rst = _CAPI_DGLGraphGetAdj(self, transpose, fmt) | ||
| if fmt == "csr": | ||
| indptr = utils.toindex(rst(0)).tonumpy() | ||
| indices = utils.toindex(rst(1)).tonumpy() | ||
| shuffle = utils.toindex(rst(2)).tonumpy() | ||
| shuffle = utils.toindex(rst(2)).tonumpy() if return_edge_ids else np.ones_like(indices) |
There was a problem hiding this comment.
I recommend to rename this variable as data.
python/dgl/graph_index.py
Outdated
| n = self.number_of_nodes() | ||
| return scipy.sparse.csr_matrix((shuffle, indices, indptr), shape=(n, n)) | ||
| elif fmt == 'coo': | ||
| idx = utils.toindex(rst(0)).tonumpy() | ||
| n = self.number_of_nodes() | ||
| m = self.number_of_edges() | ||
| row, col = np.reshape(idx, (2, m)) | ||
| shuffle = np.arange(0, m) | ||
| shuffle = np.arange(0, m) if return_edge_ids else np.ones_like(row) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added a return_edge_id optional argument in DGLGraph.adjacency_matrix_scipy() method which defaults to True. If False, then 1's are returned.
The reason to do this is that if edge IDs are returned, then one of the nonzero entries will be actually 0, which may be confusing.
In the next major release (0.5) it will default to False to keep consistent with
adjacency_matrixinterface. Since existing code may depend on the current behavior that returns edge IDs, I added aFutureWarning.This PR is separated from #720
Checklist
Please feel free to remove inapplicable items for your PR.
or have been fixed to be compatible with this change