diff --git a/.gitignore b/.gitignore index af50a6d1f7da5..9f35ea2461b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,12 @@ sklearn/svm/libsvm.py sklearn/svm/libsvm_sparse.py sklearn/svm/liblinear.py +sklearn/manifold/isomap.py +sklearn/manifold/locally_linear.py +sklearn/manifold/mds.py +sklearn/manifold/spectral_embedding_.py +sklearn/manifold/t_sne.py + sklearn/semi_supervised/label_propagation.py sklearn/preprocessing/data.py diff --git a/sklearn/_build_utils/deprecated_modules.py b/sklearn/_build_utils/deprecated_modules.py index a16d3603395fc..4730623d4e19f 100644 --- a/sklearn/_build_utils/deprecated_modules.py +++ b/sklearn/_build_utils/deprecated_modules.py @@ -86,6 +86,14 @@ 'set_verbosity_wrap'), ('_liblinear', 'sklearn.svm.liblinear', 'sklearn.svm', 'train_wrap'), + ('_isomap', 'sklearn.manifold.isomap', 'sklearn.manifold', 'Isomap'), + ('_locally_linear', 'sklearn.manifold.locally_linear', 'sklearn.manifold', + 'LocallyLinearEmbedding'), + ('_mds', 'sklearn.manifold.mds', 'sklearn.manifold', 'MDS'), + ('_spectral_embedding_', 'sklearn.manifold.spectral_embedding_', + 'sklearn.manifold', 'SpectralEmbedding'), + ('_t_sne', 'sklearn.manifold.t_sne', 'sklearn.manifold', 'TSNE') + ('_label_propagation', 'sklearn.semi_supervised.label_propagation', 'sklearn.semi_supervised', 'LabelPropagation'), diff --git a/sklearn/manifold/__init__.py b/sklearn/manifold/__init__.py index 12ee523f548d2..fdb26a2ca330e 100644 --- a/sklearn/manifold/__init__.py +++ b/sklearn/manifold/__init__.py @@ -2,11 +2,11 @@ The :mod:`sklearn.manifold` module implements data embedding techniques. """ -from .locally_linear import locally_linear_embedding, LocallyLinearEmbedding -from .isomap import Isomap -from .mds import MDS, smacof -from .spectral_embedding_ import SpectralEmbedding, spectral_embedding -from .t_sne import TSNE +from ._locally_linear import locally_linear_embedding, LocallyLinearEmbedding +from ._isomap import Isomap +from ._mds import MDS, smacof +from ._spectral_embedding_ import SpectralEmbedding, spectral_embedding +from ._t_sne import TSNE __all__ = ['locally_linear_embedding', 'LocallyLinearEmbedding', 'Isomap', 'MDS', 'smacof', 'SpectralEmbedding', 'spectral_embedding', "TSNE"] diff --git a/sklearn/manifold/isomap.py b/sklearn/manifold/_isomap.py similarity index 100% rename from sklearn/manifold/isomap.py rename to sklearn/manifold/_isomap.py diff --git a/sklearn/manifold/locally_linear.py b/sklearn/manifold/_locally_linear.py similarity index 100% rename from sklearn/manifold/locally_linear.py rename to sklearn/manifold/_locally_linear.py diff --git a/sklearn/manifold/mds.py b/sklearn/manifold/_mds.py similarity index 100% rename from sklearn/manifold/mds.py rename to sklearn/manifold/_mds.py diff --git a/sklearn/manifold/spectral_embedding_.py b/sklearn/manifold/_spectral_embedding_.py similarity index 100% rename from sklearn/manifold/spectral_embedding_.py rename to sklearn/manifold/_spectral_embedding_.py diff --git a/sklearn/manifold/t_sne.py b/sklearn/manifold/_t_sne.py similarity index 100% rename from sklearn/manifold/t_sne.py rename to sklearn/manifold/_t_sne.py diff --git a/sklearn/manifold/tests/test_locally_linear.py b/sklearn/manifold/tests/test_locally_linear.py index ea1edcd80111d..f01e52810751c 100644 --- a/sklearn/manifold/tests/test_locally_linear.py +++ b/sklearn/manifold/tests/test_locally_linear.py @@ -6,7 +6,7 @@ import pytest from sklearn import neighbors, manifold -from sklearn.manifold.locally_linear import barycenter_kneighbors_graph +from sklearn.manifold._locally_linear import barycenter_kneighbors_graph from sklearn.utils.testing import ignore_warnings from sklearn.utils.testing import assert_raise_message diff --git a/sklearn/manifold/tests/test_spectral_embedding.py b/sklearn/manifold/tests/test_spectral_embedding.py index a1d790c699a16..8461fdf436d7e 100644 --- a/sklearn/manifold/tests/test_spectral_embedding.py +++ b/sklearn/manifold/tests/test_spectral_embedding.py @@ -6,9 +6,9 @@ from scipy.sparse import csgraph from scipy.linalg import eigh -from sklearn.manifold.spectral_embedding_ import SpectralEmbedding -from sklearn.manifold.spectral_embedding_ import _graph_is_connected -from sklearn.manifold.spectral_embedding_ import _graph_connected_component +from sklearn.manifold import SpectralEmbedding +from sklearn.manifold._spectral_embedding_ import _graph_is_connected +from sklearn.manifold._spectral_embedding_ import _graph_connected_component from sklearn.manifold import spectral_embedding from sklearn.metrics.pairwise import rbf_kernel from sklearn.metrics import normalized_mutual_info_score diff --git a/sklearn/manifold/tests/test_t_sne.py b/sklearn/manifold/tests/test_t_sne.py index 8d29f33b6867a..34a14574764d6 100644 --- a/sklearn/manifold/tests/test_t_sne.py +++ b/sklearn/manifold/tests/test_t_sne.py @@ -14,13 +14,13 @@ from sklearn.utils.testing import assert_array_almost_equal from sklearn.utils.testing import skip_if_32bit from sklearn.utils import check_random_state -from sklearn.manifold.t_sne import _joint_probabilities -from sklearn.manifold.t_sne import _joint_probabilities_nn -from sklearn.manifold.t_sne import _kl_divergence -from sklearn.manifold.t_sne import _kl_divergence_bh -from sklearn.manifold.t_sne import _gradient_descent -from sklearn.manifold.t_sne import trustworthiness -from sklearn.manifold.t_sne import TSNE +from sklearn.manifold._t_sne import _joint_probabilities +from sklearn.manifold._t_sne import _joint_probabilities_nn +from sklearn.manifold._t_sne import _kl_divergence +from sklearn.manifold._t_sne import _kl_divergence_bh +from sklearn.manifold._t_sne import _gradient_descent +from sklearn.manifold._t_sne import trustworthiness +from sklearn.manifold import TSNE from sklearn.manifold import _barnes_hut_tsne from sklearn.manifold._utils import _binary_search_perplexity from sklearn.datasets import make_blobs