Skip to content

Add from_dense and to_dense methods #382

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

Merged
eriknw merged 15 commits into from
Feb 17, 2023
Merged

Add from_dense and to_dense methods #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
44a9e6d
Add `from_dense` and `to_dense` methods
eriknw Feb 4, 2023
3483ff5
oops; use `cls`, not `self`
eriknw Feb 4, 2023
c42e9ab
Add documentation (first draft)
eriknw Feb 5, 2023
d8902a1
bump ruff
eriknw Feb 7, 2023
e4fa913
That was fast!
eriknw Feb 7, 2023
0b2ac41
Add warning that `to_dense` can create very large arrays
eriknw Feb 7, 2023
687d443
Add a test
eriknw Feb 7, 2023
9751e99
Merge branch 'main' into from_dense
eriknw Feb 8, 2023
fe9d2c0
Add `from_iso_value`, `missing_value=` to `from_dense`, and deprecate…
eriknw Feb 9, 2023
0a93f93
Update documentation
eriknw Feb 10, 2023
0bd936a
better (haha, what was I thinking before?)
eriknw Feb 10, 2023
93d533a
bump ruff
eriknw Feb 12, 2023
cefc282
Rename `from_iso_value` to `from_scalar`
eriknw Feb 15, 2023
06ee503
Update `flake8-bugbear` and make improvements
eriknw Feb 15, 2023
b4a80a4
Add comment for how to create iso-valued objects with structure and s…
eriknw Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ repos:
# These versions need updated manually
- flake8==6.0.0
- flake8-comprehensions==3.10.1
- flake8-bugbear==23.1.20
- flake8-bugbear==23.2.13
- flake8-simplify==0.19.3
- repo: https://github.com/asottile/yesqa
rev: v1.4.0
Expand All @@ -71,7 +71,7 @@ repos:
additional_dependencies: [tomli]
files: ^(graphblas|docs)/
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.241
rev: v0.0.247
hooks:
- id: ruff
- repo: https://github.com/sphinx-contrib/sphinx-lint
Expand Down
1 change: 1 addition & 0 deletions graphblas/agg/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ def __getattr__(key):
f"`{key}` is specific to SuiteSparse:GraphBLAS. "
f"`gb.agg.{key}` will be removed in version 2023.9.0 or later.",
DeprecationWarning,
stacklevel=2,
)
rv = _deprecated[key]
globals()[key] = rv
Expand Down
1 change: 1 addition & 0 deletions graphblas/binary/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def __getattr__(key):
f"`{key}` is specific to SuiteSparse:GraphBLAS. "
f"`gb.binary.{key}` will be removed in version 2023.9.0 or later.",
DeprecationWarning,
stacklevel=2,
)
rv = _deprecated[key]
globals()[key] = rv
Expand Down
5 changes: 5 additions & 0 deletions graphblas/core/automethods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ def to_dcsr(self):
return self._get_value("to_dcsr")


def to_dense(self):
return self._get_value("to_dense")


def to_dict(self):
return self._get_value("to_dict")

Expand Down Expand Up @@ -389,6 +393,7 @@ def _main():
"reposition",
"ss",
"to_coo",
"to_dense",
"to_values",
}
vector = {
Expand Down
2 changes: 2 additions & 0 deletions graphblas/core/infix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ def dup(self, dtype=None, *, clear=False, mask=None, name=None, **opts):
else:
ss = Vector.__dict__["ss"] # raise if used
to_coo = wrapdoc(Vector.to_coo)(property(automethods.to_coo))
to_dense = wrapdoc(Vector.to_dense)(property(automethods.to_dense))
to_dict = wrapdoc(Vector.to_dict)(property(automethods.to_dict))
to_values = wrapdoc(Vector.to_values)(property(automethods.to_values))
vxm = wrapdoc(Vector.vxm)(property(automethods.vxm))
Expand Down Expand Up @@ -343,6 +344,7 @@ def dup(self, dtype=None, *, clear=False, mask=None, name=None, **opts):
to_csr = wrapdoc(Matrix.to_csr)(property(automethods.to_csr))
to_dcsc = wrapdoc(Matrix.to_dcsc)(property(automethods.to_dcsc))
to_dcsr = wrapdoc(Matrix.to_dcsr)(property(automethods.to_dcsr))
to_dense = wrapdoc(Matrix.to_dense)(property(automethods.to_dense))
to_dicts = wrapdoc(Matrix.to_dicts)(property(automethods.to_dicts))
to_edgelist = wrapdoc(Matrix.to_edgelist)(property(automethods.to_edgelist))
to_values = wrapdoc(Matrix.to_values)(property(automethods.to_values))
Expand Down
Loading