Skip to content

Commit 16337b2

Browse files
committed
Merge pull request scikit-learn#5077 from rvraghav93/fix_import_coor_des
[MRG] FIX import column_or_1d from utils.validation directly
2 parents 2d9388f + cd9eb96 commit 16337b2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

sklearn/linear_model/coordinate_descent.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
from .base import center_data, sparse_center_data
1818
from ..utils import check_array, check_X_y, deprecated
1919
from ..utils.validation import check_random_state
20-
from ..cross_validation import check_cv, column_or_1d
20+
from ..cross_validation import check_cv
2121
from ..externals.joblib import Parallel, delayed
2222
from ..externals import six
2323
from ..externals.six.moves import xrange
2424
from ..utils.extmath import safe_sparse_dot
2525
from ..utils.validation import check_is_fitted
26+
from ..utils.validation import column_or_1d
2627
from ..utils import ConvergenceWarning
2728

2829
from . import cd_fast

0 commit comments

Comments
 (0)