Skip to content

Commit 301076e

Browse files
aditya1702NicolasHug
authored andcommitted
MAINT Replace absolute imports with relative imports (scikit-learn#13653)
1 parent f20eaeb commit 301076e

27 files changed

+85
-86
lines changed

sklearn/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import numpy as np
1313

1414
from . import __version__
15-
from sklearn.utils import _IS_32BIT
15+
from .utils import _IS_32BIT
1616

1717
_DEFAULT_TAGS = {
1818
'non_deterministic': False,

sklearn/calibration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from scipy.special import expit
1717
from scipy.special import xlogy
1818
from scipy.optimize import fmin_bfgs
19-
from sklearn.preprocessing import LabelEncoder
19+
from .preprocessing import LabelEncoder
2020

2121
from .base import BaseEstimator, ClassifierMixin, RegressorMixin, clone
2222
from .preprocessing import label_binarize, LabelBinarizer

sklearn/cluster/_hierarchical.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ctypedef np.int8_t INT8
1313

1414
np.import_array()
1515

16-
from sklearn.utils.fast_dict cimport IntFloatDict
16+
from ..utils.fast_dict cimport IntFloatDict
1717

1818
# C++
1919
from cython.operator cimport dereference as deref, preincrement as inc

sklearn/cluster/_k_means.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cimport numpy as np
1717
cimport cython
1818
from cython cimport floating
1919

20-
from sklearn.utils.sparsefuncs_fast import assign_rows_csr
20+
from ..utils.sparsefuncs_fast import assign_rows_csr
2121
from ..utils._cython_blas cimport _dot
2222

2323
ctypedef np.float64_t DOUBLE

sklearn/cluster/affinity_propagation_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy as np
99
import warnings
1010

11-
from sklearn.exceptions import ConvergenceWarning
11+
from ..exceptions import ConvergenceWarning
1212
from ..base import BaseEstimator, ClusterMixin
1313
from ..utils import as_float_array, check_array
1414
from ..utils.validation import check_is_fitted

sklearn/datasets/openml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import numpy as np
1515
import scipy.sparse
1616

17-
from sklearn.externals import _arff
17+
from ..externals import _arff
1818
from .base import get_data_home
1919
from urllib.error import HTTPError
2020
from ..utils import Bunch

sklearn/datasets/species_distributions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
from .base import _fetch_remote
5050
from .base import RemoteFileMetadata
5151
from ..utils import Bunch
52-
from sklearn.datasets.base import _pkl_filepath
53-
from sklearn.utils import _joblib
52+
from .base import _pkl_filepath
53+
from ..utils import _joblib
5454

5555
# The original data can be found at:
5656
# https://biodiversityinformatics.amnh.org/open_source/maxent/samples.zip

sklearn/datasets/svmlight_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def load_svmlight_file(f, n_features=None, dtype=np.float64,
140140
To use joblib.Memory to cache the svmlight file::
141141
142142
from joblib import Memory
143-
from sklearn.datasets import load_svmlight_file
143+
from .datasets import load_svmlight_file
144144
mem = Memory("./mycache")
145145
146146
@mem.cache

sklearn/ensemble/_gradient_boosting.pyx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ np.import_array()
1818
from scipy.sparse import issparse
1919
from scipy.sparse import csr_matrix
2020

21-
from sklearn.tree._tree cimport Node
22-
from sklearn.tree._tree cimport Tree
23-
from sklearn.tree._tree cimport DTYPE_t
24-
from sklearn.tree._tree cimport SIZE_t
25-
from sklearn.tree._tree cimport INT32_t
26-
from sklearn.tree._utils cimport safe_realloc
21+
from ..tree._tree cimport Node
22+
from ..tree._tree cimport Tree
23+
from ..tree._tree cimport DTYPE_t
24+
from ..tree._tree cimport SIZE_t
25+
from ..tree._tree cimport INT32_t
26+
from ..tree._utils cimport safe_realloc
2727

2828
ctypedef np.int32_t int32
2929
ctypedef np.float64_t float64

sklearn/feature_extraction/_hashing.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ from libc.stdlib cimport abs
1111
cimport numpy as np
1212
import numpy as np
1313

14-
from sklearn.utils.murmurhash cimport murmurhash3_bytes_s32
15-
from sklearn.utils.fixes import sp_version
14+
from ..utils.murmurhash cimport murmurhash3_bytes_s32
15+
from ..utils.fixes import sp_version
1616

1717
np.import_array()
1818

sklearn/gaussian_process/gpc.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
from scipy.optimize import fmin_l_bfgs_b
1313
from scipy.special import erf, expit
1414

15-
from sklearn.base import BaseEstimator, ClassifierMixin, clone
16-
from sklearn.gaussian_process.kernels \
15+
from ..base import BaseEstimator, ClassifierMixin, clone
16+
from .kernels \
1717
import RBF, CompoundKernel, ConstantKernel as C
18-
from sklearn.utils.validation import check_X_y, check_is_fitted, check_array
19-
from sklearn.utils import check_random_state
20-
from sklearn.preprocessing import LabelEncoder
21-
from sklearn.multiclass import OneVsRestClassifier, OneVsOneClassifier
22-
from sklearn.exceptions import ConvergenceWarning
18+
from ..utils.validation import check_X_y, check_is_fitted, check_array
19+
from ..utils import check_random_state
20+
from ..preprocessing import LabelEncoder
21+
from ..multiclass import OneVsRestClassifier, OneVsOneClassifier
22+
from ..exceptions import ConvergenceWarning
2323

2424

2525
# Values required for approximating the logistic sigmoid by

sklearn/gaussian_process/gpr.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
from scipy.linalg import cholesky, cho_solve, solve_triangular
1212
from scipy.optimize import fmin_l_bfgs_b
1313

14-
from sklearn.base import BaseEstimator, RegressorMixin, clone
15-
from sklearn.base import MultiOutputMixin
16-
from sklearn.gaussian_process.kernels import RBF, ConstantKernel as C
17-
from sklearn.utils import check_random_state
18-
from sklearn.utils.validation import check_X_y, check_array
19-
from sklearn.exceptions import ConvergenceWarning
14+
from ..base import BaseEstimator, RegressorMixin, clone
15+
from ..base import MultiOutputMixin
16+
from .kernels import RBF, ConstantKernel as C
17+
from ..utils import check_random_state
18+
from ..utils.validation import check_X_y, check_array
19+
from ..exceptions import ConvergenceWarning
2020

2121

2222
class GaussianProcessRegressor(BaseEstimator, RegressorMixin,

sklearn/linear_model/cd_fast.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ from ..utils._cython_blas cimport (_axpy, _dot, _asum, _ger, _gemv, _nrm2,
2424
from ..utils._cython_blas cimport RowMajor, ColMajor, Trans, NoTrans
2525

2626

27-
from sklearn.utils cimport _random
27+
from ..utils cimport _random
2828

2929
ctypedef np.float64_t DOUBLE
3030
ctypedef np.uint32_t UINT32_t

sklearn/linear_model/sgd_fast.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ from numpy.math cimport INFINITY
2121
cdef extern from "sgd_fast_helpers.h":
2222
bint skl_isfinite(double) nogil
2323

24-
from sklearn.utils.weight_vector cimport WeightVector
25-
from sklearn.utils.seq_dataset cimport SequentialDataset64 as SequentialDataset
24+
from ..utils.weight_vector cimport WeightVector
25+
from ..utils.seq_dataset cimport SequentialDataset64 as SequentialDataset
2626

2727
np.import_array()
2828

sklearn/manifold/_barnes_hut_tsne.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ from libc.math cimport sqrt, log
1515
import numpy as np
1616
cimport numpy as np
1717

18-
from sklearn.neighbors.quad_tree cimport _QuadTree
18+
from ..neighbors.quad_tree cimport _QuadTree
1919

2020
cdef char* EMPTY_STRING = ""
2121

sklearn/metrics/cluster/bicluster.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import numpy as np
32
from scipy.optimize import linear_sum_assignment
43

sklearn/metrics/cluster/expected_mutual_info_fast.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ from scipy.special import gammaln
1111
import numpy as np
1212
cimport numpy as np
1313
cimport cython
14-
from sklearn.utils.lgamma cimport lgamma
14+
from ...utils.lgamma cimport lgamma
1515

1616
np.import_array()
1717
ctypedef np.float64_t DOUBLE

sklearn/metrics/cluster/unsupervised.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from ..pairwise import pairwise_distances_chunked
1717
from ..pairwise import pairwise_distances
1818
from ...preprocessing import LabelEncoder
19-
from sklearn.utils import deprecated
19+
from ...utils import deprecated
2020

2121

2222
def check_number_of_labels(n_labels, n_samples):

sklearn/neighbors/binary_tree.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ cimport numpy as np
147147
from libc.math cimport fabs, sqrt, exp, cos, pow, log
148148
from libc.stdlib cimport calloc, malloc, free
149149
from libc.string cimport memcpy
150-
from sklearn.utils.lgamma cimport lgamma
150+
from ..utils.lgamma cimport lgamma
151151

152152
import numpy as np
153153
import warnings

sklearn/neighbors/quad_tree.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ from libc.stdlib cimport malloc, free
1212
from libc.string cimport memcpy
1313
from libc.stdio cimport printf
1414

15-
from sklearn.tree._utils cimport safe_realloc, sizet_ptr_to_ndarray
15+
from ..tree._utils cimport safe_realloc, sizet_ptr_to_ndarray
1616
from ..utils import check_array
1717

1818
import numpy as np

sklearn/tree/_utils.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import numpy as np
1212
cimport numpy as np
1313
from ._tree cimport Node
14-
from sklearn.neighbors.quad_tree cimport Cell
14+
from ..neighbors.quad_tree cimport Cell
1515

1616
ctypedef np.npy_float32 DTYPE_t # Type of X
1717
ctypedef np.npy_float64 DOUBLE_t # Type of y, sample_weight

sklearn/tree/_utils.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import numpy as np
2020
cimport numpy as np
2121
np.import_array()
2222

23-
from sklearn.utils cimport _random
23+
from ..utils cimport _random
2424

2525
# =============================================================================
2626
# Helper functions

sklearn/utils/_random.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import numpy as np
1919
cimport numpy as np
2020
np.import_array()
2121

22-
from sklearn.utils import check_random_state
22+
from . import check_random_state
2323

2424
cdef UINT32_t DEFAULT_SEED = 1
2525

sklearn/utils/estimator_checks.py

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,51 @@
1111
from scipy import sparse
1212
from scipy.stats import rankdata
1313

14-
from sklearn.utils import IS_PYPY
15-
from sklearn.utils import _joblib
16-
from sklearn.utils.testing import assert_raises, _get_args
17-
from sklearn.utils.testing import assert_raises_regex
18-
from sklearn.utils.testing import assert_raise_message
19-
from sklearn.utils.testing import assert_equal
20-
from sklearn.utils.testing import assert_not_equal
21-
from sklearn.utils.testing import assert_in
22-
from sklearn.utils.testing import assert_array_equal
23-
from sklearn.utils.testing import assert_array_almost_equal
24-
from sklearn.utils.testing import assert_allclose
25-
from sklearn.utils.testing import assert_allclose_dense_sparse
26-
from sklearn.utils.testing import assert_warns_message
27-
from sklearn.utils.testing import set_random_state
28-
from sklearn.utils.testing import assert_greater
29-
from sklearn.utils.testing import assert_greater_equal
30-
from sklearn.utils.testing import SkipTest
31-
from sklearn.utils.testing import ignore_warnings
32-
from sklearn.utils.testing import assert_dict_equal
33-
from sklearn.utils.testing import create_memmap_backed_data
34-
from sklearn.utils import is_scalar_nan
35-
from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
36-
from sklearn.linear_model import Ridge
37-
38-
39-
from sklearn.base import (clone, ClusterMixin, is_classifier, is_regressor,
14+
from . import IS_PYPY
15+
from . import _joblib
16+
from .testing import assert_raises, _get_args
17+
from .testing import assert_raises_regex
18+
from .testing import assert_raise_message
19+
from .testing import assert_equal
20+
from .testing import assert_not_equal
21+
from .testing import assert_in
22+
from .testing import assert_array_equal
23+
from .testing import assert_array_almost_equal
24+
from .testing import assert_allclose
25+
from .testing import assert_allclose_dense_sparse
26+
from .testing import assert_warns_message
27+
from .testing import set_random_state
28+
from .testing import assert_greater
29+
from .testing import assert_greater_equal
30+
from .testing import SkipTest
31+
from .testing import ignore_warnings
32+
from .testing import assert_dict_equal
33+
from .testing import create_memmap_backed_data
34+
from . import is_scalar_nan
35+
from ..discriminant_analysis import LinearDiscriminantAnalysis
36+
from ..linear_model import Ridge
37+
38+
39+
from ..base import (clone, ClusterMixin, is_classifier, is_regressor,
4040
_DEFAULT_TAGS, RegressorMixin, is_outlier_detector)
4141

42-
from sklearn.metrics import accuracy_score, adjusted_rand_score, f1_score
43-
44-
from sklearn.random_projection import BaseRandomProjection
45-
from sklearn.feature_selection import SelectKBest
46-
from sklearn.pipeline import make_pipeline
47-
from sklearn.exceptions import DataConversionWarning
48-
from sklearn.exceptions import SkipTestWarning
49-
from sklearn.model_selection import train_test_split
50-
from sklearn.model_selection import ShuffleSplit
51-
from sklearn.model_selection._validation import _safe_split
52-
from sklearn.metrics.pairwise import (rbf_kernel, linear_kernel,
42+
from ..metrics import accuracy_score, adjusted_rand_score, f1_score
43+
44+
from ..random_projection import BaseRandomProjection
45+
from ..feature_selection import SelectKBest
46+
from ..pipeline import make_pipeline
47+
from ..exceptions import DataConversionWarning
48+
from ..exceptions import SkipTestWarning
49+
from ..model_selection import train_test_split
50+
from ..model_selection import ShuffleSplit
51+
from ..model_selection._validation import _safe_split
52+
from ..metrics.pairwise import (rbf_kernel, linear_kernel,
5353
pairwise_distances)
5454

55-
from sklearn.utils import shuffle
56-
from sklearn.utils.validation import has_fit_parameter, _num_samples
57-
from sklearn.preprocessing import StandardScaler
58-
from sklearn.datasets import load_iris, load_boston, make_blobs
55+
from .import shuffle
56+
from .validation import has_fit_parameter, _num_samples
57+
from ..preprocessing import StandardScaler
58+
from ..datasets import load_iris, load_boston, make_blobs
5959

6060

6161
BOSTON = None

sklearn/utils/random.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import scipy.sparse as sp
66
import array
77

8-
from sklearn.utils import check_random_state
8+
from . import check_random_state
99
from ._random import sample_without_replacement
1010

1111
__all__ = ['sample_without_replacement']

sklearn/utils/seq_dataset.pyx.tp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import numpy as np
4545

4646
np.import_array()
4747

48-
from sklearn.utils cimport _random
48+
from . cimport _random
4949

5050
cdef class SequentialDataset{{name}}:
5151
"""Base class for datasets with sequential data access.

sklearn/utils/stats.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import numpy as np
22

3-
from sklearn.utils.extmath import stable_cumsum
3+
from .extmath import stable_cumsum
44

55

66
def _weighted_percentile(array, sample_weight, percentile=50):

0 commit comments

Comments
 (0)