summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-05-22 16:40:30 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-05-22 16:40:30 -0600
commit8d492d7644ef3934e8828484e0860f329cf54a3b (patch)
treec0a01831f93dc81034ec3c9e009e01ba63626060
parent9dd46ee2ed9fc55942d9ec13532d817c3b36d322 (diff)
parentfea4421d9065b452fb16eeaabb07732e4aec3ccb (diff)
downloadnumpy-8d492d7644ef3934e8828484e0860f329cf54a3b.tar.gz
Merge pull request #4735 from argriffing/fix-svd
BUG: svd ufunc typo
-rw-r--r--numpy/linalg/tests/test_regression.py10
-rw-r--r--numpy/linalg/umath_linalg.c.src2
2 files changed, 10 insertions, 2 deletions
diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py
index b0b2b2e30..61aa41e06 100644
--- a/numpy/linalg/tests/test_regression.py
+++ b/numpy/linalg/tests/test_regression.py
@@ -73,7 +73,15 @@ class TestRegression(TestCase):
# See gh-4442, 64bit would require very large/slow matrices.
x = np.eye(1000, 66)
np.linalg.svd(x)
-
+
+ def test_svd_no_uv(self):
+ # gh-4733
+ for shape in (3, 4), (4, 4), (4, 3):
+ for t in float, complex:
+ a = np.ones(shape, dtype=t)
+ w = linalg.svd(a, compute_uv=False)
+ c = np.count_nonzero(np.absolute(w) > 0.5)
+ assert_equal(c, 1)
if __name__ == '__main__':
run_module_suite()
diff --git a/numpy/linalg/umath_linalg.c.src b/numpy/linalg/umath_linalg.c.src
index 846a76889..a09d2c10a 100644
--- a/numpy/linalg/umath_linalg.c.src
+++ b/numpy/linalg/umath_linalg.c.src
@@ -3052,7 +3052,7 @@ GUFUNC_DESCRIPTOR_t gufunc_descriptors [] = {
"svd when n>=m. ",
4, 1, 1,
FUNC_ARRAY_NAME(svd_N),
- equal_2_types
+ svd_1_1_types
},
{
"svd_n",