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.

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

Array conversion from dia_matrix #321

Merged
merged 5 commits into from Aug 11, 2017
Merged

Conversation

unnonouno
Copy link
Contributor

I implemented array conversion method for dia_matrix.
Merge #320 first.
Related to #36

@takagi takagi self-assigned this Aug 7, 2017
@takagi takagi mentioned this pull request Aug 8, 2017
return int(nnz)

def toarray(self, order=None, out=None):
"""Return a dense ndarray representation of this matrix."""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One-line docstring is enough, though it would be better to describe in the same expression to other formats as

Returns a dense matrix representing the same value.

https://github.com/cupy/cupy/blob/master/cupy/sparse/csr.py#L157.

@takagi
Copy link
Member

takagi commented Aug 9, 2017

Please resolve the conflicts.

@takagi takagi added the cat:feature New features/APIs label Aug 9, 2017
This was referenced Aug 9, 2017
@takagi
Copy link
Member

takagi commented Aug 11, 2017

jenkins, test this please

@takagi takagi added this to the v2.0.0rc1 milestone Aug 11, 2017
@takagi
Copy link
Member

takagi commented Aug 11, 2017

LGTM!

@takagi takagi merged commit 6180af5 into cupy:master Aug 11, 2017
@unnonouno unnonouno deleted the dia-array-conversion branch August 11, 2017 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cat:feature New features/APIs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants