From 75a83171f33e0f524b475d83ed9e17a58e292091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xavier=20dupr=C3=A9?= Date: Fri, 18 Feb 2022 15:10:35 +0100 Subject: [PATCH 1/3] Fixes failing import _joblib_parallel_args --- mlinsights/mlmodel/interval_regressor.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mlinsights/mlmodel/interval_regressor.py b/mlinsights/mlmodel/interval_regressor.py index 6d5c5b8f..c01afb9e 100644 --- a/mlinsights/mlmodel/interval_regressor.py +++ b/mlinsights/mlmodel/interval_regressor.py @@ -6,7 +6,6 @@ import numpy.random from sklearn.base import RegressorMixin, clone, BaseEstimator from sklearn.utils._joblib import Parallel, delayed -from sklearn.utils.fixes import _joblib_parallel_args try: from tqdm import tqdm except ImportError: # pragma: no cover @@ -93,7 +92,7 @@ def _fit_piecewise_estimator(i, est, X, y, sample_weight, alpha): self.estimators_ = \ Parallel(n_jobs=self.n_jobs, verbose=verbose, - **_joblib_parallel_args(prefer='threads'))( + prefer='threads')( delayed(_fit_piecewise_estimator)( i, estimators[i], X, y, sample_weight, self.alpha) for i in loop) From ec4d72911dfb9bc5eb1e6c3530a29b2e25f41e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xavier=20dupr=C3=A9?= Date: Fri, 18 Feb 2022 15:22:08 +0100 Subject: [PATCH 2/3] remove another instance --- mlinsights/mlmodel/piecewise_estimator.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mlinsights/mlmodel/piecewise_estimator.py b/mlinsights/mlmodel/piecewise_estimator.py index d56d31bc..6407ebc1 100644 --- a/mlinsights/mlmodel/piecewise_estimator.py +++ b/mlinsights/mlmodel/piecewise_estimator.py @@ -10,7 +10,6 @@ from sklearn.linear_model import LinearRegression, LogisticRegression from sklearn.preprocessing import KBinsDiscretizer from sklearn.utils._joblib import Parallel, delayed -from sklearn.utils.fixes import _joblib_parallel_args try: from tqdm import tqdm except ImportError: # pragma: no cover @@ -261,7 +260,7 @@ def fit(self, X, y, sample_weight=None): self.estimators_ = \ Parallel(n_jobs=self.n_jobs, verbose=verbose, - **_joblib_parallel_args(prefer='threads'))( + prefer='threads')( delayed(_fit_piecewise_estimator)( i, estimators[i], X, y, sample_weight, association, nb_classes, rnd) for i in loop) From 0e842678a3b5ee5e38eee8f5be142658ad927f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xavier=20dupr=C3=A9?= Date: Fri, 18 Feb 2022 15:58:59 +0100 Subject: [PATCH 3/3] remove one instance --- mlinsights/mlmodel/piecewise_estimator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mlinsights/mlmodel/piecewise_estimator.py b/mlinsights/mlmodel/piecewise_estimator.py index 6407ebc1..769c87ec 100644 --- a/mlinsights/mlmodel/piecewise_estimator.py +++ b/mlinsights/mlmodel/piecewise_estimator.py @@ -259,8 +259,7 @@ def fit(self, X, y, sample_weight=None): rnd = None self.estimators_ = \ - Parallel(n_jobs=self.n_jobs, verbose=verbose, - prefer='threads')( + Parallel(n_jobs=self.n_jobs, verbose=verbose, prefer='threads')( delayed(_fit_piecewise_estimator)( i, estimators[i], X, y, sample_weight, association, nb_classes, rnd) for i in loop) @@ -287,7 +286,7 @@ def _apply_predict_method(self, X, method, parallelized, dimout): association = self.transform_bins(X) - indpred = Parallel(n_jobs=self.n_jobs, **_joblib_parallel_args(prefer='threads'))( + indpred = Parallel(n_jobs=self.n_jobs, prefer='threads')( delayed(parallelized)(i, model, X, association) for i, model in enumerate(self.estimators_))