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

[python][R-package] removed duplicated code from language wrappers #2606

Merged
merged 6 commits into from
Feb 3, 2020
Merged

[python][R-package] removed duplicated code from language wrappers #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f1a8ac
removed duplicated code from language wrappers
StrikerRUS Dec 2, 2019
6b3ee89
Merge branch 'master' into clean_code
StrikerRUS Dec 19, 2019
ff38f62
removed check for resetting metric
StrikerRUS Dec 23, 2019
8104f73
Merge remote-tracking branch 'origin/master' into clean_code
StrikerRUS Dec 23, 2019
8e2d9ad
Merge branch 'master' into clean_code
StrikerRUS Jan 17, 2020
ab3e0f6
fixed conflict
StrikerRUS Jan 26, 2020
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
9 changes: 0 additions & 9 deletions R-package/R/aliases.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@
, "early_stopping"
, "n_iter_no_change"
)
, "metric" = c(
"metric"
, "metrics"
, "metric_types"
)
, "num_class" = c(
"num_class"
, "num_classes"
)
, "num_iterations" = c(
"num_iterations"
, "num_iteration"
Expand Down
15 changes: 0 additions & 15 deletions R-package/R/callback.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,6 @@ cb.reset.parameters <- function(new_params) {
stop("Env should have a ", sQuote("model"))
}

# Some parameters are not allowed to be changed,
# since changing them would simply wreck some chaos
not_allowed <- c(
.PARAMETER_ALIASES()[["num_class"]]
, .PARAMETER_ALIASES()[["metric"]]
, .PARAMETER_ALIASES()[["boosting"]]
)
if (any(pnames %in% not_allowed)) {
stop(
"Parameters "
, paste0(pnames[pnames %in% not_allowed], collapse = ", ")
, " cannot be changed during boosting"
)
}

# Store boosting rounds
nrounds <<- env$end_iteration - env$begin_iteration + 1L

Expand Down
2 changes: 0 additions & 2 deletions R-package/tests/testthat/test_parameters.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ test_that(".PARAMETER_ALIASES() returns a named list", {
expect_true(is.character(names(param_aliases)))
expect_true(is.character(param_aliases[["boosting"]]))
expect_true(is.character(param_aliases[["early_stopping_round"]]))
expect_true(is.character(param_aliases[["metric"]]))
expect_true(is.character(param_aliases[["num_class"]]))
expect_true(is.character(param_aliases[["num_iterations"]]))
})

Expand Down
2 changes: 0 additions & 2 deletions python-package/lightgbm/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,8 +2037,6 @@ def reset_parameter(self, params):
self : Booster
Booster with new parameters.
"""
if any(metric_alias in params for metric_alias in _ConfigAliases.get("metric")):
self.__need_reload_eval_info = True
params_str = param_dict_to_str(params)
if params_str:
_safe_call(_LIB.LGBM_BoosterResetParameter(
Expand Down
2 changes: 0 additions & 2 deletions python-package/lightgbm/callback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@ def reset_parameter(**kwargs):
def _callback(env):
new_parameters = {}
for key, value in kwargs.items():
if key in _ConfigAliases.get("num_class", "boosting", "metric"):
raise RuntimeError("Cannot reset {} during training".format(repr(key)))
if isinstance(value, list):
if len(value) != env.end_iteration - env.begin_iteration:
raise ValueError("Length of list {} has to equal to 'num_boost_round'."
Expand Down