[Numpy-svn] r3572 - trunk/numpy/linalg

numpy-svn@scip... numpy-svn@scip...
Wed Mar 7 13:12:30 CST 2007


Author: oliphant
Date: 2007-03-07 13:12:26 -0600 (Wed, 07 Mar 2007)
New Revision: 3572

Modified:
   trunk/numpy/linalg/lapack_litemodule.c
Log:
Fix problem 64-bit linalg.qr problem.

Modified: trunk/numpy/linalg/lapack_litemodule.c
===================================================================
--- trunk/numpy/linalg/lapack_litemodule.c	2007-03-05 06:06:12 UTC (rev 3571)
+++ trunk/numpy/linalg/lapack_litemodule.c	2007-03-07 19:12:26 UTC (rev 3572)
@@ -520,7 +520,7 @@
         int lda;
         int info;
 
-        TRY(PyArg_ParseTuple(args,"llOlOOll",&m,&n,&a,&lda,&tau,&work,&lwork,&info));
+        TRY(PyArg_ParseTuple(args,"iiOiOOii",&m,&n,&a,&lda,&tau,&work,&lwork,&info));
 
         /* check objects and convert to right storage order */
         TRY(check_object(a,PyArray_DOUBLE,"a","PyArray_DOUBLE","dgeqrf"));
@@ -531,7 +531,7 @@
                 FNAME(dgeqrf)(&m, &n, DDATA(a), &lda, DDATA(tau),
                               DDATA(work), &lwork, &info);
 
-        return Py_BuildValue("{s:l,s:l,s:l,s:l,s:l,s:l}","dgeqrf_",
+        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,
                              "lwork",lwork,"info",info);
 }
@@ -546,14 +546,14 @@
         int lda;
         int info;
 
-        TRY(PyArg_ParseTuple(args,"lllOlOOll",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
+        TRY(PyArg_ParseTuple(args,"iiiOiOOii",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
         TRY(check_object(a,PyArray_DOUBLE,"a","PyArray_DOUBLE","dorgqr"));
         TRY(check_object(tau,PyArray_DOUBLE,"tau","PyArray_DOUBLE","dorgqr"));
         TRY(check_object(work,PyArray_DOUBLE,"work","PyArray_DOUBLE","dorgqr"));
         lapack_lite_status__ = \
         FNAME(dorgqr)(&m, &n, &k, DDATA(a), &lda, DDATA(tau), DDATA(work), &lwork, &info);
 
-        return Py_BuildValue("{s:l,s:l}","dorgqr_",lapack_lite_status__,
+        return Py_BuildValue("{s:i,s:i}","dorgqr_",lapack_lite_status__,
                              "info",info);
 }
 
@@ -778,7 +778,7 @@
         int lda;
         int info;
 
-        TRY(PyArg_ParseTuple(args,"lllOlOOll",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
+        TRY(PyArg_ParseTuple(args,"iiiOiOOii",  &m, &n, &k, &a, &lda, &tau, &work, &lwork, &info));
         TRY(check_object(a,PyArray_CDOUBLE,"a","PyArray_CDOUBLE","zungqr"));
         TRY(check_object(tau,PyArray_CDOUBLE,"tau","PyArray_CDOUBLE","zungqr"));
         TRY(check_object(work,PyArray_CDOUBLE,"work","PyArray_CDOUBLE","zungqr"));
@@ -788,7 +788,7 @@
         FNAME(zungqr)(&m, &n, &k, ZDATA(a), &lda, ZDATA(tau), ZDATA(work),
                       &lwork, &info);
 
-        return Py_BuildValue("{s:l,s:l}","zungqr_",lapack_lite_status__,
+        return Py_BuildValue("{s:i,s:i}","zungqr_",lapack_lite_status__,
                              "info",info);
 }
 



More information about the Numpy-svn mailing list