From 8fe643a1cfd34bf72a3ccee63f54d596b7480af9 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Wed, 14 Aug 2019 08:27:28 +0100 Subject: [PATCH 01/17] fix predict_proba and decision_function --- sklearn/multioutput.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 463b72d40f47a..75cf38c5b49ae 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -598,10 +598,13 @@ def predict_proba(self, X): Returns ------- - Y_prob : array-like, shape (n_samples, n_classes) + Y_prob : List of n_outputs arrays of shape (n_samples, n_classes) + The class probabilities of the input samples. The order of the + classes for each output corresponds to the respective entry of + the attribute `classes_`. """ X = check_array(X, accept_sparse=True) - Y_prob_chain = np.zeros((X.shape[0], len(self.estimators_))) + Y_prob_chain = [] Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -609,11 +612,11 @@ def predict_proba(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_prob_chain[:, chain_idx] = estimator.predict_proba(X_aug)[:, 1] + Y_prob_chain.append(estimator.predict_proba(X_aug)) Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_prob = Y_prob_chain[:, inv_order] + Y_prob = [Y_prob_chain[i] for i in inv_order] return Y_prob @@ -627,11 +630,12 @@ def decision_function(self, X): Returns ------- - Y_decision : array-like, shape (n_samples, n_classes ) - Returns the decision function of the sample for each model - in the chain. + Y_decision : List of n_outputs arrays of shape (n_samples, n_classes) + Decision function of the input samples for each model + in the chain. The order of the classes for each output corresponds + to the respective entry of the attribute `classes_`. """ - Y_decision_chain = np.zeros((X.shape[0], len(self.estimators_))) + Y_decision_chain = [] Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -639,12 +643,12 @@ def decision_function(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_decision_chain[:, chain_idx] = estimator.decision_function(X_aug) + Y_decision_chain.append(estimator.decision_function(X_aug)) Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_decision = Y_decision_chain[:, inv_order] + Y_decision = [Y_decision_chain[i] for i in inv_order] return Y_decision From 86b263ef19e91213ca2881fcd7423a7a8fc8f95f Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Wed, 14 Aug 2019 16:12:15 +0100 Subject: [PATCH 02/17] fix tests --- sklearn/tests/test_multioutput.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sklearn/tests/test_multioutput.py b/sklearn/tests/test_multioutput.py index e70048a7fa257..92f523f87f5b6 100644 --- a/sklearn/tests/test_multioutput.py +++ b/sklearn/tests/test_multioutput.py @@ -413,8 +413,9 @@ def test_classifier_chain_fit_and_predict_with_linear_svc(): assert Y_pred.shape == Y.shape Y_decision = classifier_chain.decision_function(X) + Y_binary = [Y_decision[i] >= 0 for i in range(Y.shape[1])] + Y_binary = np.asarray(Y_binary).T - Y_binary = (Y_decision >= 0) assert_array_equal(Y_binary, Y_pred) assert not hasattr(classifier_chain, 'predict_proba') @@ -470,7 +471,8 @@ def test_base_chain_fit_and_predict(): list(range(X.shape[1], X.shape[1] + Y.shape[1]))) Y_prob = chains[1].predict_proba(X) - Y_binary = (Y_prob >= .5) + Y_binary = [np.argmax(Y_prob[i], axis=1) for i in range(Y.shape[1])] + Y_binary = np.asarray(Y_binary).T assert_array_equal(Y_binary, Y_pred) assert isinstance(chains[1], ClassifierMixin) From b4babcaa3a392c8613e4eae68def9a7514095a4e Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Wed, 14 Aug 2019 16:29:44 +0100 Subject: [PATCH 03/17] remove multioutput_only tag --- sklearn/multioutput.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 04e4fced05d51..cbb712e1f43ab 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -675,8 +675,7 @@ def decision_function(self, X): return Y_decision def _more_tags(self): - return {'_skip_test': True, - 'multioutput_only': True} + return {'_skip_test': True} class RegressorChain(_BaseChain, RegressorMixin, MetaEstimatorMixin): From d6b35a74560e534cd6cfc9a5e997fab4875a25c2 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Wed, 14 Aug 2019 16:44:48 +0100 Subject: [PATCH 04/17] update whats_new --- doc/whats_new/v0.22.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/whats_new/v0.22.rst b/doc/whats_new/v0.22.rst index 2a41f2ca0116a..2c1f39d104ee1 100644 --- a/doc/whats_new/v0.22.rst +++ b/doc/whats_new/v0.22.rst @@ -260,6 +260,11 @@ Changelog - |Fix| :class:`multioutput.MultiOutputClassifier` now has attribute ``classes_``. :pr:`14629` by :user:`Agamemnon Krasoulis `. +- |Fix| :func:`multioutput.ClassifierChain.decision_function` and + :func:`multioutput.ClassifierChain.predict_proba` now both return a list of + ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by + :user:`Agamemnon Krasoulis `. + :mod:`sklearn.pipeline` ....................... From dccbf6d5da6e6db22373296a65f793feae1044a0 Mon Sep 17 00:00:00 2001 From: Agamemnon Krasoulis Date: Fri, 15 Nov 2019 15:17:33 +0000 Subject: [PATCH 05/17] nitpicks Co-Authored-By: Guillaume Lemaitre --- doc/whats_new/v0.22.rst | 2 +- sklearn/multioutput.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/whats_new/v0.22.rst b/doc/whats_new/v0.22.rst index 6230b053b4056..9ad731694b375 100644 --- a/doc/whats_new/v0.22.rst +++ b/doc/whats_new/v0.22.rst @@ -679,7 +679,7 @@ Changelog - |Fix| :func:`multioutput.ClassifierChain.decision_function` and :func:`multioutput.ClassifierChain.predict_proba` now both return a list of - ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by + ``n_outputs`` arrays of shape `(n_samples, n_classes)`. :pr:`14654` by :user:`Agamemnon Krasoulis `. :mod:`sklearn.naive_bayes` diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 76da874556220..937774e05cdeb 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -638,7 +638,7 @@ def predict_proba(self, X): Returns ------- - Y_prob : List of n_outputs arrays of shape (n_samples, n_classes) + Y_prob : list of n_outputs ndarray of shape (n_samples, n_classes) The class probabilities of the input samples. The order of the classes for each output corresponds to the respective entry of the attribute `classes_`. @@ -670,7 +670,7 @@ def decision_function(self, X): Returns ------- - Y_decision : List of n_outputs arrays of shape (n_samples, n_classes) + Y_decision : list of n_outputs ndarray of shape (n_samples, n_classes) Decision function of the input samples for each model in the chain. The order of the classes for each output corresponds to the respective entry of the attribute `classes_`. From 408d59514de97a6cc936ad96035993400a922927 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Fri, 10 Jan 2020 08:53:02 +0000 Subject: [PATCH 06/17] update docs --- doc/whats_new/v0.22.rst | 9 +-------- doc/whats_new/v0.23.rst | 10 +++++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/whats_new/v0.22.rst b/doc/whats_new/v0.22.rst index 7731f4dd334c3..bbd35676defcf 100644 --- a/doc/whats_new/v0.22.rst +++ b/doc/whats_new/v0.22.rst @@ -702,7 +702,7 @@ Changelog - |Feature| Added multiclass support to :func:`metrics.roc_auc_score` with corresponding scorers `'roc_auc_ovr'`, `'roc_auc_ovo'`, `'roc_auc_ovr_weighted'`, and `'roc_auc_ovo_weighted'`. - :pr:`12789` and :pr:`15274` by + :pr:`12789` and :pr:`15274` by :user:`Kathy Chen `, :user:`Mohamed Maskani `, and `Thomas Fan`_. @@ -791,16 +791,10 @@ Changelog - |Fix| :class:`multioutput.MultiOutputClassifier` now has attribute ``classes_``. :pr:`14629` by :user:`Agamemnon Krasoulis `. - - |Fix| :class:`multioutput.MultiOutputClassifier` now has `predict_proba` as property and can be checked with `hasattr`. :issue:`15488` :pr:`15490` by :user:`Rebekah Kim ` -- |Fix| :func:`multioutput.ClassifierChain.decision_function` and - :func:`multioutput.ClassifierChain.predict_proba` now both return a list of - ``n_outputs`` arrays of shape `(n_samples, n_classes)`. :pr:`14654` by - :user:`Agamemnon Krasoulis `. - :mod:`sklearn.naive_bayes` ............................... @@ -849,7 +843,6 @@ Changelog :class:`neural_network.MLPClassifier` to give control over maximum number of function evaluation to not meet ``tol`` improvement. :issue:`9274` by :user:`Daniel Perry `. ->>>>>>> master :mod:`sklearn.pipeline` ....................... diff --git a/doc/whats_new/v0.23.rst b/doc/whats_new/v0.23.rst index 53c416c506614..ea4105bfeca17 100644 --- a/doc/whats_new/v0.23.rst +++ b/doc/whats_new/v0.23.rst @@ -80,7 +80,7 @@ Changelog - |Enhancement| :func:`gaussian_process.kernels.Matern` returns the RBF kernel when ``nu=np.inf``. :pr: `15503` by :user:`Sam Dixon` . - + :mod:`sklearn.linear_model` ........................... @@ -118,6 +118,14 @@ Changelog when `y=None`. :pr: `15918` by :user: `Luca Kubin `. + :mod:`sklearn.multioutput` + .............................. + +- |Fix| :func:`multioutput.ClassifierChain.decision_function` and + :func:`multioutput.ClassifierChain.predict_proba` now both return a list of + ``n_outputs`` arrays of shape `(n_samples, n_classes)`. :pr:`14654` by + :user:`Agamemnon Krasoulis `. + :mod:`sklearn.preprocessing` ............................ From 95c4bf8fdfe1cd99eb68b1270b7be5ccdd34e8a7 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Fri, 10 Jan 2020 09:20:32 +0000 Subject: [PATCH 07/17] fix whatsnew --- doc/whats_new/v0.23.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/whats_new/v0.23.rst b/doc/whats_new/v0.23.rst index ea4105bfeca17..4dd81b6e5a80d 100644 --- a/doc/whats_new/v0.23.rst +++ b/doc/whats_new/v0.23.rst @@ -118,8 +118,8 @@ Changelog when `y=None`. :pr: `15918` by :user: `Luca Kubin `. - :mod:`sklearn.multioutput` - .............................. +:mod:`sklearn.multioutput` +.............................. - |Fix| :func:`multioutput.ClassifierChain.decision_function` and :func:`multioutput.ClassifierChain.predict_proba` now both return a list of From 6d8cf2a3986b68b9031c392ddf4d7cec750f48fa Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Tue, 15 Dec 2020 22:39:33 +0000 Subject: [PATCH 08/17] Revert "fix whatsnew" This reverts commit 95c4bf8fdfe1cd99eb68b1270b7be5ccdd34e8a7. --- doc/whats_new/v0.23.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/whats_new/v0.23.rst b/doc/whats_new/v0.23.rst index 16054a3f0e816..4136c891b43e6 100644 --- a/doc/whats_new/v0.23.rst +++ b/doc/whats_new/v0.23.rst @@ -649,8 +649,8 @@ Changelog deciles lines as attributes so they can be hidden or customized. :pr:`15785` by `Nicolas Hug`_ -:mod:`sklearn.multioutput` -.............................. + :mod:`sklearn.multioutput` + .............................. - |Fix| :func:`multioutput.ClassifierChain.decision_function` and :func:`multioutput.ClassifierChain.predict_proba` now both return a list of From 475055781f0d5915e0ed6a39adc705e285b7b60b Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sat, 30 Jan 2021 16:16:29 +0000 Subject: [PATCH 09/17] checkout whatsnew from master --- doc/whats_new/v0.23.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/whats_new/v0.23.rst b/doc/whats_new/v0.23.rst index b62540f8b688a..598d9adc5cef4 100644 --- a/doc/whats_new/v0.23.rst +++ b/doc/whats_new/v0.23.rst @@ -462,9 +462,6 @@ Changelog ............................... - |Enhancement| :func:`gaussian_process.kernels.Matern` returns the RBF kernel when ``nu=np.inf``. -<<<<<<< HEAD - :pr: `15503` by :user:`Sam Dixon` . -======= :pr:`15503` by :user:`Sam Dixon `. - |Fix| Fixed bug in :class:`gaussian_process.GaussianProcessRegressor` that @@ -491,7 +488,6 @@ Changelog method for :class:`ensemble.RandomForestRegressor` and :class:`tree.DecisionTreeRegressor`. :pr:`15864` by `Nicolas Hug`_. ->>>>>>> master :mod:`sklearn.linear_model` ........................... @@ -654,14 +650,6 @@ Changelog deciles lines as attributes so they can be hidden or customized. :pr:`15785` by `Nicolas Hug`_ - :mod:`sklearn.multioutput` - .............................. - -- |Fix| :func:`multioutput.ClassifierChain.decision_function` and - :func:`multioutput.ClassifierChain.predict_proba` now both return a list of - ``n_outputs`` arrays of shape `(n_samples, n_classes)`. :pr:`14654` by - :user:`Agamemnon Krasoulis `. - :mod:`sklearn.preprocessing` ............................ From 0616429f5853dd5d3e6a9e183c909ebd4043bbb8 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 08:20:46 +0000 Subject: [PATCH 10/17] Fix issue --- sklearn/cluster/affinity_propagation_.py | 17 ------------ sklearn/cluster/bicluster.py | 17 ------------ sklearn/cluster/birch.py | 17 ------------ sklearn/cluster/dbscan_.py | 17 ------------ sklearn/cluster/hierarchical.py | 17 ------------ sklearn/cluster/k_means_.py | 17 ------------ sklearn/cluster/mean_shift_.py | 17 ------------ sklearn/cluster/optics_.py | 17 ------------ sklearn/cluster/spectral.py | 17 ------------ sklearn/covariance/elliptic_envelope.py | 17 ------------ sklearn/covariance/empirical_covariance_.py | 17 ------------ sklearn/covariance/graph_lasso_.py | 17 ------------ sklearn/covariance/robust_covariance.py | 17 ------------ sklearn/covariance/shrunk_covariance_.py | 17 ------------ sklearn/cross_decomposition/cca_.py | 17 ------------ sklearn/cross_decomposition/pls_.py | 17 ------------ sklearn/datasets/base.py | 17 ------------ sklearn/datasets/california_housing.py | 17 ------------ sklearn/datasets/covtype.py | 17 ------------ sklearn/datasets/kddcup99.py | 17 ------------ sklearn/datasets/lfw.py | 17 ------------ sklearn/datasets/olivetti_faces.py | 17 ------------ sklearn/datasets/openml.py | 17 ------------ sklearn/datasets/rcv1.py | 17 ------------ sklearn/datasets/samples_generator.py | 17 ------------ sklearn/datasets/species_distributions.py | 17 ------------ sklearn/datasets/svmlight_format.py | 17 ------------ sklearn/datasets/twenty_newsgroups.py | 17 ------------ sklearn/decomposition/base.py | 17 ------------ sklearn/decomposition/cdnmf_fast.py | 17 ------------ sklearn/decomposition/dict_learning.py | 17 ------------ sklearn/decomposition/factor_analysis.py | 17 ------------ sklearn/decomposition/fastica_.py | 17 ------------ sklearn/decomposition/incremental_pca.py | 17 ------------ sklearn/decomposition/kernel_pca.py | 17 ------------ sklearn/decomposition/nmf.py | 17 ------------ sklearn/decomposition/online_lda.py | 17 ------------ sklearn/decomposition/online_lda_fast.py | 17 ------------ sklearn/decomposition/pca.py | 17 ------------ sklearn/decomposition/sparse_pca.py | 17 ------------ sklearn/decomposition/truncated_svd.py | 17 ------------ sklearn/ensemble/bagging.py | 17 ------------ sklearn/ensemble/base.py | 17 ------------ sklearn/ensemble/forest.py | 17 ------------ sklearn/ensemble/gradient_boosting.py | 17 ------------ sklearn/ensemble/iforest.py | 17 ------------ sklearn/ensemble/voting.py | 17 ------------ sklearn/ensemble/weight_boosting.py | 17 ------------ sklearn/feature_extraction/dict_vectorizer.py | 17 ------------ sklearn/feature_extraction/hashing.py | 17 ------------ sklearn/feature_extraction/stop_words.py | 17 ------------ sklearn/feature_selection/base.py | 17 ------------ sklearn/feature_selection/from_model.py | 17 ------------ sklearn/feature_selection/mutual_info.py | 17 ------------ sklearn/feature_selection/rfe.py | 17 ------------ .../feature_selection/univariate_selection.py | 17 ------------ .../feature_selection/variance_threshold.py | 17 ------------ sklearn/gaussian_process/gpc.py | 17 ------------ sklearn/gaussian_process/gpr.py | 17 ------------ sklearn/inspection/partial_dependence.py | 17 ------------ sklearn/linear_model/base.py | 17 ------------ sklearn/linear_model/bayes.py | 17 ------------ sklearn/linear_model/cd_fast.py | 17 ------------ sklearn/linear_model/coordinate_descent.py | 17 ------------ sklearn/linear_model/huber.py | 17 ------------ sklearn/linear_model/least_angle.py | 17 ------------ sklearn/linear_model/logistic.py | 17 ------------ sklearn/linear_model/omp.py | 17 ------------ sklearn/linear_model/passive_aggressive.py | 17 ------------ sklearn/linear_model/perceptron.py | 17 ------------ sklearn/linear_model/ransac.py | 17 ------------ sklearn/linear_model/ridge.py | 17 ------------ sklearn/linear_model/sag.py | 17 ------------ sklearn/linear_model/sag_fast.py | 17 ------------ sklearn/linear_model/sgd_fast.py | 17 ------------ sklearn/linear_model/stochastic_gradient.py | 17 ------------ sklearn/linear_model/theil_sen.py | 17 ------------ sklearn/manifold/isomap.py | 17 ------------ sklearn/manifold/locally_linear.py | 17 ------------ sklearn/manifold/mds.py | 17 ------------ sklearn/manifold/spectral_embedding_.py | 17 ------------ sklearn/manifold/t_sne.py | 17 ------------ sklearn/metrics/base.py | 17 ------------ sklearn/metrics/classification.py | 17 ------------ sklearn/metrics/cluster/bicluster.py | 17 ------------ .../cluster/expected_mutual_info_fast.py | 17 ------------ sklearn/metrics/cluster/supervised.py | 17 ------------ sklearn/metrics/cluster/unsupervised.py | 17 ------------ sklearn/metrics/pairwise_fast.py | 17 ------------ sklearn/metrics/ranking.py | 17 ------------ sklearn/metrics/regression.py | 17 ------------ sklearn/metrics/scorer.py | 17 ------------ sklearn/mixture/base.py | 17 ------------ sklearn/mixture/bayesian_mixture.py | 17 ------------ sklearn/mixture/gaussian_mixture.py | 17 ------------ sklearn/multioutput.py | 27 +++++++++---------- sklearn/neighbors/ball_tree.py | 17 ------------ sklearn/neighbors/base.py | 17 ------------ sklearn/neighbors/classification.py | 17 ------------ sklearn/neighbors/dist_metrics.py | 17 ------------ sklearn/neighbors/graph.py | 17 ------------ sklearn/neighbors/kd_tree.py | 17 ------------ sklearn/neighbors/kde.py | 17 ------------ sklearn/neighbors/lof.py | 17 ------------ sklearn/neighbors/nca.py | 17 ------------ sklearn/neighbors/nearest_centroid.py | 17 ------------ sklearn/neighbors/quad_tree.py | 17 ------------ sklearn/neighbors/regression.py | 17 ------------ sklearn/neighbors/typedefs.py | 17 ------------ sklearn/neighbors/unsupervised.py | 17 ------------ .../neural_network/multilayer_perceptron.py | 17 ------------ sklearn/neural_network/rbm.py | 17 ------------ sklearn/preprocessing/data.py | 17 ------------ sklearn/preprocessing/label.py | 17 ------------ sklearn/semi_supervised/label_propagation.py | 17 ------------ sklearn/svm/base.py | 17 ------------ sklearn/svm/bounds.py | 17 ------------ sklearn/svm/classes.py | 17 ------------ sklearn/svm/liblinear.py | 17 ------------ sklearn/svm/libsvm.py | 17 ------------ sklearn/svm/libsvm_sparse.py | 17 ------------ sklearn/tests/test_multioutput.py | 6 ++--- sklearn/tree/export.py | 17 ------------ sklearn/tree/tree.py | 17 ------------ sklearn/utils/fast_dict.py | 17 ------------ sklearn/utils/mocking.py | 17 ------------ sklearn/utils/seq_dataset.py | 17 ------------ sklearn/utils/testing.py | 17 ------------ sklearn/utils/weight_vector.py | 17 ------------ 129 files changed, 14 insertions(+), 2178 deletions(-) delete mode 100644 sklearn/cluster/affinity_propagation_.py delete mode 100644 sklearn/cluster/bicluster.py delete mode 100644 sklearn/cluster/birch.py delete mode 100644 sklearn/cluster/dbscan_.py delete mode 100644 sklearn/cluster/hierarchical.py delete mode 100644 sklearn/cluster/k_means_.py delete mode 100644 sklearn/cluster/mean_shift_.py delete mode 100644 sklearn/cluster/optics_.py delete mode 100644 sklearn/cluster/spectral.py delete mode 100644 sklearn/covariance/elliptic_envelope.py delete mode 100644 sklearn/covariance/empirical_covariance_.py delete mode 100644 sklearn/covariance/graph_lasso_.py delete mode 100644 sklearn/covariance/robust_covariance.py delete mode 100644 sklearn/covariance/shrunk_covariance_.py delete mode 100644 sklearn/cross_decomposition/cca_.py delete mode 100644 sklearn/cross_decomposition/pls_.py delete mode 100644 sklearn/datasets/base.py delete mode 100644 sklearn/datasets/california_housing.py delete mode 100644 sklearn/datasets/covtype.py delete mode 100644 sklearn/datasets/kddcup99.py delete mode 100644 sklearn/datasets/lfw.py delete mode 100644 sklearn/datasets/olivetti_faces.py delete mode 100644 sklearn/datasets/openml.py delete mode 100644 sklearn/datasets/rcv1.py delete mode 100644 sklearn/datasets/samples_generator.py delete mode 100644 sklearn/datasets/species_distributions.py delete mode 100644 sklearn/datasets/svmlight_format.py delete mode 100644 sklearn/datasets/twenty_newsgroups.py delete mode 100644 sklearn/decomposition/base.py delete mode 100644 sklearn/decomposition/cdnmf_fast.py delete mode 100644 sklearn/decomposition/dict_learning.py delete mode 100644 sklearn/decomposition/factor_analysis.py delete mode 100644 sklearn/decomposition/fastica_.py delete mode 100644 sklearn/decomposition/incremental_pca.py delete mode 100644 sklearn/decomposition/kernel_pca.py delete mode 100644 sklearn/decomposition/nmf.py delete mode 100644 sklearn/decomposition/online_lda.py delete mode 100644 sklearn/decomposition/online_lda_fast.py delete mode 100644 sklearn/decomposition/pca.py delete mode 100644 sklearn/decomposition/sparse_pca.py delete mode 100644 sklearn/decomposition/truncated_svd.py delete mode 100644 sklearn/ensemble/bagging.py delete mode 100644 sklearn/ensemble/base.py delete mode 100644 sklearn/ensemble/forest.py delete mode 100644 sklearn/ensemble/gradient_boosting.py delete mode 100644 sklearn/ensemble/iforest.py delete mode 100644 sklearn/ensemble/voting.py delete mode 100644 sklearn/ensemble/weight_boosting.py delete mode 100644 sklearn/feature_extraction/dict_vectorizer.py delete mode 100644 sklearn/feature_extraction/hashing.py delete mode 100644 sklearn/feature_extraction/stop_words.py delete mode 100644 sklearn/feature_selection/base.py delete mode 100644 sklearn/feature_selection/from_model.py delete mode 100644 sklearn/feature_selection/mutual_info.py delete mode 100644 sklearn/feature_selection/rfe.py delete mode 100644 sklearn/feature_selection/univariate_selection.py delete mode 100644 sklearn/feature_selection/variance_threshold.py delete mode 100644 sklearn/gaussian_process/gpc.py delete mode 100644 sklearn/gaussian_process/gpr.py delete mode 100644 sklearn/inspection/partial_dependence.py delete mode 100644 sklearn/linear_model/base.py delete mode 100644 sklearn/linear_model/bayes.py delete mode 100644 sklearn/linear_model/cd_fast.py delete mode 100644 sklearn/linear_model/coordinate_descent.py delete mode 100644 sklearn/linear_model/huber.py delete mode 100644 sklearn/linear_model/least_angle.py delete mode 100644 sklearn/linear_model/logistic.py delete mode 100644 sklearn/linear_model/omp.py delete mode 100644 sklearn/linear_model/passive_aggressive.py delete mode 100644 sklearn/linear_model/perceptron.py delete mode 100644 sklearn/linear_model/ransac.py delete mode 100644 sklearn/linear_model/ridge.py delete mode 100644 sklearn/linear_model/sag.py delete mode 100644 sklearn/linear_model/sag_fast.py delete mode 100644 sklearn/linear_model/sgd_fast.py delete mode 100644 sklearn/linear_model/stochastic_gradient.py delete mode 100644 sklearn/linear_model/theil_sen.py delete mode 100644 sklearn/manifold/isomap.py delete mode 100644 sklearn/manifold/locally_linear.py delete mode 100644 sklearn/manifold/mds.py delete mode 100644 sklearn/manifold/spectral_embedding_.py delete mode 100644 sklearn/manifold/t_sne.py delete mode 100644 sklearn/metrics/base.py delete mode 100644 sklearn/metrics/classification.py delete mode 100644 sklearn/metrics/cluster/bicluster.py delete mode 100644 sklearn/metrics/cluster/expected_mutual_info_fast.py delete mode 100644 sklearn/metrics/cluster/supervised.py delete mode 100644 sklearn/metrics/cluster/unsupervised.py delete mode 100644 sklearn/metrics/pairwise_fast.py delete mode 100644 sklearn/metrics/ranking.py delete mode 100644 sklearn/metrics/regression.py delete mode 100644 sklearn/metrics/scorer.py delete mode 100644 sklearn/mixture/base.py delete mode 100644 sklearn/mixture/bayesian_mixture.py delete mode 100644 sklearn/mixture/gaussian_mixture.py delete mode 100644 sklearn/neighbors/ball_tree.py delete mode 100644 sklearn/neighbors/base.py delete mode 100644 sklearn/neighbors/classification.py delete mode 100644 sklearn/neighbors/dist_metrics.py delete mode 100644 sklearn/neighbors/graph.py delete mode 100644 sklearn/neighbors/kd_tree.py delete mode 100644 sklearn/neighbors/kde.py delete mode 100644 sklearn/neighbors/lof.py delete mode 100644 sklearn/neighbors/nca.py delete mode 100644 sklearn/neighbors/nearest_centroid.py delete mode 100644 sklearn/neighbors/quad_tree.py delete mode 100644 sklearn/neighbors/regression.py delete mode 100644 sklearn/neighbors/typedefs.py delete mode 100644 sklearn/neighbors/unsupervised.py delete mode 100644 sklearn/neural_network/multilayer_perceptron.py delete mode 100644 sklearn/neural_network/rbm.py delete mode 100644 sklearn/preprocessing/data.py delete mode 100644 sklearn/preprocessing/label.py delete mode 100644 sklearn/semi_supervised/label_propagation.py delete mode 100644 sklearn/svm/base.py delete mode 100644 sklearn/svm/bounds.py delete mode 100644 sklearn/svm/classes.py delete mode 100644 sklearn/svm/liblinear.py delete mode 100644 sklearn/svm/libsvm.py delete mode 100644 sklearn/svm/libsvm_sparse.py delete mode 100644 sklearn/tree/export.py delete mode 100644 sklearn/tree/tree.py delete mode 100644 sklearn/utils/fast_dict.py delete mode 100644 sklearn/utils/mocking.py delete mode 100644 sklearn/utils/seq_dataset.py delete mode 100644 sklearn/utils/testing.py delete mode 100644 sklearn/utils/weight_vector.py diff --git a/sklearn/cluster/affinity_propagation_.py b/sklearn/cluster/affinity_propagation_.py deleted file mode 100644 index 70a23039e864b..0000000000000 --- a/sklearn/cluster/affinity_propagation_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _affinity_propagation -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.affinity_propagation_' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_affinity_propagation, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/bicluster.py b/sklearn/cluster/bicluster.py deleted file mode 100644 index 94c2644695690..0000000000000 --- a/sklearn/cluster/bicluster.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bicluster -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.bicluster' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bicluster, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/birch.py b/sklearn/cluster/birch.py deleted file mode 100644 index ace7b925010e8..0000000000000 --- a/sklearn/cluster/birch.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _birch -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.birch' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_birch, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/dbscan_.py b/sklearn/cluster/dbscan_.py deleted file mode 100644 index 24db0131001a3..0000000000000 --- a/sklearn/cluster/dbscan_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _dbscan -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.dbscan_' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_dbscan, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/hierarchical.py b/sklearn/cluster/hierarchical.py deleted file mode 100644 index 6ec1e09237f7d..0000000000000 --- a/sklearn/cluster/hierarchical.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _agglomerative -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.hierarchical' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_agglomerative, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/k_means_.py b/sklearn/cluster/k_means_.py deleted file mode 100644 index 211ab35f73220..0000000000000 --- a/sklearn/cluster/k_means_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _kmeans -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.k_means_' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_kmeans, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/mean_shift_.py b/sklearn/cluster/mean_shift_.py deleted file mode 100644 index 51cb81c91098e..0000000000000 --- a/sklearn/cluster/mean_shift_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _mean_shift -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.mean_shift_' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_mean_shift, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/optics_.py b/sklearn/cluster/optics_.py deleted file mode 100644 index f9be0f3222e27..0000000000000 --- a/sklearn/cluster/optics_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _optics -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.optics_' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_optics, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cluster/spectral.py b/sklearn/cluster/spectral.py deleted file mode 100644 index 0fdb97e47bba3..0000000000000 --- a/sklearn/cluster/spectral.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _spectral -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cluster.spectral' -correct_import_path = 'sklearn.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_spectral, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/covariance/elliptic_envelope.py b/sklearn/covariance/elliptic_envelope.py deleted file mode 100644 index abaf0e1bccc3e..0000000000000 --- a/sklearn/covariance/elliptic_envelope.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _elliptic_envelope -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.covariance.elliptic_envelope' -correct_import_path = 'sklearn.covariance' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_elliptic_envelope, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/covariance/empirical_covariance_.py b/sklearn/covariance/empirical_covariance_.py deleted file mode 100644 index fab3bc3837506..0000000000000 --- a/sklearn/covariance/empirical_covariance_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _empirical_covariance -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.covariance.empirical_covariance_' -correct_import_path = 'sklearn.covariance' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_empirical_covariance, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/covariance/graph_lasso_.py b/sklearn/covariance/graph_lasso_.py deleted file mode 100644 index e301082a29e1b..0000000000000 --- a/sklearn/covariance/graph_lasso_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _graph_lasso -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.covariance.graph_lasso_' -correct_import_path = 'sklearn.covariance' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_graph_lasso, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/covariance/robust_covariance.py b/sklearn/covariance/robust_covariance.py deleted file mode 100644 index 94b3c5be7ed3f..0000000000000 --- a/sklearn/covariance/robust_covariance.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _robust_covariance -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.covariance.robust_covariance' -correct_import_path = 'sklearn.covariance' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_robust_covariance, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/covariance/shrunk_covariance_.py b/sklearn/covariance/shrunk_covariance_.py deleted file mode 100644 index d67715575a948..0000000000000 --- a/sklearn/covariance/shrunk_covariance_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _shrunk_covariance -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.covariance.shrunk_covariance_' -correct_import_path = 'sklearn.covariance' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_shrunk_covariance, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cross_decomposition/cca_.py b/sklearn/cross_decomposition/cca_.py deleted file mode 100644 index 18d2cd539f864..0000000000000 --- a/sklearn/cross_decomposition/cca_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _cca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cross_decomposition.cca_' -correct_import_path = 'sklearn.cross_decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_cca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/cross_decomposition/pls_.py b/sklearn/cross_decomposition/pls_.py deleted file mode 100644 index c1b41a65dad6a..0000000000000 --- a/sklearn/cross_decomposition/pls_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _pls -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.cross_decomposition.pls_' -correct_import_path = 'sklearn.cross_decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_pls, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/base.py b/sklearn/datasets/base.py deleted file mode 100644 index c105f05b4a45c..0000000000000 --- a/sklearn/datasets/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.base' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/california_housing.py b/sklearn/datasets/california_housing.py deleted file mode 100644 index 0f933df6315b6..0000000000000 --- a/sklearn/datasets/california_housing.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _california_housing -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.california_housing' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_california_housing, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/covtype.py b/sklearn/datasets/covtype.py deleted file mode 100644 index b0664fa91e6da..0000000000000 --- a/sklearn/datasets/covtype.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _covtype -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.covtype' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_covtype, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/kddcup99.py b/sklearn/datasets/kddcup99.py deleted file mode 100644 index ec929a29b9bec..0000000000000 --- a/sklearn/datasets/kddcup99.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _kddcup99 -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.kddcup99' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_kddcup99, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/lfw.py b/sklearn/datasets/lfw.py deleted file mode 100644 index 835bac8a4a28d..0000000000000 --- a/sklearn/datasets/lfw.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _lfw -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.lfw' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_lfw, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/olivetti_faces.py b/sklearn/datasets/olivetti_faces.py deleted file mode 100644 index db6804318a958..0000000000000 --- a/sklearn/datasets/olivetti_faces.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _olivetti_faces -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.olivetti_faces' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_olivetti_faces, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/openml.py b/sklearn/datasets/openml.py deleted file mode 100644 index e992f8d4f9ed7..0000000000000 --- a/sklearn/datasets/openml.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _openml -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.openml' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_openml, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/rcv1.py b/sklearn/datasets/rcv1.py deleted file mode 100644 index 0e61295e2fad4..0000000000000 --- a/sklearn/datasets/rcv1.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _rcv1 -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.rcv1' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_rcv1, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/samples_generator.py b/sklearn/datasets/samples_generator.py deleted file mode 100644 index 2dcd23bb739e8..0000000000000 --- a/sklearn/datasets/samples_generator.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _samples_generator -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.samples_generator' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_samples_generator, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/species_distributions.py b/sklearn/datasets/species_distributions.py deleted file mode 100644 index cee25d326704f..0000000000000 --- a/sklearn/datasets/species_distributions.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _species_distributions -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.species_distributions' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_species_distributions, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/svmlight_format.py b/sklearn/datasets/svmlight_format.py deleted file mode 100644 index 3163d3ee41237..0000000000000 --- a/sklearn/datasets/svmlight_format.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _svmlight_format_io -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.svmlight_format' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_svmlight_format_io, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/datasets/twenty_newsgroups.py b/sklearn/datasets/twenty_newsgroups.py deleted file mode 100644 index 300581e751cbd..0000000000000 --- a/sklearn/datasets/twenty_newsgroups.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _twenty_newsgroups -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.datasets.twenty_newsgroups' -correct_import_path = 'sklearn.datasets' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_twenty_newsgroups, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/base.py b/sklearn/decomposition/base.py deleted file mode 100644 index d4d2065eeaaba..0000000000000 --- a/sklearn/decomposition/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.base' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/cdnmf_fast.py b/sklearn/decomposition/cdnmf_fast.py deleted file mode 100644 index 26ab78a0de732..0000000000000 --- a/sklearn/decomposition/cdnmf_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _cdnmf_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.cdnmf_fast' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_cdnmf_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py deleted file mode 100644 index 6b933336a58a6..0000000000000 --- a/sklearn/decomposition/dict_learning.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _dict_learning -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.dict_learning' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_dict_learning, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/factor_analysis.py b/sklearn/decomposition/factor_analysis.py deleted file mode 100644 index 992a72ec8b1c4..0000000000000 --- a/sklearn/decomposition/factor_analysis.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _factor_analysis -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.factor_analysis' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_factor_analysis, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/fastica_.py b/sklearn/decomposition/fastica_.py deleted file mode 100644 index 0e171aaf34374..0000000000000 --- a/sklearn/decomposition/fastica_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _fastica -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.fastica_' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_fastica, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/incremental_pca.py b/sklearn/decomposition/incremental_pca.py deleted file mode 100644 index 6914ac21ce370..0000000000000 --- a/sklearn/decomposition/incremental_pca.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _incremental_pca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.incremental_pca' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_incremental_pca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/kernel_pca.py b/sklearn/decomposition/kernel_pca.py deleted file mode 100644 index 69a4e9d50b51e..0000000000000 --- a/sklearn/decomposition/kernel_pca.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _kernel_pca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.kernel_pca' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_kernel_pca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/nmf.py b/sklearn/decomposition/nmf.py deleted file mode 100644 index 857c21108f6b5..0000000000000 --- a/sklearn/decomposition/nmf.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _nmf -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.nmf' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_nmf, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/online_lda.py b/sklearn/decomposition/online_lda.py deleted file mode 100644 index 4e0132075fc3b..0000000000000 --- a/sklearn/decomposition/online_lda.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _lda -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.online_lda' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_lda, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/online_lda_fast.py b/sklearn/decomposition/online_lda_fast.py deleted file mode 100644 index 95e23355447c0..0000000000000 --- a/sklearn/decomposition/online_lda_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _online_lda_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.online_lda_fast' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_online_lda_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/pca.py b/sklearn/decomposition/pca.py deleted file mode 100644 index 3a6e2633a4360..0000000000000 --- a/sklearn/decomposition/pca.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _pca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.pca' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_pca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/sparse_pca.py b/sklearn/decomposition/sparse_pca.py deleted file mode 100644 index f4edf11d2d3c7..0000000000000 --- a/sklearn/decomposition/sparse_pca.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _sparse_pca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.sparse_pca' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_sparse_pca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/decomposition/truncated_svd.py b/sklearn/decomposition/truncated_svd.py deleted file mode 100644 index 9d4912d85f58e..0000000000000 --- a/sklearn/decomposition/truncated_svd.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _truncated_svd -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.decomposition.truncated_svd' -correct_import_path = 'sklearn.decomposition' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_truncated_svd, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/bagging.py b/sklearn/ensemble/bagging.py deleted file mode 100644 index 048623558a26e..0000000000000 --- a/sklearn/ensemble/bagging.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bagging -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.bagging' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bagging, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/base.py b/sklearn/ensemble/base.py deleted file mode 100644 index b8e6a5391ce55..0000000000000 --- a/sklearn/ensemble/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.base' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/forest.py b/sklearn/ensemble/forest.py deleted file mode 100644 index f8efbb0ac4048..0000000000000 --- a/sklearn/ensemble/forest.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _forest -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.forest' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_forest, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/gradient_boosting.py b/sklearn/ensemble/gradient_boosting.py deleted file mode 100644 index e1e14a5a22d52..0000000000000 --- a/sklearn/ensemble/gradient_boosting.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _gb -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.gradient_boosting' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_gb, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/iforest.py b/sklearn/ensemble/iforest.py deleted file mode 100644 index d8d041eae185f..0000000000000 --- a/sklearn/ensemble/iforest.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _iforest -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.iforest' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_iforest, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/voting.py b/sklearn/ensemble/voting.py deleted file mode 100644 index 6dc2420add75d..0000000000000 --- a/sklearn/ensemble/voting.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _voting -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.voting' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_voting, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/ensemble/weight_boosting.py b/sklearn/ensemble/weight_boosting.py deleted file mode 100644 index f6621080670f2..0000000000000 --- a/sklearn/ensemble/weight_boosting.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _weight_boosting -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.ensemble.weight_boosting' -correct_import_path = 'sklearn.ensemble' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_weight_boosting, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_extraction/dict_vectorizer.py b/sklearn/feature_extraction/dict_vectorizer.py deleted file mode 100644 index 5917a2f21bcec..0000000000000 --- a/sklearn/feature_extraction/dict_vectorizer.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _dict_vectorizer -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_extraction.dict_vectorizer' -correct_import_path = 'sklearn.feature_extraction' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_dict_vectorizer, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_extraction/hashing.py b/sklearn/feature_extraction/hashing.py deleted file mode 100644 index 289c2cc27b4fb..0000000000000 --- a/sklearn/feature_extraction/hashing.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _hash -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_extraction.hashing' -correct_import_path = 'sklearn.feature_extraction' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_hash, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_extraction/stop_words.py b/sklearn/feature_extraction/stop_words.py deleted file mode 100644 index 4f387a6ff91e9..0000000000000 --- a/sklearn/feature_extraction/stop_words.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _stop_words -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_extraction.stop_words' -correct_import_path = 'sklearn.feature_extraction.text' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_stop_words, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/base.py b/sklearn/feature_selection/base.py deleted file mode 100644 index c4526bc2c2f93..0000000000000 --- a/sklearn/feature_selection/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.base' -correct_import_path = 'sklearn.feature_selection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/from_model.py b/sklearn/feature_selection/from_model.py deleted file mode 100644 index 02d8758776d15..0000000000000 --- a/sklearn/feature_selection/from_model.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _from_model -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.from_model' -correct_import_path = 'sklearn.feature_selection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_from_model, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/mutual_info.py b/sklearn/feature_selection/mutual_info.py deleted file mode 100644 index ff21d649c91cf..0000000000000 --- a/sklearn/feature_selection/mutual_info.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _mutual_info -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.mutual_info' -correct_import_path = 'sklearn.feature_selection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_mutual_info, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/rfe.py b/sklearn/feature_selection/rfe.py deleted file mode 100644 index 80a4da103cdd9..0000000000000 --- a/sklearn/feature_selection/rfe.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _rfe -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.rfe' -correct_import_path = 'sklearn.feature_selection.rfe' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_rfe, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/univariate_selection.py b/sklearn/feature_selection/univariate_selection.py deleted file mode 100644 index e178d4601b5a2..0000000000000 --- a/sklearn/feature_selection/univariate_selection.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _univariate_selection -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.univariate_selection' -correct_import_path = 'sklearn.feature_selection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_univariate_selection, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/feature_selection/variance_threshold.py b/sklearn/feature_selection/variance_threshold.py deleted file mode 100644 index c47b3980798e8..0000000000000 --- a/sklearn/feature_selection/variance_threshold.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _variance_threshold -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.feature_selection.variance_threshold' -correct_import_path = 'sklearn.feature_selection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_variance_threshold, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/gaussian_process/gpc.py b/sklearn/gaussian_process/gpc.py deleted file mode 100644 index 8fd44862fe260..0000000000000 --- a/sklearn/gaussian_process/gpc.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _gpc -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.gaussian_process.gpc' -correct_import_path = 'sklearn.gaussian_process' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_gpc, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/gaussian_process/gpr.py b/sklearn/gaussian_process/gpr.py deleted file mode 100644 index 19d2c20705cf4..0000000000000 --- a/sklearn/gaussian_process/gpr.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _gpr -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.gaussian_process.gpr' -correct_import_path = 'sklearn.gaussian_process' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_gpr, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/inspection/partial_dependence.py b/sklearn/inspection/partial_dependence.py deleted file mode 100644 index 7a92356e54fed..0000000000000 --- a/sklearn/inspection/partial_dependence.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _partial_dependence -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.inspection.partial_dependence' -correct_import_path = 'sklearn.inspection' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_partial_dependence, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/base.py b/sklearn/linear_model/base.py deleted file mode 100644 index 67c38d4f1ed5f..0000000000000 --- a/sklearn/linear_model/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.base' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/bayes.py b/sklearn/linear_model/bayes.py deleted file mode 100644 index 92e8e95c669bd..0000000000000 --- a/sklearn/linear_model/bayes.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bayes -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.bayes' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bayes, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/cd_fast.py b/sklearn/linear_model/cd_fast.py deleted file mode 100644 index 717ca0e656209..0000000000000 --- a/sklearn/linear_model/cd_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _cd_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.cd_fast' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_cd_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/coordinate_descent.py b/sklearn/linear_model/coordinate_descent.py deleted file mode 100644 index b0a3039ece192..0000000000000 --- a/sklearn/linear_model/coordinate_descent.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _coordinate_descent -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.coordinate_descent' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_coordinate_descent, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py deleted file mode 100644 index 5c039d1dfcde3..0000000000000 --- a/sklearn/linear_model/huber.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _huber -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.huber' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_huber, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/least_angle.py b/sklearn/linear_model/least_angle.py deleted file mode 100644 index f92f3ae5298ed..0000000000000 --- a/sklearn/linear_model/least_angle.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _least_angle -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.least_angle' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_least_angle, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py deleted file mode 100644 index 361103402d2a9..0000000000000 --- a/sklearn/linear_model/logistic.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _logistic -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.logistic' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_logistic, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/omp.py b/sklearn/linear_model/omp.py deleted file mode 100644 index 0cf7015337f31..0000000000000 --- a/sklearn/linear_model/omp.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _omp -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.omp' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_omp, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/passive_aggressive.py b/sklearn/linear_model/passive_aggressive.py deleted file mode 100644 index 0c89a758a8011..0000000000000 --- a/sklearn/linear_model/passive_aggressive.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _passive_aggressive -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.passive_aggressive' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_passive_aggressive, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/perceptron.py b/sklearn/linear_model/perceptron.py deleted file mode 100644 index 5a22dc7f85fb2..0000000000000 --- a/sklearn/linear_model/perceptron.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _perceptron -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.perceptron' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_perceptron, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/ransac.py b/sklearn/linear_model/ransac.py deleted file mode 100644 index 1c66278a05c99..0000000000000 --- a/sklearn/linear_model/ransac.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _ransac -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.ransac' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_ransac, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/ridge.py b/sklearn/linear_model/ridge.py deleted file mode 100644 index 0081c8a90fe13..0000000000000 --- a/sklearn/linear_model/ridge.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _ridge -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.ridge' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_ridge, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/sag.py b/sklearn/linear_model/sag.py deleted file mode 100644 index f3a9a7d2806a8..0000000000000 --- a/sklearn/linear_model/sag.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _sag -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.sag' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_sag, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/sag_fast.py b/sklearn/linear_model/sag_fast.py deleted file mode 100644 index 998657acaffd1..0000000000000 --- a/sklearn/linear_model/sag_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _sag_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.sag_fast' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_sag_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/sgd_fast.py b/sklearn/linear_model/sgd_fast.py deleted file mode 100644 index 708d23c61bf3a..0000000000000 --- a/sklearn/linear_model/sgd_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _sgd_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.sgd_fast' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_sgd_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/stochastic_gradient.py b/sklearn/linear_model/stochastic_gradient.py deleted file mode 100644 index 4d93f7bbb2d04..0000000000000 --- a/sklearn/linear_model/stochastic_gradient.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _stochastic_gradient -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.stochastic_gradient' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_stochastic_gradient, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/linear_model/theil_sen.py b/sklearn/linear_model/theil_sen.py deleted file mode 100644 index e167df81a7709..0000000000000 --- a/sklearn/linear_model/theil_sen.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _theil_sen -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.linear_model.theil_sen' -correct_import_path = 'sklearn.linear_model' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_theil_sen, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/manifold/isomap.py b/sklearn/manifold/isomap.py deleted file mode 100644 index f2498d1a46554..0000000000000 --- a/sklearn/manifold/isomap.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _isomap -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.manifold.isomap' -correct_import_path = 'sklearn.manifold' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_isomap, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/manifold/locally_linear.py b/sklearn/manifold/locally_linear.py deleted file mode 100644 index f0cd12e7a4a4c..0000000000000 --- a/sklearn/manifold/locally_linear.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _locally_linear -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.manifold.locally_linear' -correct_import_path = 'sklearn.manifold' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_locally_linear, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/manifold/mds.py b/sklearn/manifold/mds.py deleted file mode 100644 index 507e2190dbe7f..0000000000000 --- a/sklearn/manifold/mds.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _mds -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.manifold.mds' -correct_import_path = 'sklearn.manifold' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_mds, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/manifold/spectral_embedding_.py b/sklearn/manifold/spectral_embedding_.py deleted file mode 100644 index 275d6170b2ae8..0000000000000 --- a/sklearn/manifold/spectral_embedding_.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _spectral_embedding -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.manifold.spectral_embedding_' -correct_import_path = 'sklearn.manifold' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_spectral_embedding, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/manifold/t_sne.py b/sklearn/manifold/t_sne.py deleted file mode 100644 index 7f3bbdc9aabb8..0000000000000 --- a/sklearn/manifold/t_sne.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _t_sne -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.manifold.t_sne' -correct_import_path = 'sklearn.manifold' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_t_sne, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/base.py b/sklearn/metrics/base.py deleted file mode 100644 index 346acf04d62c5..0000000000000 --- a/sklearn/metrics/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.base' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/classification.py b/sklearn/metrics/classification.py deleted file mode 100644 index f80e63fb1a653..0000000000000 --- a/sklearn/metrics/classification.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _classification -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.classification' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_classification, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/cluster/bicluster.py b/sklearn/metrics/cluster/bicluster.py deleted file mode 100644 index 55a892499ab1e..0000000000000 --- a/sklearn/metrics/cluster/bicluster.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bicluster -from ...externals._pep562 import Pep562 -from ...utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.cluster.bicluster' -correct_import_path = 'sklearn.metrics.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bicluster, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/cluster/expected_mutual_info_fast.py b/sklearn/metrics/cluster/expected_mutual_info_fast.py deleted file mode 100644 index 59f870593ba77..0000000000000 --- a/sklearn/metrics/cluster/expected_mutual_info_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _expected_mutual_info_fast -from ...externals._pep562 import Pep562 -from ...utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.cluster.expected_mutual_info_fast' -correct_import_path = 'sklearn.metrics.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_expected_mutual_info_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/cluster/supervised.py b/sklearn/metrics/cluster/supervised.py deleted file mode 100644 index 8d49bebbdd16c..0000000000000 --- a/sklearn/metrics/cluster/supervised.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _supervised -from ...externals._pep562 import Pep562 -from ...utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.cluster.supervised' -correct_import_path = 'sklearn.metrics.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_supervised, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/cluster/unsupervised.py b/sklearn/metrics/cluster/unsupervised.py deleted file mode 100644 index c160a2dda0965..0000000000000 --- a/sklearn/metrics/cluster/unsupervised.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _unsupervised -from ...externals._pep562 import Pep562 -from ...utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.cluster.unsupervised' -correct_import_path = 'sklearn.metrics.cluster' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_unsupervised, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/pairwise_fast.py b/sklearn/metrics/pairwise_fast.py deleted file mode 100644 index 5235e3987c459..0000000000000 --- a/sklearn/metrics/pairwise_fast.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _pairwise_fast -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.pairwise_fast' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_pairwise_fast, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/ranking.py b/sklearn/metrics/ranking.py deleted file mode 100644 index f32e6467ef807..0000000000000 --- a/sklearn/metrics/ranking.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _ranking -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.ranking' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_ranking, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/regression.py b/sklearn/metrics/regression.py deleted file mode 100644 index c287d31c71126..0000000000000 --- a/sklearn/metrics/regression.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _regression -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.regression' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_regression, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/metrics/scorer.py b/sklearn/metrics/scorer.py deleted file mode 100644 index 53f7b092728b4..0000000000000 --- a/sklearn/metrics/scorer.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _scorer -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.metrics.scorer' -correct_import_path = 'sklearn.metrics' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_scorer, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/mixture/base.py b/sklearn/mixture/base.py deleted file mode 100644 index 0c13252c130e5..0000000000000 --- a/sklearn/mixture/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.mixture.base' -correct_import_path = 'sklearn.mixture' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/mixture/bayesian_mixture.py b/sklearn/mixture/bayesian_mixture.py deleted file mode 100644 index 8ed280e560bd2..0000000000000 --- a/sklearn/mixture/bayesian_mixture.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bayesian_mixture -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.mixture.bayesian_mixture' -correct_import_path = 'sklearn.mixture' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bayesian_mixture, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/mixture/gaussian_mixture.py b/sklearn/mixture/gaussian_mixture.py deleted file mode 100644 index 8afd366d8890d..0000000000000 --- a/sklearn/mixture/gaussian_mixture.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _gaussian_mixture -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.mixture.gaussian_mixture' -correct_import_path = 'sklearn.mixture' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_gaussian_mixture, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 00757cd3bcfe0..9987c01b13187 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -684,13 +684,10 @@ def predict_proba(self, X): Returns ------- - Y_prob : list of n_outputs ndarray of shape (n_samples, n_classes) - The class probabilities of the input samples. The order of the - classes for each output corresponds to the respective entry of - the attribute `classes_`. + Y_prob : array-like of shape (n_samples, n_classes) """ X = check_array(X, accept_sparse=True) - Y_prob_chain = [] + Y_prob_chain = np.zeros((X.shape[0], len(self.estimators_))) Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -698,11 +695,11 @@ def predict_proba(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_prob_chain.append(estimator.predict_proba(X_aug)) + Y_prob_chain[:, chain_idx] = estimator.predict_proba(X_aug)[:, 1] Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_prob = [Y_prob_chain[i] for i in inv_order] + Y_prob = Y_prob_chain[:, inv_order] return Y_prob @@ -716,12 +713,11 @@ def decision_function(self, X): Returns ------- - Y_decision : list of n_outputs ndarray of shape (n_samples, n_classes) - Decision function of the input samples for each model - in the chain. The order of the classes for each output corresponds - to the respective entry of the attribute `classes_`. + Y_decision : array-like of shape (n_samples, n_classes) + Returns the decision function of the sample for each model + in the chain. """ - Y_decision_chain = [] + Y_decision_chain = np.zeros((X.shape[0], len(self.estimators_))) Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -729,17 +725,18 @@ def decision_function(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_decision_chain.append(estimator.decision_function(X_aug)) + Y_decision_chain[:, chain_idx] = estimator.decision_function(X_aug) Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_decision = [Y_decision_chain[i] for i in inv_order] + Y_decision = Y_decision_chain[:, inv_order] return Y_decision def _more_tags(self): - return {'_skip_test': True} + return {'_skip_test': True, + 'multioutput_only': True} class RegressorChain(MetaEstimatorMixin, RegressorMixin, _BaseChain): diff --git a/sklearn/neighbors/ball_tree.py b/sklearn/neighbors/ball_tree.py deleted file mode 100644 index 5a1b71d813fc5..0000000000000 --- a/sklearn/neighbors/ball_tree.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _ball_tree -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.ball_tree' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_ball_tree, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/base.py b/sklearn/neighbors/base.py deleted file mode 100644 index 2d1e51173c001..0000000000000 --- a/sklearn/neighbors/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.base' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/classification.py b/sklearn/neighbors/classification.py deleted file mode 100644 index 47b7847edeadf..0000000000000 --- a/sklearn/neighbors/classification.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _classification -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.classification' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_classification, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/dist_metrics.py b/sklearn/neighbors/dist_metrics.py deleted file mode 100644 index 4588e7d65708f..0000000000000 --- a/sklearn/neighbors/dist_metrics.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _dist_metrics -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.dist_metrics' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_dist_metrics, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/graph.py b/sklearn/neighbors/graph.py deleted file mode 100644 index 9ea79bbb98419..0000000000000 --- a/sklearn/neighbors/graph.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _graph -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.graph' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_graph, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/kd_tree.py b/sklearn/neighbors/kd_tree.py deleted file mode 100644 index ed88c400a2973..0000000000000 --- a/sklearn/neighbors/kd_tree.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _kd_tree -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.kd_tree' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_kd_tree, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/kde.py b/sklearn/neighbors/kde.py deleted file mode 100644 index 2d67d03dae378..0000000000000 --- a/sklearn/neighbors/kde.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _kde -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.kde' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_kde, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/lof.py b/sklearn/neighbors/lof.py deleted file mode 100644 index dd7dbf3cc1f44..0000000000000 --- a/sklearn/neighbors/lof.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _lof -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.lof' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_lof, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/nca.py b/sklearn/neighbors/nca.py deleted file mode 100644 index f1f669c289524..0000000000000 --- a/sklearn/neighbors/nca.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _nca -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.nca' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_nca, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/nearest_centroid.py b/sklearn/neighbors/nearest_centroid.py deleted file mode 100644 index a9dd32ad18898..0000000000000 --- a/sklearn/neighbors/nearest_centroid.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _nearest_centroid -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.nearest_centroid' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_nearest_centroid, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/quad_tree.py b/sklearn/neighbors/quad_tree.py deleted file mode 100644 index 7c44122a2219c..0000000000000 --- a/sklearn/neighbors/quad_tree.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _quad_tree -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.quad_tree' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_quad_tree, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/regression.py b/sklearn/neighbors/regression.py deleted file mode 100644 index 740572148f10c..0000000000000 --- a/sklearn/neighbors/regression.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _regression -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.regression' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_regression, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/typedefs.py b/sklearn/neighbors/typedefs.py deleted file mode 100644 index 8baa0171db8f5..0000000000000 --- a/sklearn/neighbors/typedefs.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _typedefs -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.typedefs' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_typedefs, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neighbors/unsupervised.py b/sklearn/neighbors/unsupervised.py deleted file mode 100644 index 153046fbc1a97..0000000000000 --- a/sklearn/neighbors/unsupervised.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _unsupervised -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neighbors.unsupervised' -correct_import_path = 'sklearn.neighbors' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_unsupervised, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neural_network/multilayer_perceptron.py b/sklearn/neural_network/multilayer_perceptron.py deleted file mode 100644 index d347a9982bdbb..0000000000000 --- a/sklearn/neural_network/multilayer_perceptron.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _multilayer_perceptron -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neural_network.multilayer_perceptron' -correct_import_path = 'sklearn.neural_network' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_multilayer_perceptron, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/neural_network/rbm.py b/sklearn/neural_network/rbm.py deleted file mode 100644 index 9b227b3bd2301..0000000000000 --- a/sklearn/neural_network/rbm.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _rbm -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.neural_network.rbm' -correct_import_path = 'sklearn.neural_network' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_rbm, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/preprocessing/data.py b/sklearn/preprocessing/data.py deleted file mode 100644 index 5b928ec8b30d2..0000000000000 --- a/sklearn/preprocessing/data.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _data -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.preprocessing.data' -correct_import_path = 'sklearn.preprocessing' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_data, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/preprocessing/label.py b/sklearn/preprocessing/label.py deleted file mode 100644 index 88c55aa64687c..0000000000000 --- a/sklearn/preprocessing/label.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _label -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.preprocessing.label' -correct_import_path = 'sklearn.preprocessing' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_label, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/semi_supervised/label_propagation.py b/sklearn/semi_supervised/label_propagation.py deleted file mode 100644 index 1a84810702f0b..0000000000000 --- a/sklearn/semi_supervised/label_propagation.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _label_propagation -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.semi_supervised.label_propagation' -correct_import_path = 'sklearn.semi_supervised' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_label_propagation, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/base.py b/sklearn/svm/base.py deleted file mode 100644 index 6f30bd288959e..0000000000000 --- a/sklearn/svm/base.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _base -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.base' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_base, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/bounds.py b/sklearn/svm/bounds.py deleted file mode 100644 index fdf580502b696..0000000000000 --- a/sklearn/svm/bounds.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _bounds -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.bounds' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_bounds, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/classes.py b/sklearn/svm/classes.py deleted file mode 100644 index 293af4a8704e0..0000000000000 --- a/sklearn/svm/classes.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _classes -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.classes' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_classes, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/liblinear.py b/sklearn/svm/liblinear.py deleted file mode 100644 index 215c6475513e4..0000000000000 --- a/sklearn/svm/liblinear.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _liblinear -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.liblinear' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_liblinear, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/libsvm.py b/sklearn/svm/libsvm.py deleted file mode 100644 index 55e60db580176..0000000000000 --- a/sklearn/svm/libsvm.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _libsvm -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.libsvm' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_libsvm, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/svm/libsvm_sparse.py b/sklearn/svm/libsvm_sparse.py deleted file mode 100644 index 7a3fa563d8278..0000000000000 --- a/sklearn/svm/libsvm_sparse.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _libsvm_sparse -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.svm.libsvm_sparse' -correct_import_path = 'sklearn.svm' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_libsvm_sparse, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/tests/test_multioutput.py b/sklearn/tests/test_multioutput.py index 65fabd0cd1b7a..edfcdef1bf89c 100644 --- a/sklearn/tests/test_multioutput.py +++ b/sklearn/tests/test_multioutput.py @@ -424,9 +424,8 @@ def test_classifier_chain_fit_and_predict_with_linear_svc(): assert Y_pred.shape == Y.shape Y_decision = classifier_chain.decision_function(X) - Y_binary = [Y_decision[i] >= 0 for i in range(Y.shape[1])] - Y_binary = np.asarray(Y_binary).T + Y_binary = (Y_decision >= 0) assert_array_equal(Y_binary, Y_pred) assert not hasattr(classifier_chain, 'predict_proba') @@ -482,8 +481,7 @@ def test_base_chain_fit_and_predict(): list(range(X.shape[1], X.shape[1] + Y.shape[1]))) Y_prob = chains[1].predict_proba(X) - Y_binary = [np.argmax(Y_prob[i], axis=1) for i in range(Y.shape[1])] - Y_binary = np.asarray(Y_binary).T + Y_binary = (Y_prob >= .5) assert_array_equal(Y_binary, Y_pred) assert isinstance(chains[1], ClassifierMixin) diff --git a/sklearn/tree/export.py b/sklearn/tree/export.py deleted file mode 100644 index f04b2b0d9a839..0000000000000 --- a/sklearn/tree/export.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _export -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.tree.export' -correct_import_path = 'sklearn.tree' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_export, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/tree/tree.py b/sklearn/tree/tree.py deleted file mode 100644 index bb7b9d1f9e97c..0000000000000 --- a/sklearn/tree/tree.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _classes -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.tree.tree' -correct_import_path = 'sklearn.tree' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_classes, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/utils/fast_dict.py b/sklearn/utils/fast_dict.py deleted file mode 100644 index 6c452434dc851..0000000000000 --- a/sklearn/utils/fast_dict.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _fast_dict -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.utils.fast_dict' -correct_import_path = 'sklearn.utils' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_fast_dict, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/utils/mocking.py b/sklearn/utils/mocking.py deleted file mode 100644 index 3e4b419fd0f37..0000000000000 --- a/sklearn/utils/mocking.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _mocking -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.utils.mocking' -correct_import_path = 'sklearn.utils' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_mocking, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/utils/seq_dataset.py b/sklearn/utils/seq_dataset.py deleted file mode 100644 index 15e47bad6c686..0000000000000 --- a/sklearn/utils/seq_dataset.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _seq_dataset -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.utils.seq_dataset' -correct_import_path = 'sklearn.utils' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_seq_dataset, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py deleted file mode 100644 index 8b275f3b2b98f..0000000000000 --- a/sklearn/utils/testing.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _testing -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.utils.testing' -correct_import_path = 'sklearn.utils' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_testing, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) diff --git a/sklearn/utils/weight_vector.py b/sklearn/utils/weight_vector.py deleted file mode 100644 index 91e1a5382d699..0000000000000 --- a/sklearn/utils/weight_vector.py +++ /dev/null @@ -1,17 +0,0 @@ - -# THIS FILE WAS AUTOMATICALLY GENERATED BY deprecated_modules.py -import sys -from . import _weight_vector -from ..externals._pep562 import Pep562 -from ..utils.deprecation import _raise_dep_warning_if_not_pytest - -deprecated_path = 'sklearn.utils.weight_vector' -correct_import_path = 'sklearn.utils' - -_raise_dep_warning_if_not_pytest(deprecated_path, correct_import_path) - -def __getattr__(name): - return getattr(_weight_vector, name) - -if not sys.version_info >= (3, 7): - Pep562(__name__) From 41e8ffa4586d3c051d97571cf57162a3bdce4753 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 08:35:55 +0000 Subject: [PATCH 11/17] Restore changed files --- sklearn/multioutput.py | 27 +++++++++++++++------------ sklearn/tests/test_multioutput.py | 6 ++++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 9987c01b13187..00757cd3bcfe0 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -684,10 +684,13 @@ def predict_proba(self, X): Returns ------- - Y_prob : array-like of shape (n_samples, n_classes) + Y_prob : list of n_outputs ndarray of shape (n_samples, n_classes) + The class probabilities of the input samples. The order of the + classes for each output corresponds to the respective entry of + the attribute `classes_`. """ X = check_array(X, accept_sparse=True) - Y_prob_chain = np.zeros((X.shape[0], len(self.estimators_))) + Y_prob_chain = [] Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -695,11 +698,11 @@ def predict_proba(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_prob_chain[:, chain_idx] = estimator.predict_proba(X_aug)[:, 1] + Y_prob_chain.append(estimator.predict_proba(X_aug)) Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_prob = Y_prob_chain[:, inv_order] + Y_prob = [Y_prob_chain[i] for i in inv_order] return Y_prob @@ -713,11 +716,12 @@ def decision_function(self, X): Returns ------- - Y_decision : array-like of shape (n_samples, n_classes) - Returns the decision function of the sample for each model - in the chain. + Y_decision : list of n_outputs ndarray of shape (n_samples, n_classes) + Decision function of the input samples for each model + in the chain. The order of the classes for each output corresponds + to the respective entry of the attribute `classes_`. """ - Y_decision_chain = np.zeros((X.shape[0], len(self.estimators_))) + Y_decision_chain = [] Y_pred_chain = np.zeros((X.shape[0], len(self.estimators_))) for chain_idx, estimator in enumerate(self.estimators_): previous_predictions = Y_pred_chain[:, :chain_idx] @@ -725,18 +729,17 @@ def decision_function(self, X): X_aug = sp.hstack((X, previous_predictions)) else: X_aug = np.hstack((X, previous_predictions)) - Y_decision_chain[:, chain_idx] = estimator.decision_function(X_aug) + Y_decision_chain.append(estimator.decision_function(X_aug)) Y_pred_chain[:, chain_idx] = estimator.predict(X_aug) inv_order = np.empty_like(self.order_) inv_order[self.order_] = np.arange(len(self.order_)) - Y_decision = Y_decision_chain[:, inv_order] + Y_decision = [Y_decision_chain[i] for i in inv_order] return Y_decision def _more_tags(self): - return {'_skip_test': True, - 'multioutput_only': True} + return {'_skip_test': True} class RegressorChain(MetaEstimatorMixin, RegressorMixin, _BaseChain): diff --git a/sklearn/tests/test_multioutput.py b/sklearn/tests/test_multioutput.py index edfcdef1bf89c..65fabd0cd1b7a 100644 --- a/sklearn/tests/test_multioutput.py +++ b/sklearn/tests/test_multioutput.py @@ -424,8 +424,9 @@ def test_classifier_chain_fit_and_predict_with_linear_svc(): assert Y_pred.shape == Y.shape Y_decision = classifier_chain.decision_function(X) + Y_binary = [Y_decision[i] >= 0 for i in range(Y.shape[1])] + Y_binary = np.asarray(Y_binary).T - Y_binary = (Y_decision >= 0) assert_array_equal(Y_binary, Y_pred) assert not hasattr(classifier_chain, 'predict_proba') @@ -481,7 +482,8 @@ def test_base_chain_fit_and_predict(): list(range(X.shape[1], X.shape[1] + Y.shape[1]))) Y_prob = chains[1].predict_proba(X) - Y_binary = (Y_prob >= .5) + Y_binary = [np.argmax(Y_prob[i], axis=1) for i in range(Y.shape[1])] + Y_binary = np.asarray(Y_binary).T assert_array_equal(Y_binary, Y_pred) assert isinstance(chains[1], ClassifierMixin) From 4d34d089b4352a1f9a88ab717149e10113248d7d Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 09:44:05 +0000 Subject: [PATCH 12/17] Update ClassifierChain doc example output --- sklearn/multioutput.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index 00757cd3bcfe0..a6e30969710c8 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -638,9 +638,15 @@ class labels for each estimator in the chain. [1., 0., 0.], [0., 1., 0.]]) >>> chain.predict_proba(X_test) - array([[0.8387..., 0.9431..., 0.4576...], - [0.8878..., 0.3684..., 0.2640...], - [0.0321..., 0.9935..., 0.0625...]]) +[array([[0.16126878, 0.83873122], + [0.11218344, 0.88781656], + [0.96786386, 0.03213614]]), +array([[0.05685769, 0.94314231], + [0.6315953 , 0.3684047 ], + [0.00640331, 0.99359669]]), +array([[0.5423851 , 0.4576149 ], + [0.73590132, 0.26409868], + [0.93742079, 0.06257921]])] See Also -------- From d3677ad88a943e771a7baaf448f58f0bba6f1f1e Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 09:45:41 +0000 Subject: [PATCH 13/17] Nitpick --- sklearn/multioutput.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sklearn/multioutput.py b/sklearn/multioutput.py index a6e30969710c8..27c143074cd72 100644 --- a/sklearn/multioutput.py +++ b/sklearn/multioutput.py @@ -638,13 +638,13 @@ class labels for each estimator in the chain. [1., 0., 0.], [0., 1., 0.]]) >>> chain.predict_proba(X_test) -[array([[0.16126878, 0.83873122], + [array([[0.16126878, 0.83873122], [0.11218344, 0.88781656], [0.96786386, 0.03213614]]), -array([[0.05685769, 0.94314231], + array([[0.05685769, 0.94314231], [0.6315953 , 0.3684047 ], [0.00640331, 0.99359669]]), -array([[0.5423851 , 0.4576149 ], + array([[0.5423851 , 0.4576149 ], [0.73590132, 0.26409868], [0.93742079, 0.06257921]])] From bd8493fdfc817493bee837829a3158a231bf98b6 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 09:52:57 +0000 Subject: [PATCH 14/17] Update whatsnew --- doc/whats_new/v1.0.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 382ff363e0db7..7b9c2182ca815 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -115,6 +115,14 @@ Changelog class methods and will be removed in 1.2. :pr:`18543` by `Guillaume Lemaitre`_. +:mod:`sklearn.multioutput` +...................... + +- |Fix| :func:`multioutput.ClassifierChain.decision_function` and + :func:`multioutput.ClassifierChain.predict_proba` now both return a list of + ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by + :user:`Agamemnon Krasoulis `. + :mod:`sklearn.naive_bayes` .......................... From d5617563a944d24a3b940bdba6cfbd6b5f1df80f Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 10:21:16 +0000 Subject: [PATCH 15/17] Fix whatsnew formatting issue --- doc/whats_new/v1.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 7b9c2182ca815..004762498d49e 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -116,7 +116,7 @@ Changelog :pr:`18543` by `Guillaume Lemaitre`_. :mod:`sklearn.multioutput` -...................... +.......................... - |Fix| :func:`multioutput.ClassifierChain.decision_function` and :func:`multioutput.ClassifierChain.predict_proba` now both return a list of From f01981025de073672336f0edea5c6ade9f7c9e82 Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Sun, 31 Jan 2021 11:16:25 +0000 Subject: [PATCH 16/17] Update in 0.24 vs. 1.0 --- doc/whats_new/v0.24.rst | 5 +++++ doc/whats_new/v1.0.rst | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/whats_new/v0.24.rst b/doc/whats_new/v0.24.rst index f549b31f51aa7..88cafac5fa2d8 100644 --- a/doc/whats_new/v0.24.rst +++ b/doc/whats_new/v0.24.rst @@ -688,6 +688,11 @@ Changelog :pr:`18124` by :user:`Gus Brocchini ` and :user:`Amanda Dsouza `. +- |Fix| :func:`multioutput.ClassifierChain.decision_function` and + :func:`multioutput.ClassifierChain.predict_proba` now both return a list of + ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by + :user:`Agamemnon Krasoulis `. + :mod:`sklearn.naive_bayes` .......................... diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 004762498d49e..382ff363e0db7 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -115,14 +115,6 @@ Changelog class methods and will be removed in 1.2. :pr:`18543` by `Guillaume Lemaitre`_. -:mod:`sklearn.multioutput` -.......................... - -- |Fix| :func:`multioutput.ClassifierChain.decision_function` and - :func:`multioutput.ClassifierChain.predict_proba` now both return a list of - ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by - :user:`Agamemnon Krasoulis `. - :mod:`sklearn.naive_bayes` .......................... From e49c043d4060adea349989846fe174da3f2a11ad Mon Sep 17 00:00:00 2001 From: agamemnonc Date: Mon, 1 Feb 2021 17:51:44 +0000 Subject: [PATCH 17/17] Move changelog from v0.24.rst to v1.0.rst --- doc/whats_new/v0.24.rst | 5 ----- doc/whats_new/v1.0.rst | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/whats_new/v0.24.rst b/doc/whats_new/v0.24.rst index 88cafac5fa2d8..f549b31f51aa7 100644 --- a/doc/whats_new/v0.24.rst +++ b/doc/whats_new/v0.24.rst @@ -688,11 +688,6 @@ Changelog :pr:`18124` by :user:`Gus Brocchini ` and :user:`Amanda Dsouza `. -- |Fix| :func:`multioutput.ClassifierChain.decision_function` and - :func:`multioutput.ClassifierChain.predict_proba` now both return a list of - ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by - :user:`Agamemnon Krasoulis `. - :mod:`sklearn.naive_bayes` .......................... diff --git a/doc/whats_new/v1.0.rst b/doc/whats_new/v1.0.rst index 382ff363e0db7..004762498d49e 100644 --- a/doc/whats_new/v1.0.rst +++ b/doc/whats_new/v1.0.rst @@ -115,6 +115,14 @@ Changelog class methods and will be removed in 1.2. :pr:`18543` by `Guillaume Lemaitre`_. +:mod:`sklearn.multioutput` +.......................... + +- |Fix| :func:`multioutput.ClassifierChain.decision_function` and + :func:`multioutput.ClassifierChain.predict_proba` now both return a list of + ``n_outputs`` arrays of shape `(n_samples, n_classes).` :pr:`14654` by + :user:`Agamemnon Krasoulis `. + :mod:`sklearn.naive_bayes` ..........................