8000 Replace _squeeze with np.ravel · scikit-learn/scikit-learn@a23ce3b · GitHub
[go: up one dir, main page]
Skip to content

Commit a23ce3b

Browse files
MechCoderMechCoder
committed
Replace _squeeze with np.ravel
1 parent 65adff9 commit a23ce3b

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# caution: testing won't work on windows, see README
44

5-
PYTHON ?= python
6-
CYTHON ?= cython
7-
NOSETESTS ?= nosetests
5+
PYTHON ?= python3
6+
CYTHON ?= cython3
7+
NOSETESTS ?= nosetests-3.4
88
CTAGS ?= ctags
99

1010
# skip doctests on 32bit python

‎sklearn/gaussian_process/kernels.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
from sklearn.externals.funcsigs import signature
3434

3535

36-
def _squeeze(length_scale):
37-
"""
38-
np.squeeze that returns a scalar instead of a 0-D array.
39-
"""
40-
length_scale = np.squeeze(length_scale).astype(float)
41-
if length_scale.ndim == 0:
42-
length_scale = np.asscalar(length_scale)
43-
return length_scale
44-
4536
def _check_length_scale(X, length_scale):
4637
length_scale = np.squeeze(length_scale).astype(float)
4738
if np.ndim(length_scale) > 1:
@@ -1213,7 +1204,7 @@ def __repr__(self):
12131204
self.length_scale)))
12141205
else: # isotropic
12151206
return "{0}(length_scale={1:.3g})".format(
1216-
self.__class__.__name__, _squeeze(self.length_scale))
1207+
self.__class__.__name__, np.ravel(self.length_scale)[0])
12171208

12181209

12191210
class Matern(RBF):
@@ -1359,7 +1350,8 @@ def __repr__(self):
13591350
self.nu)
13601351
else:
13611352
return "{0}(length_scale={1:.3g}, nu={2:.3g})".format(
1362-
self.__class__.__name__, _squeeze(self.length_scale), self.nu)
1353+
self.__class__.__name__, np.ravel(self.length_scale)[0],
1354+
self.nu)
13631355

13641356

13651357
class RationalQuadratic(StationaryKernelMixin, NormalizedKernelMixin, Kernel):

‎sklearn/gaussian_process/tests/test_kernels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from sklearn.utils.testing import (assert_equal, assert_almost_equal,
2222
assert_not_equal, assert_array_equal,
23-
assert_array_almost_equal, assert_true)
23+
assert_array_almost_equal)
2424

2525

2626
X = np.random.RandomState(0).normal(0, 1, (5, 2))

0 commit comments

Comments
 (0)
0