scikit-learn-intelex 2025.4.0__py311-none-win_amd64.whl → 2025.6.0__py311-none-win_amd64.whl

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/cluster/k_means.py

@@ -36,6 +36,7 @@ import daal4py
 
 from .._n_jobs_support import control_n_jobs
 from .._utils import PatchingConditionsChain, getFPType, sklearn_check_version
+from ..utils.validation import check_feature_names, validate_data
 
 if sklearn_check_version("1.1"):
     from sklearn.utils.validation import _check_sample_weight, _is_arraylike_not_scalar
@@ -262,7 +263,8 @@ def _fit(self, X, y=None, sample_weight=None):
         if sklearn_check_version("1.2"):
             self._validate_params()
 
-        X = self._validate_data(
+        X = validate_data(
+            self,
             X,
             accept_sparse="csr",
             dtype=[np.float64, np.float32],
@@ -310,8 +312,7 @@ def _fit(self, X, y=None, sample_weight=None):
             raise ValueError(f"n_init should be > 0, got {self.n_init} instead.")
 
         random_state = check_random_state(self.random_state)
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=True)
+        check_feature_names(self, X, reset=True)
 
         if self.max_iter <= 0:
             raise ValueError(f"max_iter should be > 0, got {self.max_iter} instead.")
@@ -413,8 +414,7 @@ def _fit(self, X, y=None, sample_weight=None):
 
 
 def _daal4py_check_test_data(self, X):
-    if sklearn_check_version("1.0"):
-        self._check_feature_names(X, reset=False)
+    check_feature_names(self, X, reset=False)
     X = check_array(
         X, accept_sparse="csr", dtype=[np.float64, np.float32], accept_large_sparse=False
     )
@@ -514,34 +514,6 @@ class KMeans(KMeans_original):
                 algorithm=algorithm,
             )
 
-    elif sklearn_check_version("1.0"):
-
-        @_deprecate_positional_args
-        def __init__(
-            self,
-            n_clusters=8,
-            *,
-            init="k-means++",
-            n_init=10,
-            max_iter=300,
-            tol=1e-4,
-            verbose=0,
-            random_state=None,
-            copy_x=True,
-            algorithm="lloyd" if sklearn_check_version("1.1") else "auto",
-        ):
-            super(KMeans, self).__init__(
-                n_clusters=n_clusters,
-                init=init,
-                max_iter=max_iter,
-                tol=tol,
-                n_init=n_init,
-                verbose=verbose,
-                random_state=random_state,
-                copy_x=copy_x,
-                algorithm=algorithm,
-            )
-
     else:
 
         @_deprecate_positional_args
@@ -553,24 +525,20 @@ class KMeans(KMeans_original):
             n_init=10,
             max_iter=300,
             tol=1e-4,
-            precompute_distances="deprecated",
             verbose=0,
             random_state=None,
             copy_x=True,
-            n_jobs="deprecated",
-            algorithm="auto",
+            algorithm="lloyd" if sklearn_check_version("1.1") else "auto",
         ):
             super(KMeans, self).__init__(
                 n_clusters=n_clusters,
                 init=init,
                 max_iter=max_iter,
                 tol=tol,
-                precompute_distances=precompute_distances,
                 n_init=n_init,
                 verbose=verbose,
                 random_state=random_state,
                 copy_x=copy_x,
-                n_jobs=n_jobs,
                 algorithm=algorithm,
             )
 

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/decomposition/_pca.py

@@ -27,6 +27,7 @@ import daal4py
 
 from .._n_jobs_support import control_n_jobs
 from .._utils import PatchingConditionsChain, getFPType, sklearn_check_version
+from ..utils.validation import check_feature_names, validate_data
 
 if sklearn_check_version("1.4"):
     from sklearn.utils._array_api import get_namespace
@@ -223,7 +224,8 @@ class PCA(PCA_original):
                     "PCA with svd_solver='arpack' is not supported for Array API inputs."
                 )
 
-            X = self._validate_data(
+            X = validate_data(
+                self,
                 X,
                 dtype=[xp.float64, xp.float32],
                 accept_sparse=("csr", "csc"),
@@ -237,8 +239,8 @@ class PCA(PCA_original):
                     "PCA does not support sparse input. See "
                     "TruncatedSVD for a possible alternative."
                 )
-            X = self._validate_data(
-                X, dtype=[np.float64, np.float32], ensure_2d=True, copy=False
+            X = validate_data(
+                self, X, dtype=[np.float64, np.float32], ensure_2d=True, copy=False
             )
 
         if self.n_components is None:
@@ -291,9 +293,9 @@ class PCA(PCA_original):
 
         if not shape_good_for_daal or self._fit_svd_solver != "full":
             if sklearn_check_version("1.4"):
-                X = self._validate_data(X, copy=self.copy, accept_sparse=("csr", "csc"))
+                X = validate_data(self, X, copy=self.copy, accept_sparse=("csr", "csc"))
             else:
-                X = self._validate_data(X, copy=self.copy)
+                X = validate_data(self, X, copy=self.copy)
 
         _patching_status = PatchingConditionsChain("sklearn.decomposition.PCA.fit")
         _dal_ready = _patching_status.and_conditions(
@@ -333,9 +335,11 @@ class PCA(PCA_original):
     def _transform_daal4py(self, X, whiten=False, scale_eigenvalues=True, check_X=True):
         check_is_fitted(self)
 
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
-        X = check_array(X, dtype=[np.float64, np.float32], force_all_finite=check_X)
+        check_feature_names(self, X, reset=False)
+        if sklearn_check_version("1.6"):
+            X = check_array(X, dtype=[np.float64, np.float32], ensure_all_finite=check_X)
+        else:
+            X = check_array(X, dtype=[np.float64, np.float32], force_all_finite=check_X)
         fpType = getFPType(X)
 
         tr_data = dict()

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/ensemble/AdaBoostClassifier.py

@@ -29,11 +29,7 @@ from daal4py.sklearn._utils import sklearn_check_version
 
 from .._n_jobs_support import control_n_jobs
 from .._utils import getFPType
-
-if sklearn_check_version("1.6"):
-    from sklearn.utils.validation import validate_data
-else:
-    validate_data = BaseEstimator._validate_data
+from ..utils.validation import validate_data
 
 
 @control_n_jobs(decorated_methods=["fit", "predict"])
@@ -86,7 +82,7 @@ class AdaBoostClassifier(ClassifierMixin, BaseEstimator):
                 'Parameter "learning_rate" must be ' "non-zero positive value."
             )
         # it is not clear why it is so but we will get error from
-        # Intel(R) oneAPI Data Analytics
+        # oneAPI Data Analytics
         # Library otherwise
         if self.accuracy_threshold < 0 and self.accuracy_threshold >= 1:
             raise ValueError(

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/ensemble/GBTDAAL.py

@@ -30,11 +30,7 @@ from daal4py.sklearn._utils import sklearn_check_version
 
 from .._n_jobs_support import control_n_jobs
 from .._utils import getFPType
-
-if sklearn_check_version("1.6"):
-    from sklearn.utils.validation import validate_data
-else:
-    validate_data = BaseEstimator._validate_data
+from ..utils.validation import validate_data
 
 
 class GBTDAALBase(BaseEstimator, d4p.mb.GBTDAALBaseModel):
@@ -217,7 +213,7 @@ class GBTDAALClassifier(ClassifierMixin, GBTDAALBase):
             self,
             X,
             dtype=[np.float64, np.float32],
-            force_all_finite="allow-nan" if self.allow_nan_ else True,
+            ensure_all_finite="allow-nan" if self.allow_nan_ else True,
             reset=False,
         )
 
@@ -321,7 +317,7 @@ class GBTDAALRegressor(RegressorMixin, GBTDAALBase):
             self,
             X,
             dtype=[np.float64, np.float32],
-            force_all_finite="allow-nan" if self.allow_nan_ else True,
+            ensure_all_finite="allow-nan" if self.allow_nan_ else True,
             reset=False,
         )
 

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/ensemble/_forest.py

@@ -43,7 +43,7 @@ from daal4py.sklearn._utils import (
 )
 
 from .._n_jobs_support import control_n_jobs
-from ..utils.validation import _daal_num_features
+from ..utils.validation import _daal_num_features, check_feature_names, check_n_features
 
 if sklearn_check_version("1.2"):
     from sklearn.utils._param_validation import Interval, StrOptions
@@ -107,14 +107,10 @@ def _get_n_samples_bootstrap(n_samples, max_samples):
     if isinstance(max_samples, numbers.Real):
         if sklearn_check_version("1.2"):
             pass
-        elif sklearn_check_version("1.0"):
+        else:
             if not (0 < float(max_samples) <= 1):
                 msg = "`max_samples` must be in range (0.0, 1.0] but got value {}"
                 raise ValueError(msg.format(max_samples))
-        else:
-            if not (0 < float(max_samples) < 1):
-                msg = "`max_samples` must be in range (0, 1) but got value {}"
-                raise ValueError(msg.format(max_samples))
         return max(float(max_samples), 1 / n_samples)
 
     msg = "`max_samples` should be int or float, but got type '{}'"
@@ -295,7 +291,7 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             self.min_impurity_split = None
             self.binningStrategy = binningStrategy
 
-    elif sklearn_check_version("1.0"):
+    else:
 
         def __init__(
             self,
@@ -346,58 +342,6 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             self.min_impurity_split = None
             self.binningStrategy = binningStrategy
 
-    else:
-
-        def __init__(
-            self,
-            n_estimators=100,
-            criterion="gini",
-            max_depth=None,
-            min_samples_split=2,
-            min_samples_leaf=1,
-            min_weight_fraction_leaf=0.0,
-            max_features="auto",
-            max_leaf_nodes=None,
-            min_impurity_decrease=0.0,
-            min_impurity_split=None,
-            bootstrap=True,
-            oob_score=False,
-            n_jobs=None,
-            random_state=None,
-            verbose=0,
-            warm_start=False,
-            class_weight=None,
-            ccp_alpha=0.0,
-            max_samples=None,
-            maxBins=256,
-            minBinSize=1,
-            binningStrategy="quantiles",
-        ):
-            super().__init__(
-                n_estimators=n_estimators,
-                criterion=criterion,
-                max_depth=max_depth,
-                min_samples_split=min_samples_split,
-                min_samples_leaf=min_samples_leaf,
-                min_weight_fraction_leaf=min_weight_fraction_leaf,
-                max_features=max_features,
-                max_leaf_nodes=max_leaf_nodes,
-                min_impurity_decrease=min_impurity_decrease,
-                min_impurity_split=min_impurity_split,
-                bootstrap=bootstrap,
-                oob_score=oob_score,
-                n_jobs=n_jobs,
-                random_state=random_state,
-                verbose=verbose,
-                warm_start=warm_start,
-                class_weight=class_weight,
-                ccp_alpha=ccp_alpha,
-                max_samples=max_samples,
-            )
-            self.maxBins = maxBins
-            self.minBinSize = minBinSize
-            self.binningStrategy = binningStrategy
-
     def fit(self, X, y, sample_weight=None):
         """
         Build a forest of trees from the training set (X, y).
@@ -477,13 +421,19 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             )
 
         if _dal_ready:
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=True)
-            X = check_array(
-                X,
-                dtype=[np.float32, np.float64],
-                force_all_finite=not sklearn_check_version("1.4"),
-            )
+            check_feature_names(self, X, reset=True)
+            if sklearn_check_version("1.6"):
+                X = check_array(
+                    X,
+                    dtype=[np.float32, np.float64],
+                    ensure_all_finite=False,
+                )
+            else:
+                X = check_array(
+                    X,
+                    dtype=[np.float32, np.float64],
+                    force_all_finite=not sklearn_check_version("1.4"),
+                )
             y = np.asarray(y)
             y = np.atleast_1d(y)
 
@@ -571,8 +521,7 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
         if not _dal_ready:
             return super().predict(X)
 
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
+        check_feature_names(self, X, reset=False)
         X = check_array(
             X, accept_sparse=["csr", "csc", "coo"], dtype=[np.float64, np.float32]
         )
@@ -601,8 +550,7 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             The class probabilities of the input samples. The order of the
             classes corresponds to that in the attribute :term:`classes_`.
         """
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
+        check_feature_names(self, X, reset=False)
         if hasattr(self, "n_features_in_"):
             try:
                 num_features = _daal_num_features(X)
@@ -645,10 +593,10 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             return super().predict_proba(X)
         X = check_array(X, dtype=[np.float64, np.float32])
         check_is_fitted(self)
-        self._check_n_features(X, reset=False)
+        check_n_features(self, X, reset=False)
         return self._daal_predict_proba(X)
 
-    if sklearn_check_version("1.0"):
+    if not sklearn_check_version("1.2"):
 
         @deprecated(
             "Attribute `n_features_` was deprecated in version 1.0 and will be "
@@ -679,10 +627,8 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             "min_impurity_decrease": self.min_impurity_decrease,
             "random_state": None,
         }
-        if not sklearn_check_version("1.0"):
-            params["min_impurity_split"] = self.min_impurity_split
         est = DecisionTreeClassifier(**params)
-        # we need to set est.tree_ field with Trees constructed from Intel(R)
+        # we need to set est.tree_ field with Trees constructed from
         # oneAPI Data Analytics Library solution
         estimators_ = []
         random_state_checked = check_random_state(self.random_state)
@@ -691,10 +637,7 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
             est_i.set_params(
                 random_state=random_state_checked.randint(np.iinfo(np.int32).max)
             )
-            if sklearn_check_version("1.0"):
-                est_i.n_features_in_ = self.n_features_in_
-            else:
-                est_i.n_features_ = self.n_features_in_
+            est_i.n_features_in_ = self.n_features_in_
             est_i.n_outputs_ = self.n_outputs_
             est_i.classes_ = classes_
             est_i.n_classes_ = n_classes_
@@ -744,8 +687,6 @@ class RandomForestClassifier(RandomForestClassifier_original, RandomForestBase):
         y, expanded_class_weight = self._validate_y_class_weight(y)
         n_classes = self.n_classes_[0]
         self.n_features_in_ = X.shape[1]
-        if not sklearn_check_version("1.0"):
-            self.n_features_ = self.n_features_in_
 
         if expanded_class_weight is not None:
             if sample_weight is not None:
@@ -931,7 +872,7 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
             self.min_impurity_split = None
             self.binningStrategy = binningStrategy
 
-    elif sklearn_check_version("1.0"):
+    else:
 
         def __init__(
             self,
@@ -981,57 +922,6 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
             self.min_impurity_split = None
             self.binningStrategy = binningStrategy
 
-    else:
-
-        def __init__(
-            self,
-            n_estimators=100,
-            *,
-            criterion="mse",
-            max_depth=None,
-            min_samples_split=2,
-            min_samples_leaf=1,
-            min_weight_fraction_leaf=0.0,
-            max_features="auto",
-            max_leaf_nodes=None,
-            min_impurity_decrease=0.0,
-            min_impurity_split=None,
-            bootstrap=True,
-            oob_score=False,
-            n_jobs=None,
-            random_state=None,
-            verbose=0,
-            warm_start=False,
-            ccp_alpha=0.0,
-            max_samples=None,
-            maxBins=256,
-            minBinSize=1,
-            binningStrategy="quantiles",
-        ):
-            super().__init__(
-                n_estimators=n_estimators,
-                criterion=criterion,
-                max_depth=max_depth,
-                min_samples_split=min_samples_split,
-                min_samples_leaf=min_samples_leaf,
-                min_weight_fraction_leaf=min_weight_fraction_leaf,
-                max_features=max_features,
-                max_leaf_nodes=max_leaf_nodes,
-                min_impurity_decrease=min_impurity_decrease,
-                min_impurity_split=min_impurity_split,
-                bootstrap=bootstrap,
-                oob_score=oob_score,
-                n_jobs=n_jobs,
-                random_state=random_state,
-                verbose=verbose,
-                warm_start=warm_start,
-                ccp_alpha=ccp_alpha,
-                max_samples=max_samples,
-            )
-            self.maxBins = maxBins
-            self.minBinSize = minBinSize
-            self.binningStrategy = binningStrategy
-
     def fit(self, X, y, sample_weight=None):
         """
         Build a forest of trees from the training set (X, y).
@@ -1067,7 +957,7 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
         if sample_weight is not None:
             sample_weight = check_sample_weight(sample_weight, X)
 
-        if sklearn_check_version("1.0") and self.criterion == "mse":
+        if not sklearn_check_version("1.2") and self.criterion == "mse":
             warnings.warn(
                 "Criterion 'mse' was deprecated in v1.0 and will be "
                 "removed in version 1.2. Use `criterion='squared_error'` "
@@ -1119,13 +1009,19 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
             )
 
         if _dal_ready:
-            if sklearn_check_version("1.0"):
-                self._check_feature_names(X, reset=True)
-            X = check_array(
-                X,
-                dtype=[np.float64, np.float32],
-                force_all_finite=not sklearn_check_version("1.4"),
-            )
+            check_feature_names(self, X, reset=True)
+            if sklearn_check_version("1.6"):
+                X = check_array(
+                    X,
+                    dtype=[np.float64, np.float32],
+                    ensure_all_finite=False,
+                )
+            else:
+                X = check_array(
+                    X,
+                    dtype=[np.float64, np.float32],
+                    force_all_finite=not sklearn_check_version("1.4"),
+                )
             y = np.asarray(y)
             y = np.atleast_1d(y)
 
@@ -1210,14 +1106,13 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
         if not _dal_ready:
             return super().predict(X)
 
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
+        check_feature_names(self, X, reset=False)
         X = check_array(
             X, accept_sparse=["csr", "csc", "coo"], dtype=[np.float64, np.float32]
         )
         return self._daal_predict_regressor(X)
 
-    if sklearn_check_version("1.0"):
+    if not sklearn_check_version("1.2"):
 
         @deprecated(
             "Attribute `n_features_` was deprecated in version 1.0 and will be "
@@ -1245,11 +1140,9 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
             "min_impurity_decrease": self.min_impurity_decrease,
             "random_state": None,
         }
-        if not sklearn_check_version("1.0"):
-            params["min_impurity_split"] = self.min_impurity_split
         est = DecisionTreeRegressor(**params)
 
-        # we need to set est.tree_ field with Trees constructed from Intel(R)
+        # we need to set est.tree_ field with Trees constructed from
         # oneAPI Data Analytics Library solution
         estimators_ = []
         random_state_checked = check_random_state(self.random_state)
@@ -1258,10 +1151,7 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
             est_i.set_params(
                 random_state=random_state_checked.randint(np.iinfo(np.int32).max)
             )
-            if sklearn_check_version("1.0"):
-                est_i.n_features_in_ = self.n_features_in_
-            else:
-                est_i.n_features_ = self.n_features_in_
+            est_i.n_features_in_ = self.n_features_in_
             est_i.n_outputs_ = self.n_outputs_
 
             tree_i_state_class = daal4py.getTreeState(self.daal_model_, i)
@@ -1282,8 +1172,6 @@ class RandomForestRegressor(RandomForestRegressor_original, RandomForestBase):
 
     def _daal_fit_regressor(self, X, y, sample_weight=None):
         self.n_features_in_ = X.shape[1]
-        if not sklearn_check_version("1.0"):
-            self.n_features_ = self.n_features_in_
 
         rs_ = check_random_state(self.random_state)
 

{scikit_learn_intelex-2025.4.0.data → scikit_learn_intelex-2025.6.0.data}/data/Lib/site-packages/daal4py/sklearn/linear_model/_coordinate_descent.py

@@ -32,8 +32,9 @@ from daal4py.sklearn._utils import (
 )
 
 from .._n_jobs_support import control_n_jobs
+from ..utils.validation import check_feature_names
 
-if sklearn_check_version("1.0") and not sklearn_check_version("1.2"):
+if not sklearn_check_version("1.2"):
     from sklearn.linear_model._base import _deprecate_normalize
 if sklearn_check_version("1.1") and not sklearn_check_version("1.2"):
     from sklearn.utils import check_scalar
@@ -93,7 +94,7 @@ def _daal4py_fit_enet(self, X, y_, check_input):
     y = make2d(y_)
     _fptype = getFPType(X)
 
-    # only for dual_gap computation, it is not required for Intel(R) oneAPI
+    # only for dual_gap computation, it is not required for oneAPI
     # Data Analytics Library
     self._X = X
     self.n_features_in_ = X.shape[1]
@@ -117,7 +118,7 @@ def _daal4py_fit_enet(self, X, y_, check_input):
     if sklearn_check_version("1.2"):
         _normalize = False
     else:
-        _normalize = self._normalize if sklearn_check_version("1.0") else self.normalize
+        _normalize = self._normalize
     if self.fit_intercept:
         X_offset = np.average(X, axis=0)
         if _normalize:
@@ -274,7 +275,7 @@ def _daal4py_fit_lasso(self, X, y_, check_input):
     y = make2d(y_)
     _fptype = getFPType(X)
 
-    # only for dual_gap computation, it is not required for Intel(R) oneAPI
+    # only for dual_gap computation, it is not required for oneAPI
     # Data Analytics Library
     self._X = X
     self.n_features_in_ = X.shape[1]
@@ -291,7 +292,7 @@ def _daal4py_fit_lasso(self, X, y_, check_input):
     if sklearn_check_version("1.2"):
         _normalize = False
     else:
-        _normalize = self._normalize if sklearn_check_version("1.0") else self.normalize
+        _normalize = self._normalize
     if self.fit_intercept:
         X_offset = np.average(X, axis=0)
         if _normalize:
@@ -434,8 +435,7 @@ def _daal4py_predict_lasso(self, X):
 
 
 def _fit(self, _X, _y, sample_weight=None, check_input=True):
-    if sklearn_check_version("1.0"):
-        self._check_feature_names(_X, reset=True)
+    check_feature_names(self, _X, reset=True)
     if sklearn_check_version("1.2"):
         self._validate_params()
     elif sklearn_check_version("1.1"):
@@ -527,14 +527,14 @@ def _fit(self, _X, _y, sample_weight=None, check_input=True):
 
     if not check_input:
         # only for compliance with Sklearn,
-        # this assert is not required for Intel(R) oneAPI Data
+        # this assert is not required for oneAPI Data
         # Analytics Library
         print(type(X), X.flags["F_CONTIGUOUS"])
         if isinstance(X, np.ndarray) and X.flags["F_CONTIGUOUS"] is False:
             # print(X.flags)
             raise ValueError("ndarray is not Fortran contiguous")
 
-    if sklearn_check_version("1.0") and not sklearn_check_version("1.2"):
+    if not sklearn_check_version("1.2"):
         self._normalize = _deprecate_normalize(
             self.normalize, default=False, estimator_name=class_name
         )
@@ -661,7 +661,7 @@ class ElasticNet(ElasticNet_original):
             alpha=1.0,
             l1_ratio=0.5,
             fit_intercept=True,
-            normalize="deprecated" if sklearn_check_version("1.0") else False,
+            normalize="deprecated",
             precompute=False,
             max_iter=1000,
             copy_X=True,
@@ -690,8 +690,7 @@ class ElasticNet(ElasticNet_original):
         return _fit(self, X, y, sample_weight=sample_weight, check_input=check_input)
 
     def predict(self, X):
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
+        check_feature_names(self, X, reset=False)
 
         _X = check_array(
             X, accept_sparse=["csr", "csc", "coo"], dtype=[np.float64, np.float32]
@@ -776,7 +775,7 @@ class Lasso(Lasso_original):
             self,
             alpha=1.0,
             fit_intercept=True,
-            normalize="deprecated" if sklearn_check_version("1.0") else False,
+            normalize="deprecated",
             precompute=False,
             copy_X=True,
             max_iter=1000,
@@ -805,8 +804,7 @@ class Lasso(Lasso_original):
         return _fit(self, X, y, sample_weight, check_input)
 
     def predict(self, X):
-        if sklearn_check_version("1.0"):
-            self._check_feature_names(X, reset=False)
+        check_feature_names(self, X, reset=False)
         _X = check_array(
             X, accept_sparse=["csr", "csc", "coo"], dtype=[np.float64, np.float32]
         )