Skip to content

__dask_distributed_pack__(): client argument #4248

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
jrbourbeau merged 5 commits into from
Nov 18, 2020
Merged

__dask_distributed_pack__(): client argument #4248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42d17eb
__dask_distributed_pack__() now takes a client argument
madsbk Nov 17, 2020
32e356f
Temporarily use corresponding dask PR
jrbourbeau Nov 17, 2020
a908bf5
Pass client to layer.__dask_distributed_pack__
jrbourbeau Nov 17, 2020
099aed7
Trigger CI
jrbourbeau Nov 17, 2020
8124af8
Use mainline dask again
jrbourbeau Nov 18, 2020
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
2 changes: 1 addition & 1 deletion distributed/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,7 +2581,7 @@ def _graph_to_futures(
if not isinstance(dsk, HighLevelGraph):
dsk = HighLevelGraph.from_collections(id(dsk), dsk, dependencies=())

dsk = highlevelgraph_pack(dsk, keyset, self, self.futures)
dsk = highlevelgraph_pack(dsk, self, keyset)

if isinstance(retries, Number) and retries > 0:
retries = {k: retries for k in dsk}
Expand Down
16 changes: 6 additions & 10 deletions distributed/protocol/highlevelgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ def _materialized_layer_pack(
layer: Layer,
all_keys,
known_key_dependencies,
client,
client_keys,
allowed_client,
allowed_futures,
):
from ..client import Future

Expand All @@ -47,11 +46,11 @@ def _materialized_layer_pack(
dsk = {k: unpack_remotedata(v, byte_keys=True) for k, v in layer.items()}
unpacked_futures = set.union(*[v[1] for v in dsk.values()]) if dsk else set()
for future in unpacked_futures:
if future.client is not allowed_client:
if future.client is not client:
raise ValueError(
"Inputs contain futures that were created by another client."
)
if tokey(future.key) not in allowed_futures:
if tokey(future.key) not in client.futures:
raise CancelledError(tokey(future.key))
unpacked_futures_deps = {}
for k, v in dsk.items():
Expand All @@ -76,15 +75,13 @@ def _materialized_layer_pack(
return {"dsk": dsk, "dependencies": dependencies}


def highlevelgraph_pack(
hlg: HighLevelGraph, client_keys, allowed_client, allowed_futures
):
def highlevelgraph_pack(hlg: HighLevelGraph, client, client_keys):
layers = []

# Dump each layer (in topological order)
for layer in (hlg.layers[name] for name in hlg._toposort_layers()):
if not layer.is_materialized():
state = layer.__dask_distributed_pack__()
state = layer.__dask_distributed_pack__(client)
if state is not None:
layers.append(
{
Expand All @@ -104,9 +101,8 @@ def highlevelgraph_pack(
layer,
hlg.get_all_external_keys(),
hlg.key_dependencies,
client,
client_keys,
allowed_client,
allowed_futures,
),
}
)
Expand Down