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.

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

Use the new HLG pack/unpack API in Dask #4489

Merged
merged 8 commits into from
Feb 26, 2021
Merged

Use the new HLG pack/unpack API in Dask #4489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2550bee
Use the new high level graph API in Dask
madsbk Feb 19, 2021
74d73dc
Merge branch 'master' of https://github.com/dask/distributed into hlg…
jrbourbeau Feb 25, 2021
cbf836c
Temporarily point CI at Dask PR #7179
jrbourbeau Feb 25, 2021
ba71439
Typo
jrbourbeau Feb 25, 2021
b6bb295
renamed: anno => annotations
madsbk Feb 25, 2021
523be0a
Bump minimum dask version
jrbourbeau Feb 26, 2021
25a8b1f
Revert temporary CI changes
jrbourbeau Feb 26, 2021
5e02e3b
Typo
jrbourbeau Feb 26, 2021
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
3 changes: 1 addition & 2 deletions distributed/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
from .metrics import time
from .protocol import to_serialize
from .protocol.pickle import dumps, loads
from .protocol.highlevelgraph import highlevelgraph_pack
from .publish import Datasets
from .pubsub import PubSubClientExtension
from .security import Security
Expand Down Expand Up @@ -2540,7 +2539,7 @@ def _graph_to_futures(
if not isinstance(dsk, HighLevelGraph):
dsk = HighLevelGraph.from_collections(id(dsk), dsk, dependencies=())

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

annotations = {}
if user_priority:
Expand Down
170 changes: 0 additions & 170 deletions distributed/protocol/highlevelgraph.py
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions distributed/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from tornado.ioloop import IOLoop, PeriodicCallback

import dask
from dask.highlevelgraph import HighLevelGraph

from . import profile
from .batched import BatchedSend
Expand Down Expand Up @@ -84,7 +85,6 @@
from .pubsub import PubSubSchedulerExtension
from .stealing import WorkStealing
from .variable import VariableExtension
from .protocol.highlevelgraph import highlevelgraph_unpack

try:
from cython import compiled
Expand Down Expand Up @@ -3668,8 +3668,10 @@ def update_graph_hlg(
fifo_timeout=0,
annotations=None,
):

dsk, dependencies, annotations = highlevelgraph_unpack(hlg, annotations)
unpacked_graph = HighLevelGraph.__dask_distributed_unpack__(hlg, annotations)
dsk = unpacked_graph["dsk"]
dependencies = unpacked_graph["deps"]
annotations = unpacked_graph["annotations"]

# Remove any self-dependencies (happens on test_publish_bag() and others)
for k, v in dependencies.items():
Expand Down
5 changes: 4 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
click >= 6.6
cloudpickle >= 1.5.0
contextvars;python_version<'3.7'
dask>=2021.02.0
# TODO: Update our dask version requirement to
# the latest dask release before releasing distributed
# xref https://github.com/dask/distributed/pull/4489
dask @ git+https://github.com/dask/dask.git@master
msgpack >= 0.6.0
psutil >= 5.0
sortedcontainers !=2.0.0, !=2.0.1
Expand Down