-
Notifications
You must be signed in to change notification settings - Fork 188
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
support sparse array conversion #918
Open
Roger-luo
wants to merge
11
commits into
JuliaPy:master
Choose a base branch
from
Roger-luo:roger/scipysparse
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 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
3839e6e
support sparse array conversion
Roger-luo 06a6c33
fix shape
Roger-luo b1a461c
Install SciPy on CI
tkf 8db4a99
Merge branch 'master' into pr/Roger-luo/918
tkf d115bbb
Simplify SciPy installation using Conda
tkf 874f5df
Don't use pyimport_conda in lazy load
tkf 4f8f592
Import at the opt of the file
tkf a87ced5
Use getproperty always
tkf 6629f29
Don't use `import M: f`
tkf fecc4c2
DEBUG: Rollback to Python 3.9
tkf f04535a
Revert "DEBUG: Rollback to Python 3.9"
tkf 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 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 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 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 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 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 |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using SparseArrays | ||
|
||
const scipysparse_ = PyNULL() | ||
|
||
function scipysparse() | ||
if ispynull(scipysparse_) | ||
copy!(scipysparse_, pyimport("scipy.sparse")) | ||
end | ||
return scipysparse_ | ||
end | ||
|
||
function PyObject(S::SparseMatrixCSC) | ||
scipysparse().csc_matrix((S.nzval, S.rowval .- 1, S.colptr .- 1), shape = size(S)) | ||
end | ||
|
||
function convert(::Type{SparseMatrixCSC}, o::PyObject) | ||
I, J, V = scipysparse().find(o) | ||
return sparse(I .+ 1, J .+ 1, V, o.shape...) | ||
end |
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
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.
Just for experimenting if windows failure is due to the missing wheel for 3.10
https://github.com/JuliaPy/PyCall.jl/runs/3987045445?check_suite_focus=true
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.
Yeah, so it works with 3.9 https://github.com/JuliaPy/PyCall.jl/runs/3987137563?check_suite_focus=true
We either need to wait for SciPy dev to upload the wheel or implement some workaround here.