-
Notifications
You must be signed in to change notification settings - Fork 538
Replaced coo_matrix with coo_array better compatability and added tes… #782
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.
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
Open
nathanneike
wants to merge
3
commits into
PythonOT:master
Choose a base branch
from
nathanneike:upgrade-coo-array
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -94,7 +94,7 @@ | |||||
| import scipy | ||||||
| import scipy.linalg | ||||||
| import scipy.special as special | ||||||
| from scipy.sparse import coo_matrix, csr_matrix, issparse | ||||||
| from scipy.sparse import coo_array, coo_matrix, csr_matrix, issparse | ||||||
|
|
||||||
| DISABLE_TORCH_KEY = "POT_BACKEND_DISABLE_PYTORCH" | ||||||
| DISABLE_JAX_KEY = "POT_BACKEND_DISABLE_JAX" | ||||||
|
|
@@ -802,9 +802,9 @@ def coo_matrix(self, data, rows, cols, shape=None, type_as=None): | |||||
| r""" | ||||||
| Creates a sparse tensor in COOrdinate format. | ||||||
|
|
||||||
| This function follows the api from :any:`scipy.sparse.coo_matrix` | ||||||
| This function follows the api from :any:`scipy.sparse.coo_array` | ||||||
|
|
||||||
| See: https://docs.scipy.org/doc/scipy/reference/generated/scipy.sparse.coo_matrix.html | ||||||
| See: https://docs.scipy.org/doc/scipy/reference/generated/scipy.sparse.coo_array.html | ||||||
| """ | ||||||
| raise NotImplementedError() | ||||||
|
|
||||||
|
|
@@ -1354,9 +1354,9 @@ def randperm(self, size, type_as=None): | |||||
|
|
||||||
| def coo_matrix(self, data, rows, cols, shape=None, type_as=None): | ||||||
| if type_as is None: | ||||||
| return coo_matrix((data, (rows, cols)), shape=shape) | ||||||
| return coo_array((data, (rows, cols)), shape=shape) | ||||||
| else: | ||||||
| return coo_matrix((data, (rows, cols)), shape=shape, dtype=type_as.dtype) | ||||||
| return coo_array((data, (rows, cols)), shape=shape, dtype=type_as.dtype) | ||||||
|
|
||||||
| def issparse(self, a): | ||||||
| return issparse(a) | ||||||
|
|
@@ -1385,8 +1385,9 @@ def todense(self, a): | |||||
|
|
||||||
| def sparse_coo_data(self, a): | ||||||
| # Convert to COO format if needed | ||||||
| if not isinstance(a, coo_matrix): | ||||||
| a_coo = coo_matrix(a) | ||||||
| if not isinstance(a, (coo_array, coo_matrix)): | ||||||
|
||||||
| if not isinstance(a, (coo_array, coo_matrix)): | |
| if not isinstance(a, coo_array): |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
onl arrays should be used