Skip to content

Commit b60294b

Browse files
authored
removed deprecated code (#3073)
1 parent 05d89a1 commit b60294b

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

python-package/lightgbm/plotting.py

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import numpy as np
1010

1111
from .basic import Booster
12-
from .compat import (MATPLOTLIB_INSTALLED, GRAPHVIZ_INSTALLED, LGBMDeprecationWarning,
12+
from .compat import (MATPLOTLIB_INSTALLED, GRAPHVIZ_INSTALLED,
1313
range_, zip_, string_type)
1414
from .sklearn import LGBMModel
1515

@@ -329,7 +329,7 @@ def plot_metric(booster, metric=None, dataset_names=None,
329329
num_metric = len(metrics_for_one)
330330
if metric is None:
331331
if num_metric > 1:
332-
msg = """more than one metric available, picking one to plot."""
332+
msg = "More than one metric available, picking one to plot."
333333
warnings.warn(msg, stacklevel=2)
334334
metric, results = metrics_for_one.popitem()
335335
else:
@@ -471,9 +471,6 @@ def add(root, total_count, parent=None, decision=None):
471471

472472

473473
def create_tree_digraph(booster, tree_index=0, show_info=None, precision=3,
474-
old_name=None, old_comment=None, old_filename=None, old_directory=None,
475-
old_format=None, old_engine=None, old_encoding=None, old_graph_attr=None,
476-
old_node_attr=None, old_edge_attr=None, old_body=None, old_strict=False,
477474
orientation='horizontal', **kwargs):
478475
"""Create a digraph representation of specified tree.
479476
@@ -512,23 +509,6 @@ def create_tree_digraph(booster, tree_index=0, show_info=None, precision=3,
512509
elif not isinstance(booster, Booster):
513510
raise TypeError('booster must be Booster or LGBMModel.')
514511

515-
for param_name in ['old_name', 'old_comment', 'old_filename', 'old_directory',
516-
'old_format', 'old_engine', 'old_encoding', 'old_graph_attr',
517-
'old_node_attr', 'old_edge_attr', 'old_body']:
518-
param = locals().get(param_name)
519-
if param is not None:
520-
warnings.warn('{0} parameter is deprecated and will be removed in 2.4 version.\n'
521-
'Please use **kwargs to pass {1} parameter.'.format(param_name, param_name[4:]),
522-
LGBMDeprecationWarning)
523-
if param_name[4:] not in kwargs:
524-
kwargs[param_name[4:]] = param
525-
if locals().get('strict'):
526-
warnings.warn('old_strict parameter is deprecated and will be removed in 2.4 version.\n'
527-
'Please use **kwargs to pass strict parameter.',
528-
LGBMDeprecationWarning)
529-
if 'strict' not in kwargs:
530-
kwargs['strict'] = True
531-
532512
model = booster.dump_model()
533513
tree_infos = model['tree_info']
534514
if 'feature_names' in model:
@@ -553,7 +533,6 @@ def create_tree_digraph(booster, tree_index=0, show_info=None, precision=3,
553533

554534

555535
def plot_tree(booster, ax=None, tree_index=0, figsize=None, dpi=None,
556-
old_graph_attr=None, old_node_attr=None, old_edge_attr=None,
557536
show_info=None, precision=3, orientation='horizontal', **kwargs):
558537
"""Plot specified tree.
559538
@@ -600,15 +579,6 @@ def plot_tree(booster, ax=None, tree_index=0, figsize=None, dpi=None,
600579
else:
601580
raise ImportError('You must install matplotlib to plot tree.')
602581

603-
for param_name in ['old_graph_attr', 'old_node_attr', 'old_edge_attr']:
604-
param = locals().get(param_name)
605-
if param is not None:
606-
warnings.warn('{0} parameter is deprecated and will be removed in 2.4 version.\n'
607-
'Please use **kwargs to pass {1} parameter.'.format(param_name, param_name[4:]),
608-
LGBMDeprecationWarning)
609-
if param_name[4:] not in kwargs:
610-
kwargs[param_name[4:]] = param
611-
612582
if ax is None:
613583
if figsize is not None:
614584
_check_not_tuple_of_2_elements(figsize, 'figsize')

src/objective/binary_objective.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ class BinaryLogloss: public ObjectiveFunction {
5959
weights_ = metadata.weights();
6060
data_size_t cnt_positive = 0;
6161
data_size_t cnt_negative = 0;
62-
// REMOVEME: remove the warning after 2.4 version release
63-
Log::Warning("Starting from the 2.1.2 version, default value for "
64-
"the \"boost_from_average\" parameter in \"binary\" objective is true.\n"
65-
"This may cause significantly different results comparing to the previous versions of LightGBM.\n"
66-
"Try to set boost_from_average=false, if your old models produce bad results");
6762
// count for positive and negative samples
6863
#pragma omp parallel for schedule(static) reduction(+:cnt_positive, cnt_negative)
6964
for (data_size_t i = 0; i < num_data_; ++i) {

0 commit comments

Comments
 (0)