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

Jump to bottom

Fix typo in dask interface. #6240

Merged
merged 1 commit into from Oct 15, 2020
Merged

Fix typo in dask interface. #6240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions python-package/xgboost/dask.py
View file
Open in desktop
Expand Up @@ -987,7 +987,7 @@ def inplace_predict(client, model, data,


async def _evaluation_matrices(client, validation_set,
sample_weights, missing):
sample_weight, missing):
'''
Parameters
----------
Expand All @@ -1010,8 +1010,8 @@ async def _evaluation_matrices(client, validation_set,
if validation_set is not None:
assert isinstance(validation_set, list)
for i, e in enumerate(validation_set):
w = (sample_weights[i]
if sample_weights is not None else None)
w = (sample_weight[i]
if sample_weight is not None else None)
dmat = await DaskDMatrix(client=client, data=e[0], label=e[1],
weight=w, missing=missing)
evals.append((dmat, 'validation_{}'.format(i)))
Expand All @@ -1027,7 +1027,7 @@ class DaskScikitLearnBase(XGBModel):

# pylint: disable=arguments-differ
def fit(self, X, y,
sample_weights=None,
sample_weight=None,
base_margin=None,
eval_set=None,
sample_weight_eval_set=None,
Expand Down Expand Up @@ -1086,13 +1086,13 @@ def client(self, clt):
['estimators', 'model'])
class DaskXGBRegressor(DaskScikitLearnBase, XGBRegressorBase):
# pylint: disable=missing-class-docstring
async def _fit_async(self, X, y, sample_weights, base_margin, eval_set,
async def _fit_async(self, X, y, sample_weight, base_margin, eval_set,
sample_weight_eval_set, early_stopping_rounds,
verbose):
dtrain = await DaskDMatrix(client=self.client,
data=X,
label=y,
weight=sample_weights,
weight=sample_weight,
base_margin=base_margin,
missing=self.missing)
params = self.get_xgb_params()
Expand All @@ -1115,7 +1115,7 @@ async def _fit_async(self, X, y, sample_weights, base_margin, eval_set,
def fit(self,
X,
y,
sample_weights=None,
sample_weight=None,
base_margin=None,
eval_set=None,
sample_weight_eval_set=None,
Expand All @@ -1125,7 +1125,7 @@ def fit(self,
return self.client.sync(self._fit_async,
X=X,
y=y,
sample_weights=sample_weights,
sample_weight=sample_weight,
base_margin=base_margin,
eval_set=eval_set,
sample_weight_eval_set=sample_weight_eval_set,
Expand All @@ -1150,17 +1150,18 @@ def predict(self, data, output_margin=False, base_margin=None):
output_margin=output_margin,
base_margin=base_margin)


@xgboost_model_doc(
'Implementation of the scikit-learn API for XGBoost classification.',
['estimators', 'model'])
class DaskXGBClassifier(DaskScikitLearnBase, XGBClassifierBase):
async def _fit_async(self, X, y, sample_weights, base_margin, eval_set,
async def _fit_async(self, X, y, sample_weight, base_margin, eval_set,
sample_weight_eval_set, early_stopping_rounds,
verbose):
dtrain = await DaskDMatrix(client=self.client,
data=X,
label=y,
weight=sample_weights,
weight=sample_weight,
base_margin=base_margin,
missing=self.missing)
params = self.get_xgb_params()
Expand Down Expand Up @@ -1196,7 +1197,7 @@ async def _fit_async(self, X, y, sample_weights, base_margin, eval_set,
def fit(self,
X,
y,
sample_weights=None,
sample_weight=None,
base_margin=None,
eval_set=None,
sample_weight_eval_set=None,
Expand All @@ -1206,7 +1207,7 @@ def fit(self,
return self.client.sync(self._fit_async,
X=X,
y=y,
sample_weights=sample_weights,
sample_weight=sample_weight,
base_margin=base_margin,
eval_set=eval_set,
sample_weight_eval_set=sample_weight_eval_set,
Expand Down
13 changes: 8 additions & 5 deletions tests/python/test_with_dask.py
View file
Open in desktop
Expand Up @@ -40,10 +40,13 @@
kWorkers = 5


def generate_array():
def generate_array(with_weights=False):
partition_size = 20
X = da.random.random((kRows, kCols), partition_size)
y = da.random.random(kRows, partition_size)
if with_weights:
w = da.random.random(kRows, partition_size)
return X, y, w
return X, y


Expand Down Expand Up @@ -252,11 +255,11 @@ def test_dask_missing_value_cls():
def test_dask_regressor():
with LocalCluster(n_workers=kWorkers) as cluster:
with Client(cluster) as client:
X, y = generate_array()
X, y, w = generate_array(with_weights=True)
regressor = xgb.dask.DaskXGBRegressor(verbosity=1, n_estimators=2)
regressor.set_params(tree_method='hist')
regressor.client = client
regressor.fit(X, y, eval_set=[(X, y)])
regressor.fit(X, y, sample_weight=w, eval_set=[(X, y)])
prediction = regressor.predict(X)

assert prediction.ndim == 1
Expand All @@ -274,12 +277,12 @@ def test_dask_regressor():
def test_dask_classifier():
with LocalCluster(n_workers=kWorkers) as cluster:
with Client(cluster) as client:
X, y = generate_array()
X, y, w = generate_array(with_weights=True)
y = (y * 10).astype(np.int32)
classifier = xgb.dask.DaskXGBClassifier(
verbosity=1, n_estimators=2, eval_metric='merror')
classifier.client = client
classifier.fit(X, y, eval_set=[(X, y)])
classifier.fit(X, y, sample_weight=w, eval_set=[(X, y)])
prediction = classifier.predict(X)

assert prediction.ndim == 1
Expand Down