diff options
| -rw-r--r-- | numpy/linalg/linalg.py | 8 | ||||
| -rw-r--r-- | numpy/linalg/tests/test_linalg.py | 6 | ||||
| -rw-r--r-- | numpy/linalg/umath_linalg.c.src | 28 |
3 files changed, 21 insertions, 21 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index 4bd142c83..2eca1113d 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -811,8 +811,8 @@ def qr(a, mode='reduced'): A matrix with orthonormal columns. When mode = 'complete' the result is an orthogonal/unitary matrix depending on whether or not a is real/complex. The determinant may be either +/- 1 in that - case. In case the number of dimensions in the input array is - greater than 2 then a stack of the matrices with above properties + case. In case the number of dimensions in the input array is + greater than 2 then a stack of the matrices with above properties is returned. r : ndarray of float or complex, optional The upper-triangular matrix or a stack of upper-triangular @@ -967,7 +967,7 @@ def qr(a, mode='reduced'): gufunc = _umath_linalg.qr_reduced_m else: gufunc = _umath_linalg.qr_reduced_n - + signature = 'DD->D' if isComplexType(t) else 'dd->d' extobj = get_linalg_error_extobj(_raise_linalgerror_qr_r_raw) q = gufunc(a, tau, signature=signature, extobj=extobj) @@ -2174,7 +2174,7 @@ def lstsq(a, b, rcond="warn"): equal to, or greater than its number of linearly independent columns). If `a` is square and of full rank, then `x` (but for round-off error) is the "exact" solution of the equation. Else, `x` minimizes the - Euclidean 2-norm :math:`||b - ax||`. If there are multiple minimizing + Euclidean 2-norm :math:`||b - ax||`. If there are multiple minimizing solutions, the one with the smallest 2-norm :math:`||x||` is returned. Parameters diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py index 6e03f8b9b..5557ddf12 100644 --- a/numpy/linalg/tests/test_linalg.py +++ b/numpy/linalg/tests/test_linalg.py @@ -1711,7 +1711,7 @@ class TestQR: self.check_qr(m1) self.check_qr(m2) self.check_qr(m2.T) - + def check_qr_stacked(self, a): # This test expects the argument `a` to be an ndarray or # a subclass of an ndarray of inexact type. @@ -1768,9 +1768,9 @@ class TestQR: B = np.asarray([[b1, b2], [b3, b4]], dtype=dt) self.check_qr_stacked(A) self.check_qr_stacked(B) - self.check_qr_stacked(A + 1.j*B) + self.check_qr_stacked(A + 1.j*B) - np.random.set_state(curr_state) + np.random.set_state(curr_state) class TestCholesky: # TODO: are there no other tests for cholesky? diff --git a/numpy/linalg/umath_linalg.c.src b/numpy/linalg/umath_linalg.c.src index 1f794a1e3..f3cd79945 100644 --- a/numpy/linalg/umath_linalg.c.src +++ b/numpy/linalg/umath_linalg.c.src @@ -162,36 +162,36 @@ FNAME(zgelsd)(fortran_int *m, fortran_int *n, fortran_int *nrhs, double rwork[], fortran_int iwork[], fortran_int *info); -extern fortran_int +extern fortran_int FNAME(sgeqrf)(fortran_int *m, fortran_int *n, float a[], fortran_int *lda, float tau[], float work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(cgeqrf)(fortran_int *m, fortran_int *n, f2c_complex a[], fortran_int *lda, f2c_complex tau[], f2c_complex work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(dgeqrf)(fortran_int *m, fortran_int *n, double a[], fortran_int *lda, double tau[], double work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(zgeqrf)(fortran_int *m, fortran_int *n, f2c_doublecomplex a[], fortran_int *lda, f2c_doublecomplex tau[], f2c_doublecomplex work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(sorgqr)(fortran_int *m, fortran_int *n, fortran_int *k, float a[], fortran_int *lda, float tau[], float work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(dorgqr)(fortran_int *m, fortran_int *n, fortran_int *k, double a[], fortran_int *lda, double tau[], double work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(cungqr)(fortran_int *m, fortran_int *n, fortran_int *k, f2c_complex a[], fortran_int *lda, f2c_complex tau[], f2c_complex work[], fortran_int *lwork, fortran_int *info); -extern fortran_int +extern fortran_int FNAME(zungqr)(fortran_int *m, fortran_int *n, fortran_int *k, f2c_doublecomplex a[], fortran_int *lda, f2c_doublecomplex tau[], f2c_doublecomplex work[], fortran_int *lwork, fortran_int *info); @@ -3385,7 +3385,7 @@ init_@lapack_func@(GEQRF_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); @@ -3467,7 +3467,7 @@ init_@lapack_func@(GEQRF_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); @@ -3679,7 +3679,7 @@ init_@lapack_func@(GQR_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); @@ -3764,7 +3764,7 @@ init_@lapack_func@(GQR_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); @@ -3925,7 +3925,7 @@ init_@lapack_func@_complete(GQR_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); @@ -4010,7 +4010,7 @@ init_@lapack_func@_complete(GQR_PARAMS_t *params, } - params->LWORK = fortran_int_max(fortran_int_max(1, n), + params->LWORK = fortran_int_max(fortran_int_max(1, n), work_count > 0 ? work_count : -work_count); work_size = (size_t) params->LWORK * sizeof(@ftyp@); |