Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gpu_id with custom objective. (#7015)

Browse Source
This commit is contained in:
Jiaming Yuan 2021-06-09 14:51:17 +08:00 committed by GitHub
parent bd2ca543c4
commit 72f9daf9b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gbm/gbtree.cc
View File

@ -228,7 +228,7 @@ void GBTree::DoBoost(DMatrix* p_fmat,
// break a lots of existing code. // break a lots of existing code.
auto device = tparam_.tree_method != TreeMethod::kGPUHist auto device = tparam_.tree_method != TreeMethod::kGPUHist
? GenericParameter::kCpuId ? GenericParameter::kCpuId
: in_gpair->DeviceIdx(); : generic_param_->gpu_id;
auto out = MatrixView<float>( auto out = MatrixView<float>(
&predt->predictions, &predt->predictions,
{static_cast<size_t>(p_fmat->Info().num_row_), static_cast<size_t>(ngroup)}, device); {static_cast<size_t>(p_fmat->Info().num_row_), static_cast<size_t>(ngroup)}, device);

11
tests/python-gpu/test_gpu_basic_models.py
View File

@ -6,11 +6,13 @@ import pytest
sys.path.append("tests/python") sys.path.append("tests/python")
# Don't import the test class, otherwise they will run twice. # Don't import the test class, otherwise they will run twice.
import test_callback as test_cb # noqa import test_callback as test_cb # noqa
import test_basic_models as test_bm
rng = np.random.RandomState(1994) rng = np.random.RandomState(1994)
class TestGPUBasicModels: class TestGPUBasicModels:
cputest = test_cb.TestCallbacks() cpu_test_cb = test_cb.TestCallbacks()
cpu_test_bm = test_bm.TestModels()
def run_cls(self, X, y, deterministic): def run_cls(self, X, y, deterministic):
cls = xgb.XGBClassifier(tree_method='gpu_hist', cls = xgb.XGBClassifier(tree_method='gpu_hist',
@ -35,9 +37,12 @@ class TestGPUBasicModels:
return hash(model_0), hash(model_1) return hash(model_0), hash(model_1)
def test_custom_objective(self):
self.cpu_test_bm.run_custom_objective("gpu_hist")
def test_eta_decay_gpu_hist(self): def test_eta_decay_gpu_hist(self):
self.cputest.run_eta_decay('gpu_hist', True) self.cpu_test_cb.run_eta_decay('gpu_hist', True)
self.cputest.run_eta_decay('gpu_hist', False) self.cpu_test_cb.run_eta_decay('gpu_hist', False)
def test_deterministic_gpu_hist(self): def test_deterministic_gpu_hist(self):
kRows = 1000 kRows = 1000

12
tests/python/test_basic_models.py
View File

@ -138,8 +138,13 @@ class TestModels:
# behaviour is considered sub-optimal, feel free to change. # behaviour is considered sub-optimal, feel free to change.
assert booster.num_boosted_rounds() == 4 assert booster.num_boosted_rounds() == 4
def test_custom_objective(self): def run_custom_objective(self, tree_method=None):
param = {'max_depth': 2, 'eta': 1, 'objective': 'reg:logistic'} param = {
'max_depth': 2,
'eta': 1,
'objective': 'reg:logistic',
"tree_method": tree_method
}
watchlist = [(dtest, 'eval'), (dtrain, 'train')] watchlist = [(dtest, 'eval'), (dtrain, 'train')]
num_round = 10 num_round = 10
@ -181,6 +186,9 @@ class TestModels:
if int(preds2[i] > 0.5) != labels[i]) / float(len(preds2)) if int(preds2[i] > 0.5) != labels[i]) / float(len(preds2))
assert err == err2 assert err == err2
def test_custom_objective(self):
self.run_custom_objective()
def test_multi_eval_metric(self): def test_multi_eval_metric(self):
watchlist = [(dtest, 'eval'), (dtrain, 'train')] watchlist = [(dtest, 'eval'), (dtrain, 'train')]
param = {'max_depth': 2, 'eta': 0.2, 'verbosity': 1, param = {'max_depth': 2, 'eta': 0.2, 'verbosity': 1,