-
Notifications
You must be signed in to change notification settings - Fork 155
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
(feat): custom reopen
with read_elem_as_dask
for remote h5ad
#1665
Draft
ilan-gold
wants to merge
2
commits into
main
Choose a base branch
from
ig/reopen_for_read_elem_as_dask
base: main
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.
Draft
Changes from all commits
Commits
Show all changes
2 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 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 |
---|---|---|
|
@@ -16,7 +16,7 @@ | |
from .registry import _LAZY_REGISTRY, IOSpec | ||
|
||
if TYPE_CHECKING: | ||
from collections.abc import Callable, Generator, Mapping, Sequence | ||
from collections.abc import Callable, Iterator, Mapping, Sequence | ||
from typing import Literal, ParamSpec, TypeVar | ||
|
||
from ..._core.sparse_dataset import _CSCDataset, _CSRDataset | ||
|
@@ -36,7 +36,7 @@ | |
@contextmanager | ||
def maybe_open_h5( | ||
path_or_group: Path | ZarrGroup, elem_name: str | ||
) -> Generator[StorageType, None, None]: | ||
) -> Callable[[], Iterator[StorageType]]: | ||
if not isinstance(path_or_group, Path): | ||
yield path_or_group | ||
return | ||
|
@@ -67,13 +67,18 @@ def make_dask_chunk( | |
*, | ||
wrap: Callable[[ArrayStorageType], ArrayStorageType] | ||
| Callable[[H5Group | ZarrGroup], _CSRDataset | _CSCDataset] = lambda g: g, | ||
reopen: None | Callable[[], Iterator[StorageType]] = None, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. so the idea is “reopen is a callable that can be transformed into a context manager using Why not just “reopen is a callable that returns an |
||
): | ||
if block_info is None: | ||
msg = "Block info is required" | ||
raise ValueError(msg) | ||
# We need to open the file in each task since `dask` cannot share h5py objects when using `dask.distributed` | ||
# https://github.com/scverse/anndata/issues/1105 | ||
with maybe_open_h5(path_or_group, elem_name) as f: | ||
with ( | ||
contextmanager(reopen)() | ||
if reopen is not None | ||
else maybe_open_h5(path_or_group, elem_name) | ||
) as f: | ||
mtx = wrap(f) | ||
idx = tuple( | ||
slice(start, stop) for start, stop in block_info[None]["array-location"] | ||
|
@@ -91,6 +96,7 @@ def read_sparse_as_dask( | |
*, | ||
_reader: DaskReader, | ||
chunks: tuple[int, ...] | None = None, # only tuple[int, int] is supported here | ||
reopen: None | Callable[[], Iterator[StorageType]] = None, | ||
) -> DaskArray: | ||
import dask.array as da | ||
|
||
|
@@ -120,7 +126,7 @@ def read_sparse_as_dask( | |
) | ||
memory_format = sparse.csc_matrix if is_csc else sparse.csr_matrix | ||
make_chunk = partial( | ||
make_dask_chunk, path_or_group, elem_name, wrap=ad.sparse_dataset | ||
make_dask_chunk, path_or_group, elem_name, wrap=ad.sparse_dataset, reopen=reopen | ||
) | ||
da_mtx = da.map_blocks( | ||
make_chunk, | ||
|
@@ -133,7 +139,11 @@ def read_sparse_as_dask( | |
|
||
@_LAZY_REGISTRY.register_read(H5Array, IOSpec("array", "0.2.0")) | ||
def read_h5_array( | ||
elem: H5Array, *, _reader: DaskReader, chunks: tuple[int, ...] | None = None | ||
elem: H5Array, | ||
*, | ||
_reader: DaskReader, | ||
chunks: tuple[int, ...] | None = None, | ||
reopen: None | Callable[[], Iterator[StorageType]] = None, | ||
) -> DaskArray: | ||
import dask.array as da | ||
|
||
|
@@ -156,7 +166,11 @@ def read_h5_array( | |
|
||
@_LAZY_REGISTRY.register_read(ZarrArray, IOSpec("array", "0.2.0")) | ||
def read_zarr_array( | ||
elem: ZarrArray, *, _reader: DaskReader, chunks: tuple[int, ...] | None = None | ||
elem: ZarrArray, | ||
*, | ||
_reader: DaskReader, | ||
chunks: tuple[int, ...] | None = None, | ||
reopen: None | Callable[[], Iterator[StorageType]] = None, | ||
) -> DaskArray: | ||
chunks: tuple[int, ...] = chunks if chunks is not None else elem.chunks | ||
import dask.array as da | ||
|
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
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.
The previous type was correct, the new one isn’t.
The way decorators interact with typing is that you normally type the decorated function (e.g. if it contains
yield
, the return type isGenerator
). The decorator than transforms the function from whatever it is to whatever the decorator wants.I.e.
is the same as
(I’m not 100% sure I got the “unpack” syntax right, but you know what I mean)