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

Let XGBoostError inherit ValueError. #5696

Merged
merged 1 commit into from
May 26, 2020
Merged

Let XGBoostError inherit ValueError. #5696

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python-package/xgboost/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
c_bst_ulong = ctypes.c_uint64


class XGBoostError(Exception):
class XGBoostError(ValueError):
"""Error thrown by xgboost trainer."""


Expand Down
34 changes: 14 additions & 20 deletions python-package/xgboost/sklearn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,13 @@ def fit(self, X, y, sample_weight=None, base_margin=None,
else:
params.update({'eval_metric': eval_metric})

try:
self._Booster = train(params, train_dmatrix,
self.get_num_boosting_rounds(), evals=evals,
early_stopping_rounds=early_stopping_rounds,
evals_result=evals_result,
obj=obj, feval=feval,
verbose_eval=verbose, xgb_model=xgb_model,
callbacks=callbacks)
except XGBoostError as e:
raise ValueError(e)
self._Booster = train(params, train_dmatrix,
self.get_num_boosting_rounds(), evals=evals,
early_stopping_rounds=early_stopping_rounds,
evals_result=evals_result,
obj=obj, feval=feval,
verbose_eval=verbose, xgb_model=xgb_model,
callbacks=callbacks)

if evals_result:
for val in evals_result.items():
Expand Down Expand Up @@ -1230,16 +1227,13 @@ def _dmat_init(group, **params):
'Custom evaluation metric is not yet supported for XGBRanker.')
params.update({'eval_metric': eval_metric})

try:
self._Booster = train(params, train_dmatrix,
self.n_estimators,
early_stopping_rounds=early_stopping_rounds,
evals=evals,
evals_result=evals_result, feval=feval,
verbose_eval=verbose, xgb_model=xgb_model,
callbacks=callbacks)
except XGBoostError as e:
raise ValueError(e)
self._Booster = train(params, train_dmatrix,
self.n_estimators,
early_stopping_rounds=early_stopping_rounds,
evals=evals,
evals_result=evals_result, feval=feval,
verbose_eval=verbose, xgb_model=xgb_model,
callbacks=callbacks)

self.objective = params["objective"]

Expand Down