8000 [MRG] Make modules private in manifold by thomasjpfan · Pull Request #15318 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]

Skip to content

[MRG] Make modules private in manifold #15318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions sklearn/_build_utils/deprecated_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down
10 changes: 5 additions & 5 deletions sklearn/manifold/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion sklearn/manifold/tests/test_locally_linear.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions sklearn/manifold/tests/test_spectral_embedding.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions sklearn/manifold/tests/test_t_sne.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0