Skip to content

Commit

Permalink
Refactor.
Browse files Browse the repository at this point in the history
  • Loading branch information
trivialfis committed Sep 21, 2020
1 parent 6e0d751 commit e315d52
Showing 1 changed file with 25 additions and 28 deletions.
53 changes: 25 additions & 28 deletions python-package/xgboost/dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,34 +351,31 @@ def _get_worker_parts(worker_map, meta_names, worker):
assert list_of_parts, 'data in ' + worker.address + ' was moved.'
assert isinstance(list_of_parts, list)

# `_get_worker_parts` is launched inside worker. In dask side
# this should be equal to `worker._get_client`.
client = get_client()
list_of_parts = client.gather(list_of_parts)
data = None
labels = None
weights = None
base_margin = None
label_lower_bound = None
label_upper_bound = None

local_data = list(zip(*list_of_parts))
data = local_data[0]

for i, part in enumerate(local_data[1:]):
if meta_names[i] == 'labels':
labels = part
if meta_names[i] == 'weights':
weights = part
if meta_names[i] == 'base_margin':
base_margin = part
if meta_names[i] == 'label_lower_bound':
label_lower_bound = part
if meta_names[i] == 'label_upper_bound':
label_upper_bound = part

return (data, labels, weights, base_margin, label_lower_bound,
label_upper_bound)
with worker_client() as client:
list_of_parts = client.gather(list_of_parts)
local_data = list(zip(*list_of_parts))

data = local_data[0]
labels = None
weights = None
base_margin = None
label_lower_bound = None
label_upper_bound = None

for i, part in enumerate(local_data[1:]):
if meta_names[i] == 'labels':
labels = part
if meta_names[i] == 'weights':
weights = part
if meta_names[i] == 'base_margin':
base_margin = part
if meta_names[i] == 'label_lower_bound':
label_lower_bound = part
if meta_names[i] == 'label_upper_bound':
label_upper_bound = part

return (data, labels, weights, base_margin, label_lower_bound,
label_upper_bound)


class DaskPartitionIter(DataIter): # pylint: disable=R0902
Expand Down

0 comments on commit e315d52

Please sign in to comment.