diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/_methods.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/item_selection.c | 24 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/nditer_api.c | 3 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/number.c | 6 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/numpyos.c | 42 | ||||
| -rw-r--r-- | numpy/linalg/lapack_litemodule.c | 138 |
6 files changed, 108 insertions, 107 deletions
diff --git a/numpy/core/_methods.py b/numpy/core/_methods.py index c8a968c97..a064f70c7 100644 --- a/numpy/core/_methods.py +++ b/numpy/core/_methods.py @@ -1,5 +1,5 @@ """ -Array methods which are called by the both the C-code for the method +Array methods which are called by both the C-code for the method and the Python code for the NumPy-namespace function """ diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c index 72cbf9a22..bc076ba83 100644 --- a/numpy/core/src/multiarray/item_selection.c +++ b/numpy/core/src/multiarray/item_selection.c @@ -1209,7 +1209,7 @@ partition_prep_kth_array(PyArrayObject * ktharray, PyErr_Format(PyExc_ValueError, "kth array must have dimension <= 1"); return NULL; } - kthrvl = PyArray_Cast(ktharray, NPY_INTP); + kthrvl = (PyArrayObject *)PyArray_Cast(ktharray, NPY_INTP); if (kthrvl == NULL) return NULL; @@ -2236,10 +2236,9 @@ PyArray_Diagonal(PyArrayObject *self, int offset, int axis1, int axis2) char *data; npy_intp diag_size; - PyArrayObject *ret; PyArray_Descr *dtype; + PyObject *ret; npy_intp ret_shape[NPY_MAXDIMS], ret_strides[NPY_MAXDIMS]; - PyObject *copy; if (ndim < 2) { PyErr_SetString(PyExc_ValueError, @@ -2325,7 +2324,7 @@ PyArray_Diagonal(PyArrayObject *self, int offset, int axis1, int axis2) /* Create the diagonal view */ dtype = PyArray_DTYPE(self); Py_INCREF(dtype); - ret = (PyArrayObject *)PyArray_NewFromDescr(Py_TYPE(self), + ret = PyArray_NewFromDescr(Py_TYPE(self), dtype, ndim-1, ret_shape, ret_strides, @@ -2336,7 +2335,7 @@ PyArray_Diagonal(PyArrayObject *self, int offset, int axis1, int axis2) return NULL; } Py_INCREF(self); - if (PyArray_SetBaseObject(ret, (PyObject *)self) < 0) { + if (PyArray_SetBaseObject((PyArrayObject *)ret, (PyObject *)self) < 0) { Py_DECREF(ret); return NULL; } @@ -2345,7 +2344,7 @@ PyArray_Diagonal(PyArrayObject *self, int offset, int axis1, int axis2) * For numpy 1.9 the diagonal view is not writeable. * This line needs to be removed in 1.10. */ - PyArray_CLEARFLAGS(ret, NPY_ARRAY_WRITEABLE); + PyArray_CLEARFLAGS((PyArrayObject *)ret, NPY_ARRAY_WRITEABLE); return ret; } @@ -2402,10 +2401,11 @@ PyArray_Compress(PyArrayObject *self, PyObject *condition, int axis, * but a 32 bit type version would make it even faster on these platforms */ static NPY_INLINE int -count_nonzero_bytes_128(npy_uint64 * w) +count_nonzero_bytes_128(const char *w) { - npy_uint64 w1 = w[0]; - npy_uint64 w2 = w[1]; + const npy_uint64 *w64 = (const npy_uint64 *)w; + npy_uint64 w1 = w64[0]; + npy_uint64 w2 = w64[1]; /* * bytes not exclusively 0 or 1, sum them individually. @@ -2414,7 +2414,7 @@ count_nonzero_bytes_128(npy_uint64 * w) */ if (NPY_UNLIKELY(((w1 | w2) & 0xFEFEFEFEFEFEFEFEULL) != 0)) { /* reload from pointer to avoid a unnecessary stack spill with gcc */ - char * c = (char *)w; + const char *c = w; npy_uintp i, count = 0; for (i = 0; i < 16; i++) { count += (c[i] != 0); @@ -2464,8 +2464,8 @@ count_boolean_trues(int ndim, char *data, npy_intp *ashape, npy_intp *astrides) if (strides[0] == 1) { NPY_RAW_ITER_START(idim, ndim, coord, shape) { /* Process the innermost dimension */ - char * d = data; - char * e = data + shape[0]; + const char *d = data; + const char *e = data + shape[0]; if (npy_is_aligned(data, sizeof(npy_uint64))) { npy_uintp stride = 2 * sizeof(npy_uint64); for (; d < e - (shape[0] % stride); d += stride) { diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c index 164a3a7a3..905a19d55 100644 --- a/numpy/core/src/multiarray/nditer_api.c +++ b/numpy/core/src/multiarray/nditer_api.c @@ -1832,8 +1832,7 @@ npyiter_copy_from_buffers(NpyIter *iter) *reduce_outeraxisdata = NULL; PyArray_Descr **dtypes = NIT_DTYPES(iter); - npy_intp transfersize = NBF_SIZE(bufferdata), - buffersize = NBF_BUFFERSIZE(bufferdata); + npy_intp transfersize = NBF_SIZE(bufferdata); npy_intp *strides = NBF_STRIDES(bufferdata), *ad_strides = NAD_STRIDES(axisdata); npy_intp sizeof_axisdata = NIT_AXISDATA_SIZEOF(itflags, ndim, nop); diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c index db62bd5fd..c1d04c536 100644 --- a/numpy/core/src/multiarray/number.c +++ b/numpy/core/src/multiarray/number.c @@ -221,8 +221,10 @@ PyArray_GenericBinaryFunction(PyArrayObject *m1, PyObject *m2, PyObject *op) * - https://github.com/numpy/numpy/issues/3502 * - https://github.com/numpy/numpy/issues/3503 */ - double m1_prio = PyArray_GetPriority(m1, NPY_SCALAR_PRIORITY); - double m2_prio = PyArray_GetPriority(m2, NPY_SCALAR_PRIORITY); + double m1_prio = PyArray_GetPriority((PyObject *)m1, + NPY_SCALAR_PRIORITY); + double m2_prio = PyArray_GetPriority((PyObject *)m2, + NPY_SCALAR_PRIORITY); if (m1_prio < m2_prio) { Py_INCREF(Py_NotImplemented); return Py_NotImplemented; diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c index 23ba57e5d..44b32f4da 100644 --- a/numpy/core/src/multiarray/numpyos.c +++ b/numpy/core/src/multiarray/numpyos.c @@ -26,7 +26,7 @@ * in length. */ static void -_ensure_minimum_exponent_length(char* buffer, size_t buf_size) +ensure_minimum_exponent_length(char* buffer, size_t buf_size) { char *p = strpbrk(buffer, "eE"); if (p && (*(p + 1) == '-' || *(p + 1) == '+')) { @@ -101,7 +101,7 @@ _ensure_minimum_exponent_length(char* buffer, size_t buf_size) * will not be in the current locale, it will always be '.' */ static void -_ensure_decimal_point(char* buffer, size_t buf_size) +ensure_decimal_point(char* buffer, size_t buf_size) { int insert_count = 0; char* chars_to_insert; @@ -163,7 +163,7 @@ _ensure_decimal_point(char* buffer, size_t buf_size) * longer, no need for a maximum buffer size parameter. */ static void -_change_decimal_from_locale_to_dot(char* buffer) +change_decimal_from_locale_to_dot(char* buffer) { struct lconv *locale_data = localeconv(); const char *decimal_point = locale_data->decimal_point; @@ -194,7 +194,7 @@ _change_decimal_from_locale_to_dot(char* buffer) * Check that the format string is a valid one for NumPyOS_ascii_format* */ static int -_check_ascii_format(const char *format) +check_ascii_format(const char *format) { char format_char; size_t format_len = strlen(format); @@ -238,13 +238,13 @@ _check_ascii_format(const char *format) * PyOS_ascii_formatd */ static char* -_fix_ascii_format(char* buf, size_t buflen, int decimal) +fix_ascii_format(char* buf, size_t buflen, int decimal) { /* * Get the current locale, and find the decimal point string. * Convert that string back to a dot. */ - _change_decimal_from_locale_to_dot(buf); + change_decimal_from_locale_to_dot(buf); /* * If an exponent exists, ensure that the exponent is at least @@ -253,10 +253,10 @@ _fix_ascii_format(char* buf, size_t buflen, int decimal) * MIN_EXPONENT_DIGITS, remove as many zeros as possible until we get * back to MIN_EXPONENT_DIGITS */ - _ensure_minimum_exponent_length(buf, buflen); + ensure_minimum_exponent_length(buf, buflen); if (decimal != 0) { - _ensure_decimal_point(buf, buflen); + ensure_decimal_point(buf, buflen); } return buf; @@ -282,18 +282,18 @@ _fix_ascii_format(char* buf, size_t buflen, int decimal) * * Return value: The pointer to the buffer with the converted string. */ -#define _ASCII_FORMAT(type, suffix, print_type) \ +#define ASCII_FORMAT(type, suffix, print_type) \ NPY_NO_EXPORT char* \ NumPyOS_ascii_format ## suffix(char *buffer, size_t buf_size, \ const char *format, \ type val, int decimal) \ { \ if (npy_isfinite(val)) { \ - if(_check_ascii_format(format)) { \ + if (check_ascii_format(format)) { \ return NULL; \ } \ PyOS_snprintf(buffer, buf_size, format, (print_type)val); \ - return _fix_ascii_format(buffer, buf_size, decimal); \ + return fix_ascii_format(buffer, buf_size, decimal); \ } \ else if (npy_isnan(val)){ \ if (buf_size < 4) { \ @@ -318,12 +318,12 @@ _fix_ascii_format(char* buf, size_t buflen, int decimal) return buffer; \ } -_ASCII_FORMAT(float, f, float) -_ASCII_FORMAT(double, d, double) +ASCII_FORMAT(float, f, float) +ASCII_FORMAT(double, d, double) #ifndef FORCE_NO_LONG_DOUBLE_FORMATTING -_ASCII_FORMAT(long double, l, long double) +ASCII_FORMAT(long double, l, long double) #else -_ASCII_FORMAT(long double, l, double) +ASCII_FORMAT(long double, l, double) #endif /* @@ -380,8 +380,8 @@ NumPyOS_ascii_isalnum(char c) * * Same as tolower under C locale */ -static char -NumPyOS_ascii_tolower(char c) +static int +NumPyOS_ascii_tolower(int c) { if (c >= 'A' && c <= 'Z') { return c + ('a'-'A'); @@ -398,10 +398,8 @@ NumPyOS_ascii_tolower(char c) static int NumPyOS_ascii_strncasecmp(const char* s1, const char* s2, size_t len) { - int diff; while (len > 0 && *s1 != '\0' && *s2 != '\0') { - diff = ((int)NumPyOS_ascii_tolower(*s1)) - - ((int)NumPyOS_ascii_tolower(*s2)); + int diff = NumPyOS_ascii_tolower(*s1) - NumPyOS_ascii_tolower(*s2); if (diff != 0) { return diff; } @@ -410,13 +408,13 @@ NumPyOS_ascii_strncasecmp(const char* s1, const char* s2, size_t len) --len; } if (len > 0) { - return ((int)*s1) - ((int)*s2); + return *s1 - *s2; } return 0; } /* - * _NumPyOS_ascii_strtod_plain: + * NumPyOS_ascii_strtod_plain: * * PyOS_ascii_strtod work-alike, with no enhanced features, * for forward compatibility with Python >= 2.7 diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c index 2f142f105..5a5c6f010 100644 --- a/numpy/linalg/lapack_litemodule.c +++ b/numpy/linalg/lapack_litemodule.c @@ -143,7 +143,7 @@ check_object(PyObject *ob, int t, char *obname, static PyObject * lapack_lite_dgeev(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; char jobvl; char jobvr; int n; @@ -169,7 +169,7 @@ lapack_lite_dgeev(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(vr,NPY_DOUBLE,"vr","NPY_DOUBLE","dgeev")); TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dgeev")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dgeev)(&jobvl,&jobvr,&n,DDATA(a),&lda,DDATA(wr),DDATA(wi), DDATA(vl),&ldvl,DDATA(vr),&ldvr,DDATA(work),&lwork, &info); @@ -178,7 +178,7 @@ lapack_lite_dgeev(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:c,s:c,s:i,s:i,s:i,s:i,s:i,s:i}","dgeev_", - lapack_lite_status__,"jobvl",jobvl,"jobvr",jobvr, + lapack_lite_status,"jobvl",jobvl,"jobvr",jobvr, "n",n,"lda",lda,"ldvl",ldvl,"ldvr",ldvr, "lwork",lwork,"info",info); } @@ -245,7 +245,7 @@ lapack_lite_dsyevd(PyObject *NPY_UNUSED(self), PyObject *args) /* off-diagonal elements of an intermediate tridiagonal */ /* form did not converge to zero. */ - int lapack_lite_status__; + int lapack_lite_status; TRY(PyArg_ParseTuple(args,"cciOiOOiOii", &jobz,&uplo,&n,&a,&lda,&w,&work,&lwork, @@ -256,7 +256,7 @@ lapack_lite_dsyevd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dsyevd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","dsyevd")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dsyevd)(&jobz,&uplo,&n,DDATA(a),&lda,DDATA(w),DDATA(work), &lwork,IDATA(iwork),&liwork,&info); if (PyErr_Occurred()) { @@ -264,7 +264,7 @@ lapack_lite_dsyevd(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:c,s:c,s:i,s:i,s:i,s:i,s:i}","dsyevd_", - lapack_lite_status__,"jobz",jobz,"uplo",uplo, + lapack_lite_status,"jobz",jobz,"uplo",uplo, "n",n,"lda",lda,"lwork",lwork,"liwork",liwork,"info",info); } @@ -334,7 +334,7 @@ lapack_lite_zheevd(PyObject *NPY_UNUSED(self), PyObject *args) /* off-diagonal elements of an intermediate tridiagonal */ /* form did not converge to zero. */ - int lapack_lite_status__; + int lapack_lite_status; TRY(PyArg_ParseTuple(args,"cciOiOOiOiOii", &jobz,&uplo,&n,&a,&lda,&w,&work,&lwork,&rwork, @@ -346,15 +346,15 @@ lapack_lite_zheevd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(w,NPY_DOUBLE,"rwork","NPY_DOUBLE","zheevd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","zheevd")); - lapack_lite_status__ = \ - FNAME(zheevd)(&jobz,&uplo,&n,ZDATA(a),&lda,DDATA(w),ZDATA(work), - &lwork,DDATA(rwork),&lrwork,IDATA(iwork),&liwork,&info); + lapack_lite_status = + FNAME(zheevd)(&jobz,&uplo,&n,ZDATA(a),&lda,DDATA(w),ZDATA(work), + &lwork,DDATA(rwork),&lrwork,IDATA(iwork),&liwork,&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:c,s:c,s:i,s:i,s:i,s:i,s:i,s:i}","zheevd_", - lapack_lite_status__,"jobz",jobz,"uplo",uplo,"n",n, + lapack_lite_status,"jobz",jobz,"uplo",uplo,"n",n, "lda",lda,"lwork",lwork,"lrwork",lrwork, "liwork",liwork,"info",info); } @@ -362,7 +362,7 @@ lapack_lite_zheevd(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m; int n; int nrhs; @@ -387,7 +387,7 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dgelsd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","dgelsd")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dgelsd)(&m,&n,&nrhs,DDATA(a),&lda,DDATA(b),&ldb, DDATA(s),&rcond,&rank,DDATA(work),&lwork, IDATA(iwork),&info); @@ -396,7 +396,7 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:d,s:i,s:i,s:i}","dgelsd_", - lapack_lite_status__,"m",m,"n",n,"nrhs",nrhs, + lapack_lite_status,"m",m,"n",n,"nrhs",nrhs, "lda",lda,"ldb",ldb,"rcond",rcond,"rank",rank, "lwork",lwork,"info",info); } @@ -404,7 +404,7 @@ lapack_lite_dgelsd(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_dgesv(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int n; int nrhs; PyObject *a; @@ -419,21 +419,21 @@ lapack_lite_dgesv(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(ipiv,NPY_INT,"ipiv","NPY_INT","dgesv")); TRY(check_object(b,NPY_DOUBLE,"b","NPY_DOUBLE","dgesv")); - lapack_lite_status__ = \ - FNAME(dgesv)(&n,&nrhs,DDATA(a),&lda,IDATA(ipiv),DDATA(b),&ldb,&info); + lapack_lite_status = + FNAME(dgesv)(&n,&nrhs,DDATA(a),&lda,IDATA(ipiv),DDATA(b),&ldb,&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","dgesv_", - lapack_lite_status__,"n",n,"nrhs",nrhs,"lda",lda, + lapack_lite_status,"n",n,"nrhs",nrhs,"lda",lda, "ldb",ldb,"info",info); } static PyObject * lapack_lite_dgesdd(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; char jobz; int m; int n; @@ -459,7 +459,7 @@ lapack_lite_dgesdd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dgesdd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","dgesdd")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dgesdd)(&jobz,&m,&n,DDATA(a),&lda,DDATA(s),DDATA(u),&ldu, DDATA(vt),&ldvt,DDATA(work),&lwork,IDATA(iwork), &info); @@ -482,19 +482,19 @@ lapack_lite_dgesdd(PyObject *NPY_UNUSED(self), PyObject *args) work0 = PyArray_MAX(work0,3*mn + PyArray_MAX(mx,6*mn)+500); break; case 'O': - work0 = PyArray_MAX(work0,3*mn*mn + \ + work0 = PyArray_MAX(work0,3*mn*mn + PyArray_MAX(mx,5*mn*mn+4*mn+500)); break; case 'S': case 'A': - work0 = PyArray_MAX(work0,3*mn*mn + \ + work0 = PyArray_MAX(work0,3*mn*mn + PyArray_MAX(mx,4*mn*(mn+1))+500); break; } *DDATA(work) = (double) work0; } return Py_BuildValue("{s:i,s:c,s:i,s:i,s:i,s:i,s:i,s:i,s:i}","dgesdd_", - lapack_lite_status__,"jobz",jobz,"m",m,"n",n, + lapack_lite_status,"jobz",jobz,"m",m,"n",n, "lda",lda,"ldu",ldu,"ldvt",ldvt,"lwork",lwork, "info",info); } @@ -502,7 +502,7 @@ lapack_lite_dgesdd(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_dgetrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m; int n; PyObject *a; @@ -514,20 +514,20 @@ lapack_lite_dgetrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(a,NPY_DOUBLE,"a","NPY_DOUBLE","dgetrf")); TRY(check_object(ipiv,NPY_INT,"ipiv","NPY_INT","dgetrf")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dgetrf)(&m,&n,DDATA(a),&lda,IDATA(ipiv),&info); if (PyErr_Occurred()) { return NULL; } - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i}","dgetrf_",lapack_lite_status__, + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i}","dgetrf_", lapack_lite_status, "m",m,"n",n,"lda",lda,"info",info); } static PyObject * lapack_lite_dpotrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int n; PyObject *a; int lda; @@ -537,20 +537,20 @@ lapack_lite_dpotrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(PyArg_ParseTuple(args,"ciOii",&uplo,&n,&a,&lda,&info)); TRY(check_object(a,NPY_DOUBLE,"a","NPY_DOUBLE","dpotrf")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dpotrf)(&uplo,&n,DDATA(a),&lda,&info); if (PyErr_Occurred()) { return NULL; } - return Py_BuildValue("{s:i,s:i,s:i,s:i}","dpotrf_",lapack_lite_status__, + return Py_BuildValue("{s:i,s:i,s:i,s:i}","dpotrf_", lapack_lite_status, "n",n,"lda",lda,"info",info); } static PyObject * lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m, n, lwork; PyObject *a, *tau, *work; int lda; @@ -563,7 +563,7 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(tau,NPY_DOUBLE,"tau","NPY_DOUBLE","dgeqrf")); TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dgeqrf")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(dgeqrf)(&m, &n, DDATA(a), &lda, DDATA(tau), DDATA(work), &lwork, &info); if (PyErr_Occurred()) { @@ -571,7 +571,7 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","dgeqrf_", - lapack_lite_status__,"m",m,"n",n,"lda",lda, + lapack_lite_status,"m",m,"n",n,"lda",lda, "lwork",lwork,"info",info); } @@ -579,7 +579,7 @@ lapack_lite_dgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m, n, k, lwork; PyObject *a, *tau, *work; int lda; @@ -589,13 +589,14 @@ lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(a,NPY_DOUBLE,"a","NPY_DOUBLE","dorgqr")); TRY(check_object(tau,NPY_DOUBLE,"tau","NPY_DOUBLE","dorgqr")); TRY(check_object(work,NPY_DOUBLE,"work","NPY_DOUBLE","dorgqr")); - lapack_lite_status__ = \ - FNAME(dorgqr)(&m, &n, &k, DDATA(a), &lda, DDATA(tau), DDATA(work), &lwork, &info); + lapack_lite_status = + FNAME(dorgqr)(&m, &n, &k, DDATA(a), &lda, DDATA(tau), DDATA(work), + &lwork, &info); if (PyErr_Occurred()) { return NULL; } - return Py_BuildValue("{s:i,s:i}","dorgqr_",lapack_lite_status__, + return Py_BuildValue("{s:i,s:i}","dorgqr_",lapack_lite_status, "info",info); } @@ -603,7 +604,7 @@ lapack_lite_dorgqr(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_zgeev(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; char jobvl; char jobvr; int n; @@ -629,7 +630,7 @@ lapack_lite_zgeev(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(work,NPY_CDOUBLE,"work","NPY_CDOUBLE","zgeev")); TRY(check_object(rwork,NPY_DOUBLE,"rwork","NPY_DOUBLE","zgeev")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(zgeev)(&jobvl,&jobvr,&n,ZDATA(a),&lda,ZDATA(w),ZDATA(vl), &ldvl,ZDATA(vr),&ldvr,ZDATA(work),&lwork, DDATA(rwork),&info); @@ -638,7 +639,7 @@ lapack_lite_zgeev(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:c,s:c,s:i,s:i,s:i,s:i,s:i,s:i}","zgeev_", - lapack_lite_status__,"jobvl",jobvl,"jobvr",jobvr, + lapack_lite_status,"jobvl",jobvl,"jobvr",jobvr, "n",n,"lda",lda,"ldvl",ldvl,"ldvr",ldvr, "lwork",lwork,"info",info); } @@ -646,7 +647,7 @@ lapack_lite_zgeev(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m; int n; int nrhs; @@ -673,22 +674,22 @@ lapack_lite_zgelsd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(rwork,NPY_DOUBLE,"rwork","NPY_DOUBLE","zgelsd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","zgelsd")); - lapack_lite_status__ = \ - FNAME(zgelsd)(&m,&n,&nrhs,ZDATA(a),&lda,ZDATA(b),&ldb,DDATA(s),&rcond, - &rank,ZDATA(work),&lwork,DDATA(rwork),IDATA(iwork),&info); + lapack_lite_status = + FNAME(zgelsd)(&m,&n,&nrhs,ZDATA(a),&lda,ZDATA(b),&ldb,DDATA(s),&rcond, + &rank,ZDATA(work),&lwork,DDATA(rwork),IDATA(iwork),&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i}","zgelsd_", - lapack_lite_status__,"m",m,"n",n,"nrhs",nrhs,"lda",lda, + lapack_lite_status,"m",m,"n",n,"nrhs",nrhs,"lda",lda, "ldb",ldb,"rank",rank,"lwork",lwork,"info",info); } static PyObject * lapack_lite_zgesv(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int n; int nrhs; PyObject *a; @@ -703,21 +704,21 @@ lapack_lite_zgesv(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(ipiv,NPY_INT,"ipiv","NPY_INT","zgesv")); TRY(check_object(b,NPY_CDOUBLE,"b","NPY_CDOUBLE","zgesv")); - lapack_lite_status__ = \ - FNAME(zgesv)(&n,&nrhs,ZDATA(a),&lda,IDATA(ipiv),ZDATA(b),&ldb,&info); + lapack_lite_status = + FNAME(zgesv)(&n,&nrhs,ZDATA(a),&lda,IDATA(ipiv),ZDATA(b),&ldb,&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","zgesv_", - lapack_lite_status__,"n",n,"nrhs",nrhs,"lda",lda, + lapack_lite_status,"n",n,"nrhs",nrhs,"lda",lda, "ldb",ldb,"info",info); } static PyObject * lapack_lite_zgesdd(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; char jobz; int m; int n; @@ -745,7 +746,7 @@ lapack_lite_zgesdd(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(rwork,NPY_DOUBLE,"rwork","NPY_DOUBLE","zgesdd")); TRY(check_object(iwork,NPY_INT,"iwork","NPY_INT","zgesdd")); - lapack_lite_status__ = \ + lapack_lite_status = FNAME(zgesdd)(&jobz,&m,&n,ZDATA(a),&lda,DDATA(s),ZDATA(u),&ldu, ZDATA(vt),&ldvt,ZDATA(work),&lwork,DDATA(rwork), IDATA(iwork),&info); @@ -754,7 +755,7 @@ lapack_lite_zgesdd(PyObject *NPY_UNUSED(self), PyObject *args) } return Py_BuildValue("{s:i,s:c,s:i,s:i,s:i,s:i,s:i,s:i,s:i}","zgesdd_", - lapack_lite_status__,"jobz",jobz,"m",m,"n",n, + lapack_lite_status,"jobz",jobz,"m",m,"n",n, "lda",lda,"ldu",ldu,"ldvt",ldvt,"lwork",lwork, "info",info); } @@ -762,7 +763,7 @@ lapack_lite_zgesdd(PyObject *NPY_UNUSED(self), PyObject *args) static PyObject * lapack_lite_zgetrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m; int n; PyObject *a; @@ -774,20 +775,20 @@ lapack_lite_zgetrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(a,NPY_CDOUBLE,"a","NPY_CDOUBLE","zgetrf")); TRY(check_object(ipiv,NPY_INT,"ipiv","NPY_INT","zgetrf")); - lapack_lite_status__ = \ - FNAME(zgetrf)(&m,&n,ZDATA(a),&lda,IDATA(ipiv),&info); + lapack_lite_status = + FNAME(zgetrf)(&m,&n,ZDATA(a),&lda,IDATA(ipiv),&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i}","zgetrf_", - lapack_lite_status__,"m",m,"n",n,"lda",lda,"info",info); + lapack_lite_status,"m",m,"n",n,"lda",lda,"info",info); } static PyObject * lapack_lite_zpotrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int n; PyObject *a; int lda; @@ -796,20 +797,20 @@ lapack_lite_zpotrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(PyArg_ParseTuple(args,"ciOii",&uplo,&n,&a,&lda,&info)); TRY(check_object(a,NPY_CDOUBLE,"a","NPY_CDOUBLE","zpotrf")); - lapack_lite_status__ = \ - FNAME(zpotrf)(&uplo,&n,ZDATA(a),&lda,&info); + lapack_lite_status = + FNAME(zpotrf)(&uplo,&n,ZDATA(a),&lda,&info); if (PyErr_Occurred()) { return NULL; } return Py_BuildValue("{s:i,s:i,s:i,s:i}","zpotrf_", - lapack_lite_status__,"n",n,"lda",lda,"info",info); + lapack_lite_status,"n",n,"lda",lda,"info",info); } static PyObject * lapack_lite_zgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m, n, lwork; PyObject *a, *tau, *work; int lda; @@ -822,20 +823,21 @@ lapack_lite_zgeqrf(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(tau,NPY_CDOUBLE,"tau","NPY_CDOUBLE","zgeqrf")); TRY(check_object(work,NPY_CDOUBLE,"work","NPY_CDOUBLE","zgeqrf")); - lapack_lite_status__ = \ - FNAME(zgeqrf)(&m, &n, ZDATA(a), &lda, ZDATA(tau), ZDATA(work), &lwork, &info); + lapack_lite_status = + FNAME(zgeqrf)(&m, &n, ZDATA(a), &lda, ZDATA(tau), ZDATA(work), + &lwork, &info); if (PyErr_Occurred()) { return NULL; } - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","zgeqrf_",lapack_lite_status__,"m",m,"n",n,"lda",lda,"lwork",lwork,"info",info); + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:i,s:i}","zgeqrf_",lapack_lite_status,"m",m,"n",n,"lda",lda,"lwork",lwork,"info",info); } static PyObject * lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args) { - int lapack_lite_status__; + int lapack_lite_status; int m, n, k, lwork; PyObject *a, *tau, *work; int lda; @@ -847,14 +849,14 @@ lapack_lite_zungqr(PyObject *NPY_UNUSED(self), PyObject *args) TRY(check_object(work,NPY_CDOUBLE,"work","NPY_CDOUBLE","zungqr")); - lapack_lite_status__ = \ - FNAME(zungqr)(&m, &n, &k, ZDATA(a), &lda, ZDATA(tau), ZDATA(work), - &lwork, &info); + lapack_lite_status = + FNAME(zungqr)(&m, &n, &k, ZDATA(a), &lda, ZDATA(tau), ZDATA(work), + &lwork, &info); if (PyErr_Occurred()) { return NULL; } - return Py_BuildValue("{s:i,s:i}","zungqr_",lapack_lite_status__, + return Py_BuildValue("{s:i,s:i}","zungqr_",lapack_lite_status, "info",info); } |