Skip to content

Commit 78b259c

Browse files
MNT replace deprecated _validate_data with validate_data (closes #290)
1 parent 1799819 commit 78b259c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

skglm/estimators.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from skglm.penalties import (L1, WeightedL1, L1_plus_L2, L2, WeightedGroupL2,
2626
MCPenalty, WeightedMCPenalty, IndicatorBox, L2_1)
2727
from skglm.utils.data import grp_converter
28+
from sklearn.utils.validation import validate_data
2829

2930

3031
def _glm_fit(X, y, model, datafit, penalty, solver):
@@ -51,8 +52,8 @@ def _glm_fit(X, y, model, datafit, penalty, solver):
5152
accept_sparse='csc', copy=fit_intercept)
5253
check_y_params = dict(ensure_2d=False, order='F')
5354

54-
X, y = model._validate_data(
55-
X, y, validate_separately=(check_X_params, check_y_params))
55+
X, y = validate_data(
56+
model, X, y, validate_separately=(check_X_params, check_y_params))
5657
X = check_array(X, 'csc', dtype=[np.float64, np.float32],
5758
order='F', copy=False, accept_large_sparse=False)
5859
y = check_array(y, 'csc', dtype=X.dtype.type, order='F', copy=False,
@@ -1473,7 +1474,7 @@ def fit(self, X, Y):
14731474
accept_sparse='csc',
14741475
copy=self.copy_X and self.fit_intercept)
14751476
check_Y_params = dict(ensure_2d=False, order='F')
1476-
X, Y = self._validate_data(X, Y, validate_separately=(check_X_params,
1477+
X, Y = validate_data(self, X, Y, validate_separately=(check_X_params,
14771478
check_Y_params))
14781479
Y = Y.astype(X.dtype)
14791480

0 commit comments

Comments
 (0)