[Scipy-svn] r4645 - trunk/scipy/sparse/sparsetools

scipy-svn@scip... scipy-svn@scip...
Thu Aug 14 15:44:52 CDT 2008


Author: wnbell
Date: 2008-08-14 15:44:07 -0500 (Thu, 14 Aug 2008)
New Revision: 4645

Modified:
   trunk/scipy/sparse/sparsetools/bsr.py
   trunk/scipy/sparse/sparsetools/coo.py
   trunk/scipy/sparse/sparsetools/csc.py
   trunk/scipy/sparse/sparsetools/csr.py
   trunk/scipy/sparse/sparsetools/csr_wrap.cxx
   trunk/scipy/sparse/sparsetools/dia.py
   trunk/scipy/sparse/sparsetools/numpy.i
Log:
update SWIG wrappers to use PyArray_SimpleNew 


Modified: trunk/scipy/sparse/sparsetools/bsr.py
===================================================================
--- trunk/scipy/sparse/sparsetools/bsr.py	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/bsr.py	2008-08-14 20:44:07 UTC (rev 4645)
@@ -51,483 +51,484 @@
 
 
 def bsr_diagonal(*args):
+  """
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax, signed char Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, unsigned char Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax, short Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, unsigned short Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax, int Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, unsigned int Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax, long long Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, unsigned long long Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax, float Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax, double Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax, long double Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, npy_cfloat_wrapper Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, npy_cdouble_wrapper Yx)
+    bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Yx)
     """
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax, signed char Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax, unsigned char Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax, short Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax, unsigned short Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax, int Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax, unsigned int Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax, long long Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, unsigned long long Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax, float Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax, double Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax, long double Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, npy_cfloat_wrapper Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, npy_cdouble_wrapper Yx)
-      bsr_diagonal(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Yx)
-      """
-    return _bsr.bsr_diagonal(*args)
+  return _bsr.bsr_diagonal(*args)
 
 def bsr_scale_rows(*args):
+  """
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax, signed char Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, unsigned char Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax, short Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, unsigned short Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax, int Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, unsigned int Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax, long long Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, unsigned long long Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax, float Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax, double Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax, long double Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx)
+    bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx)
     """
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax, signed char Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax, unsigned char Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax, short Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax, unsigned short Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax, int Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax, unsigned int Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax, long long Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, unsigned long long Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax, float Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax, double Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax, long double Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx)
-      bsr_scale_rows(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx)
-      """
-    return _bsr.bsr_scale_rows(*args)
+  return _bsr.bsr_scale_rows(*args)
 
 def bsr_scale_columns(*args):
+  """
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax, signed char Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, unsigned char Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax, short Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, unsigned short Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax, int Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, unsigned int Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax, long long Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, unsigned long long Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax, float Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax, double Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax, long double Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx)
+    bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx)
     """
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax, signed char Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax, unsigned char Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax, short Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax, unsigned short Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax, int Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax, unsigned int Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax, long long Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, unsigned long long Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax, float Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax, double Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax, long double Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx)
-      bsr_scale_columns(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx)
-      """
-    return _bsr.bsr_scale_columns(*args)
+  return _bsr.bsr_scale_columns(*args)
 
 def bsr_transpose(*args):
+  """
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx)
+    bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx)
     """
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx)
-      bsr_transpose(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx)
-      """
-    return _bsr.bsr_transpose(*args)
+  return _bsr.bsr_transpose(*args)
 
 def bsr_matmat_pass2(*args):
+  """
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, signed char Ax, int Bp, int Bj, signed char Bx, 
+        int Cp, int Cj, signed char Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, unsigned char Ax, int Bp, int Bj, unsigned char Bx, 
+        int Cp, int Cj, unsigned char Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, short Ax, int Bp, int Bj, short Bx, 
+        int Cp, int Cj, short Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, unsigned short Ax, int Bp, int Bj, 
+        unsigned short Bx, int Cp, int Cj, unsigned short Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, int Ax, int Bp, int Bj, int Bx, int Cp, 
+        int Cj, int Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, unsigned int Ax, int Bp, int Bj, unsigned int Bx, 
+        int Cp, int Cj, unsigned int Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, long long Ax, int Bp, int Bj, long long Bx, 
+        int Cp, int Cj, long long Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, unsigned long long Ax, int Bp, int Bj, 
+        unsigned long long Bx, int Cp, int Cj, unsigned long long Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, float Ax, int Bp, int Bj, float Bx, 
+        int Cp, int Cj, float Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, double Ax, int Bp, int Bj, double Bx, 
+        int Cp, int Cj, double Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, long double Ax, int Bp, int Bj, long double Bx, 
+        int Cp, int Cj, long double Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, npy_cfloat_wrapper Ax, int Bp, int Bj, 
+        npy_cfloat_wrapper Bx, int Cp, int Cj, npy_cfloat_wrapper Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, npy_cdouble_wrapper Ax, int Bp, int Bj, 
+        npy_cdouble_wrapper Bx, int Cp, int Cj, 
+        npy_cdouble_wrapper Cx)
+    bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap, 
+        int Aj, npy_clongdouble_wrapper Ax, int Bp, 
+        int Bj, npy_clongdouble_wrapper Bx, int Cp, 
+        int Cj, npy_clongdouble_wrapper Cx)
     """
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, signed char Ax, int Bp, int Bj, signed char Bx,
-          int Cp, int Cj, signed char Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, unsigned char Ax, int Bp, int Bj, unsigned char Bx,
-          int Cp, int Cj, unsigned char Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, short Ax, int Bp, int Bj, short Bx,
-          int Cp, int Cj, short Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, unsigned short Ax, int Bp, int Bj,
-          unsigned short Bx, int Cp, int Cj, unsigned short Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, int Ax, int Bp, int Bj, int Bx, int Cp,
-          int Cj, int Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, unsigned int Ax, int Bp, int Bj, unsigned int Bx,
-          int Cp, int Cj, unsigned int Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, long long Ax, int Bp, int Bj, long long Bx,
-          int Cp, int Cj, long long Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, unsigned long long Ax, int Bp, int Bj,
-          unsigned long long Bx, int Cp, int Cj, unsigned long long Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, float Ax, int Bp, int Bj, float Bx,
-          int Cp, int Cj, float Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, double Ax, int Bp, int Bj, double Bx,
-          int Cp, int Cj, double Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, long double Ax, int Bp, int Bj, long double Bx,
-          int Cp, int Cj, long double Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, npy_cfloat_wrapper Ax, int Bp, int Bj,
-          npy_cfloat_wrapper Bx, int Cp, int Cj, npy_cfloat_wrapper Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, npy_cdouble_wrapper Ax, int Bp, int Bj,
-          npy_cdouble_wrapper Bx, int Cp, int Cj,
-          npy_cdouble_wrapper Cx)
-      bsr_matmat_pass2(int n_brow, int n_bcol, int R, int C, int N, int Ap,
-          int Aj, npy_clongdouble_wrapper Ax, int Bp,
-          int Bj, npy_clongdouble_wrapper Bx, int Cp,
-          int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _bsr.bsr_matmat_pass2(*args)
+  return _bsr.bsr_matmat_pass2(*args)
 
 def bsr_matvec(*args):
+  """
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax, signed char Xx, signed char Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, unsigned char Xx, unsigned char Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax, short Xx, short Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, unsigned short Xx, unsigned short Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax, int Xx, int Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, unsigned int Xx, unsigned int Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax, long long Xx, long long Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, unsigned long long Xx, 
+        unsigned long long Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax, float Xx, float Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax, double Xx, double Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax, long double Xx, long double Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx, 
+        npy_clongdouble_wrapper Yx)
     """
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax, signed char Xx, signed char Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax, unsigned char Xx, unsigned char Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax, short Xx, short Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax, unsigned short Xx, unsigned short Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax, int Xx, int Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax, unsigned int Xx, unsigned int Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax, long long Xx, long long Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, unsigned long long Xx,
-          unsigned long long Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax, float Xx, float Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax, double Xx, double Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax, long double Xx, long double Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      bsr_matvec(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _bsr.bsr_matvec(*args)
+  return _bsr.bsr_matvec(*args)
 
 def bsr_matvecs(*args):
+  """
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, signed char Ax, signed char Xx, 
+        signed char Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, unsigned char Ax, unsigned char Xx, 
+        unsigned char Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, short Ax, short Xx, short Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, unsigned short Ax, unsigned short Xx, 
+        unsigned short Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, int Ax, int Xx, int Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, unsigned int Ax, unsigned int Xx, 
+        unsigned int Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, long long Ax, long long Xx, long long Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, unsigned long long Ax, unsigned long long Xx, 
+        unsigned long long Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, float Ax, float Xx, float Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, double Ax, double Xx, double Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, long double Ax, long double Xx, 
+        long double Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap, 
+        int Aj, npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx, 
+        npy_clongdouble_wrapper Yx)
     """
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, signed char Ax, signed char Xx,
-          signed char Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, unsigned char Ax, unsigned char Xx,
-          unsigned char Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, short Ax, short Xx, short Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, unsigned short Ax, unsigned short Xx,
-          unsigned short Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, int Ax, int Xx, int Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, unsigned int Ax, unsigned int Xx,
-          unsigned int Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, long long Ax, long long Xx, long long Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, unsigned long long Ax, unsigned long long Xx,
-          unsigned long long Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, float Ax, float Xx, float Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, double Ax, double Xx, double Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, long double Ax, long double Xx,
-          long double Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      bsr_matvecs(int n_brow, int n_bcol, int n_vecs, int R, int C, int Ap,
-          int Aj, npy_clongdouble_wrapper Ax, npy_clongdouble_wrapper Xx,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _bsr.bsr_matvecs(*args)
+  return _bsr.bsr_matvecs(*args)
 
 def bsr_elmul_bsr(*args):
+  """
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx, 
+        int Cp, int Cj, signed char Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx, 
+        int Cp, int Cj, unsigned char Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx, int Cp, 
+        int Cj, short Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx, 
+        int Cp, int Cj, unsigned short Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx, int Cp, int Cj, 
+        int Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx, 
+        int Cp, int Cj, unsigned int Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx, 
+        int Cp, int Cj, long long Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx, int Cp, 
+        int Cj, float Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx, int Cp, 
+        int Cj, double Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx, 
+        int Cp, int Cj, long double Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx,
-          int Cp, int Cj, signed char Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx,
-          int Cp, int Cj, unsigned char Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx, int Cp,
-          int Cj, short Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx,
-          int Cp, int Cj, unsigned short Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx, int Cp, int Cj,
-          int Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx,
-          int Cp, int Cj, unsigned int Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx,
-          int Cp, int Cj, long long Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx, int Cp,
-          int Cj, float Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx, int Cp,
-          int Cj, double Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx,
-          int Cp, int Cj, long double Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      bsr_elmul_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _bsr.bsr_elmul_bsr(*args)
+  return _bsr.bsr_elmul_bsr(*args)
 
 def bsr_eldiv_bsr(*args):
+  """
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx, 
+        int Cp, int Cj, signed char Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx, 
+        int Cp, int Cj, unsigned char Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx, int Cp, 
+        int Cj, short Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx, 
+        int Cp, int Cj, unsigned short Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx, int Cp, int Cj, 
+        int Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx, 
+        int Cp, int Cj, unsigned int Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx, 
+        int Cp, int Cj, long long Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx, int Cp, 
+        int Cj, float Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx, int Cp, 
+        int Cj, double Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx, 
+        int Cp, int Cj, long double Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx,
-          int Cp, int Cj, signed char Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx,
-          int Cp, int Cj, unsigned char Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx, int Cp,
-          int Cj, short Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx,
-          int Cp, int Cj, unsigned short Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx, int Cp, int Cj,
-          int Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx,
-          int Cp, int Cj, unsigned int Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx,
-          int Cp, int Cj, long long Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx, int Cp,
-          int Cj, float Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx, int Cp,
-          int Cj, double Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx,
-          int Cp, int Cj, long double Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      bsr_eldiv_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _bsr.bsr_eldiv_bsr(*args)
+  return _bsr.bsr_eldiv_bsr(*args)
 
 def bsr_plus_bsr(*args):
+  """
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx, 
+        int Cp, int Cj, signed char Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx, 
+        int Cp, int Cj, unsigned char Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx, int Cp, 
+        int Cj, short Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx, 
+        int Cp, int Cj, unsigned short Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx, int Cp, int Cj, 
+        int Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx, 
+        int Cp, int Cj, unsigned int Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx, 
+        int Cp, int Cj, long long Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx, int Cp, 
+        int Cj, float Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx, int Cp, 
+        int Cj, double Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx, 
+        int Cp, int Cj, long double Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx,
-          int Cp, int Cj, signed char Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx,
-          int Cp, int Cj, unsigned char Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx, int Cp,
-          int Cj, short Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx,
-          int Cp, int Cj, unsigned short Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx, int Cp, int Cj,
-          int Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx,
-          int Cp, int Cj, unsigned int Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx,
-          int Cp, int Cj, long long Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx, int Cp,
-          int Cj, float Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx, int Cp,
-          int Cj, double Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx,
-          int Cp, int Cj, long double Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      bsr_plus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _bsr.bsr_plus_bsr(*args)
+  return _bsr.bsr_plus_bsr(*args)
 
 def bsr_minus_bsr(*args):
+  """
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx, 
+        int Cp, int Cj, signed char Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx, 
+        int Cp, int Cj, unsigned char Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx, int Cp, 
+        int Cj, short Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx, 
+        int Cp, int Cj, unsigned short Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx, int Cp, int Cj, 
+        int Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx, 
+        int Cp, int Cj, unsigned int Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx, 
+        int Cp, int Cj, long long Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx, int Cp, 
+        int Cj, float Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx, int Cp, 
+        int Cj, double Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx, 
+        int Cp, int Cj, long double Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx,
-          int Cp, int Cj, signed char Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx,
-          int Cp, int Cj, unsigned char Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx, int Cp,
-          int Cj, short Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx,
-          int Cp, int Cj, unsigned short Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx, int Cp, int Cj,
-          int Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx,
-          int Cp, int Cj, unsigned int Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx,
-          int Cp, int Cj, long long Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx, int Cp,
-          int Cj, float Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx, int Cp,
-          int Cj, double Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx,
-          int Cp, int Cj, long double Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      bsr_minus_bsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx, int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _bsr.bsr_minus_bsr(*args)
+  return _bsr.bsr_minus_bsr(*args)
 
 def bsr_sort_indices(*args):
+  """
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        signed char Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned char Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        short Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned short Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        int Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned int Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long long Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        float Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        double Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        long double Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax)
+    bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax)
     """
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          signed char Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned char Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          short Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned short Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          int Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned int Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long long Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          unsigned long long Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          float Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          double Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          long double Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax)
-      bsr_sort_indices(int n_brow, int n_bcol, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax)
-      """
-    return _bsr.bsr_sort_indices(*args)
+  return _bsr.bsr_sort_indices(*args)
+

Modified: trunk/scipy/sparse/sparsetools/coo.py
===================================================================
--- trunk/scipy/sparse/sparsetools/coo.py	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/coo.py	2008-08-14 20:44:07 UTC (rev 4645)
@@ -51,129 +51,130 @@
 
 
 def coo_tocsr(*args):
+  """
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax, 
+        int Bp, int Bj, short Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax, 
+        int Bp, int Bj, int Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax, 
+        int Bp, int Bj, float Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax, 
+        int Bp, int Bj, double Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx)
+    coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx)
     """
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax,
-          int Bp, int Bj, short Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax,
-          int Bp, int Bj, int Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax,
-          int Bp, int Bj, float Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax,
-          int Bp, int Bj, double Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx)
-      coo_tocsr(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx)
-      """
-    return _coo.coo_tocsr(*args)
+  return _coo.coo_tocsr(*args)
 
 def coo_tocsc(*args):
+  """
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax, 
+        int Bp, int Bi, signed char Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax, 
+        int Bp, int Bi, short Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax, 
+        int Bp, int Bi, int Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax, 
+        int Bp, int Bi, long long Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax, 
+        int Bp, int Bi, float Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax, 
+        int Bp, int Bi, double Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax, 
+        int Bp, int Bi, long double Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx)
+    coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx)
     """
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax,
-          int Bp, int Bi, signed char Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax,
-          int Bp, int Bi, short Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax,
-          int Bp, int Bi, int Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax,
-          int Bp, int Bi, long long Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax,
-          int Bp, int Bi, float Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax,
-          int Bp, int Bi, double Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax,
-          int Bp, int Bi, long double Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx)
-      coo_tocsc(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx)
-      """
-    return _coo.coo_tocsc(*args)
+  return _coo.coo_tocsc(*args)
 
 def coo_todense(*args):
+  """
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax, 
+        signed char Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax, 
+        unsigned char Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax, 
+        short Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax, 
+        unsigned short Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax, 
+        int Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax, 
+        unsigned int Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax, 
+        long long Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax, 
+        unsigned long long Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax, 
+        float Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax, 
+        double Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax, 
+        long double Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Bx)
+    coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Bx)
     """
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, signed char Ax,
-          signed char Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned char Ax,
-          unsigned char Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, short Ax,
-          short Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned short Ax,
-          unsigned short Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, int Ax,
-          int Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned int Ax,
-          unsigned int Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, long long Ax,
-          long long Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, unsigned long long Ax,
-          unsigned long long Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, float Ax,
-          float Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, double Ax,
-          double Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, long double Ax,
-          long double Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Bx)
-      coo_todense(int n_row, int n_col, int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Bx)
-      """
-    return _coo.coo_todense(*args)
+  return _coo.coo_todense(*args)
 
 def coo_matvec(*args):
+  """
+    coo_matvec(int nnz, int Ai, int Aj, signed char Ax, signed char Xx, 
+        signed char Yx)
+    coo_matvec(int nnz, int Ai, int Aj, unsigned char Ax, unsigned char Xx, 
+        unsigned char Yx)
+    coo_matvec(int nnz, int Ai, int Aj, short Ax, short Xx, short Yx)
+    coo_matvec(int nnz, int Ai, int Aj, unsigned short Ax, unsigned short Xx, 
+        unsigned short Yx)
+    coo_matvec(int nnz, int Ai, int Aj, int Ax, int Xx, int Yx)
+    coo_matvec(int nnz, int Ai, int Aj, unsigned int Ax, unsigned int Xx, 
+        unsigned int Yx)
+    coo_matvec(int nnz, int Ai, int Aj, long long Ax, long long Xx, 
+        long long Yx)
+    coo_matvec(int nnz, int Ai, int Aj, unsigned long long Ax, unsigned long long Xx, 
+        unsigned long long Yx)
+    coo_matvec(int nnz, int Ai, int Aj, float Ax, float Xx, float Yx)
+    coo_matvec(int nnz, int Ai, int Aj, double Ax, double Xx, double Yx)
+    coo_matvec(int nnz, int Ai, int Aj, long double Ax, long double Xx, 
+        long double Yx)
+    coo_matvec(int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    coo_matvec(int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    coo_matvec(int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
     """
-      coo_matvec(int nnz, int Ai, int Aj, signed char Ax, signed char Xx,
-          signed char Yx)
-      coo_matvec(int nnz, int Ai, int Aj, unsigned char Ax, unsigned char Xx,
-          unsigned char Yx)
-      coo_matvec(int nnz, int Ai, int Aj, short Ax, short Xx, short Yx)
-      coo_matvec(int nnz, int Ai, int Aj, unsigned short Ax, unsigned short Xx,
-          unsigned short Yx)
-      coo_matvec(int nnz, int Ai, int Aj, int Ax, int Xx, int Yx)
-      coo_matvec(int nnz, int Ai, int Aj, unsigned int Ax, unsigned int Xx,
-          unsigned int Yx)
-      coo_matvec(int nnz, int Ai, int Aj, long long Ax, long long Xx,
-          long long Yx)
-      coo_matvec(int nnz, int Ai, int Aj, unsigned long long Ax, unsigned long long Xx,
-          unsigned long long Yx)
-      coo_matvec(int nnz, int Ai, int Aj, float Ax, float Xx, float Yx)
-      coo_matvec(int nnz, int Ai, int Aj, double Ax, double Xx, double Yx)
-      coo_matvec(int nnz, int Ai, int Aj, long double Ax, long double Xx,
-          long double Yx)
-      coo_matvec(int nnz, int Ai, int Aj, npy_cfloat_wrapper Ax, npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      coo_matvec(int nnz, int Ai, int Aj, npy_cdouble_wrapper Ax, npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      coo_matvec(int nnz, int Ai, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
-      """
-    return _coo.coo_matvec(*args)
+  return _coo.coo_matvec(*args)
+

Modified: trunk/scipy/sparse/sparsetools/csc.py
===================================================================
--- trunk/scipy/sparse/sparsetools/csc.py	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/csc.py	2008-08-14 20:44:07 UTC (rev 4645)
@@ -50,356 +50,357 @@
 
 
 def csc_matmat_pass1(*args):
+  """
+    csc_matmat_pass1(int n_row, int n_col, int Ap, int Ai, int Bp, int Bi, 
+        int Cp)
     """
-      csc_matmat_pass1(int n_row, int n_col, int Ap, int Ai, int Bp, int Bi,
-          int Cp)
-      """
-    return _csc.csc_matmat_pass1(*args)
+  return _csc.csc_matmat_pass1(*args)
 
 
 def csc_diagonal(*args):
+  """
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        signed char Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, short Ax, short Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, int Ax, int Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        long long Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, float Ax, float Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, double Ax, double Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        long double Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Yx)
+    csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Yx)
     """
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          signed char Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          unsigned char Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, short Ax, short Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          unsigned short Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, int Ax, int Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          unsigned int Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          long long Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, float Ax, float Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, double Ax, double Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          long double Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Yx)
-      csc_diagonal(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _csc.csc_diagonal(*args)
+  return _csc.csc_diagonal(*args)
 
 def csc_tocsr(*args):
+  """
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bj, signed char Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bj, short Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bj, int Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bj, long long Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bj, float Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bj, double Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bj, long double Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx)
+    csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx)
     """
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bj, signed char Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bj, short Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bj, int Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bj, long long Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bj, float Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bj, double Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bj, long double Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx)
-      csc_tocsr(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx)
-      """
-    return _csc.csc_tocsr(*args)
+  return _csc.csc_tocsr(*args)
 
 def csc_matmat_pass2(*args):
+  """
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bi, signed char Bx, int Cp, int Ci, 
+        signed char Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx, int Cp, 
+        int Ci, unsigned char Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bi, short Bx, int Cp, int Ci, short Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx, int Cp, 
+        int Ci, unsigned short Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bi, int Bx, int Cp, int Ci, int Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx, int Cp, 
+        int Ci, unsigned int Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bi, long long Bx, int Cp, int Ci, 
+        long long Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx, 
+        int Cp, int Ci, unsigned long long Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bi, float Bx, int Cp, int Ci, float Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bi, double Bx, int Cp, int Ci, double Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bi, long double Bx, int Cp, int Ci, 
+        long double Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx, 
+        int Cp, int Ci, npy_cfloat_wrapper Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx, 
+        int Cp, int Ci, npy_cdouble_wrapper Cx)
+    csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx, 
+        int Cp, int Ci, npy_clongdouble_wrapper Cx)
     """
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bi, signed char Bx, int Cp, int Ci,
-          signed char Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx, int Cp,
-          int Ci, unsigned char Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bi, short Bx, int Cp, int Ci, short Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx, int Cp,
-          int Ci, unsigned short Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bi, int Bx, int Cp, int Ci, int Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx, int Cp,
-          int Ci, unsigned int Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bi, long long Bx, int Cp, int Ci,
-          long long Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx,
-          int Cp, int Ci, unsigned long long Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bi, float Bx, int Cp, int Ci, float Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bi, double Bx, int Cp, int Ci, double Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bi, long double Bx, int Cp, int Ci,
-          long double Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx,
-          int Cp, int Ci, npy_cfloat_wrapper Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx,
-          int Cp, int Ci, npy_cdouble_wrapper Cx)
-      csc_matmat_pass2(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx,
-          int Cp, int Ci, npy_clongdouble_wrapper Cx)
-      """
-    return _csc.csc_matmat_pass2(*args)
+  return _csc.csc_matmat_pass2(*args)
 
 def csc_matvec(*args):
+  """
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        signed char Xx, signed char Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        unsigned char Xx, unsigned char Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, short Ax, short Xx, 
+        short Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        unsigned short Xx, unsigned short Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, int Ax, int Xx, 
+        int Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        unsigned int Xx, unsigned int Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        long long Xx, long long Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        unsigned long long Xx, unsigned long long Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, float Ax, float Xx, 
+        float Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, double Ax, double Xx, 
+        double Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        long double Xx, long double Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx, npy_cfloat_wrapper Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx, npy_cdouble_wrapper Yx)
+    csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
     """
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          signed char Xx, signed char Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          unsigned char Xx, unsigned char Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, short Ax, short Xx,
-          short Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          unsigned short Xx, unsigned short Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, int Ax, int Xx,
-          int Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          unsigned int Xx, unsigned int Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          long long Xx, long long Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          unsigned long long Xx, unsigned long long Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, float Ax, float Xx,
-          float Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, double Ax, double Xx,
-          double Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          long double Xx, long double Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx, npy_cfloat_wrapper Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx, npy_cdouble_wrapper Yx)
-      csc_matvec(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
-      """
-    return _csc.csc_matvec(*args)
+  return _csc.csc_matvec(*args)
 
 def csc_matvecs(*args):
+  """
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, signed char Ax, 
+        signed char Xx, signed char Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned char Ax, 
+        unsigned char Xx, unsigned char Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, short Ax, 
+        short Xx, short Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned short Ax, 
+        unsigned short Xx, unsigned short Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, int Ax, 
+        int Xx, int Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned int Ax, 
+        unsigned int Xx, unsigned int Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, long long Ax, 
+        long long Xx, long long Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned long long Ax, 
+        unsigned long long Xx, 
+        unsigned long long Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, float Ax, 
+        float Xx, float Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, double Ax, 
+        double Xx, double Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, long double Ax, 
+        long double Xx, long double Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx, 
+        npy_clongdouble_wrapper Yx)
     """
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, signed char Ax,
-          signed char Xx, signed char Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned char Ax,
-          unsigned char Xx, unsigned char Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, short Ax,
-          short Xx, short Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned short Ax,
-          unsigned short Xx, unsigned short Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, int Ax,
-          int Xx, int Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned int Ax,
-          unsigned int Xx, unsigned int Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, long long Ax,
-          long long Xx, long long Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, unsigned long long Ax,
-          unsigned long long Xx,
-          unsigned long long Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, float Ax,
-          float Xx, float Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, double Ax,
-          double Xx, double Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, long double Ax,
-          long double Xx, long double Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      csc_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _csc.csc_matvecs(*args)
+  return _csc.csc_matvecs(*args)
 
 def csc_elmul_csc(*args):
+  """
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bi, signed char Bx, int Cp, int Ci, 
+        signed char Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx, int Cp, 
+        int Ci, unsigned char Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bi, short Bx, int Cp, int Ci, short Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx, int Cp, 
+        int Ci, unsigned short Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bi, int Bx, int Cp, int Ci, int Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx, int Cp, 
+        int Ci, unsigned int Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bi, long long Bx, int Cp, int Ci, 
+        long long Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx, 
+        int Cp, int Ci, unsigned long long Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bi, float Bx, int Cp, int Ci, float Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bi, double Bx, int Cp, int Ci, double Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bi, long double Bx, int Cp, int Ci, 
+        long double Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx, 
+        int Cp, int Ci, npy_cfloat_wrapper Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx, 
+        int Cp, int Ci, npy_cdouble_wrapper Cx)
+    csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx, 
+        int Cp, int Ci, npy_clongdouble_wrapper Cx)
     """
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bi, signed char Bx, int Cp, int Ci,
-          signed char Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx, int Cp,
-          int Ci, unsigned char Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bi, short Bx, int Cp, int Ci, short Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx, int Cp,
-          int Ci, unsigned short Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bi, int Bx, int Cp, int Ci, int Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx, int Cp,
-          int Ci, unsigned int Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bi, long long Bx, int Cp, int Ci,
-          long long Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx,
-          int Cp, int Ci, unsigned long long Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bi, float Bx, int Cp, int Ci, float Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bi, double Bx, int Cp, int Ci, double Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bi, long double Bx, int Cp, int Ci,
-          long double Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx,
-          int Cp, int Ci, npy_cfloat_wrapper Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx,
-          int Cp, int Ci, npy_cdouble_wrapper Cx)
-      csc_elmul_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx,
-          int Cp, int Ci, npy_clongdouble_wrapper Cx)
-      """
-    return _csc.csc_elmul_csc(*args)
+  return _csc.csc_elmul_csc(*args)
 
 def csc_eldiv_csc(*args):
+  """
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bi, signed char Bx, int Cp, int Ci, 
+        signed char Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx, int Cp, 
+        int Ci, unsigned char Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bi, short Bx, int Cp, int Ci, short Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx, int Cp, 
+        int Ci, unsigned short Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bi, int Bx, int Cp, int Ci, int Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx, int Cp, 
+        int Ci, unsigned int Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bi, long long Bx, int Cp, int Ci, 
+        long long Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx, 
+        int Cp, int Ci, unsigned long long Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bi, float Bx, int Cp, int Ci, float Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bi, double Bx, int Cp, int Ci, double Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bi, long double Bx, int Cp, int Ci, 
+        long double Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx, 
+        int Cp, int Ci, npy_cfloat_wrapper Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx, 
+        int Cp, int Ci, npy_cdouble_wrapper Cx)
+    csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx, 
+        int Cp, int Ci, npy_clongdouble_wrapper Cx)
     """
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bi, signed char Bx, int Cp, int Ci,
-          signed char Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx, int Cp,
-          int Ci, unsigned char Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bi, short Bx, int Cp, int Ci, short Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx, int Cp,
-          int Ci, unsigned short Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bi, int Bx, int Cp, int Ci, int Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx, int Cp,
-          int Ci, unsigned int Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bi, long long Bx, int Cp, int Ci,
-          long long Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx,
-          int Cp, int Ci, unsigned long long Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bi, float Bx, int Cp, int Ci, float Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bi, double Bx, int Cp, int Ci, double Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bi, long double Bx, int Cp, int Ci,
-          long double Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx,
-          int Cp, int Ci, npy_cfloat_wrapper Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx,
-          int Cp, int Ci, npy_cdouble_wrapper Cx)
-      csc_eldiv_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx,
-          int Cp, int Ci, npy_clongdouble_wrapper Cx)
-      """
-    return _csc.csc_eldiv_csc(*args)
+  return _csc.csc_eldiv_csc(*args)
 
 def csc_plus_csc(*args):
+  """
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bi, signed char Bx, int Cp, int Ci, 
+        signed char Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx, int Cp, 
+        int Ci, unsigned char Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bi, short Bx, int Cp, int Ci, short Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx, int Cp, 
+        int Ci, unsigned short Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bi, int Bx, int Cp, int Ci, int Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx, int Cp, 
+        int Ci, unsigned int Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bi, long long Bx, int Cp, int Ci, 
+        long long Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx, 
+        int Cp, int Ci, unsigned long long Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bi, float Bx, int Cp, int Ci, float Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bi, double Bx, int Cp, int Ci, double Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bi, long double Bx, int Cp, int Ci, 
+        long double Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx, 
+        int Cp, int Ci, npy_cfloat_wrapper Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx, 
+        int Cp, int Ci, npy_cdouble_wrapper Cx)
+    csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx, 
+        int Cp, int Ci, npy_clongdouble_wrapper Cx)
     """
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bi, signed char Bx, int Cp, int Ci,
-          signed char Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx, int Cp,
-          int Ci, unsigned char Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bi, short Bx, int Cp, int Ci, short Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx, int Cp,
-          int Ci, unsigned short Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bi, int Bx, int Cp, int Ci, int Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx, int Cp,
-          int Ci, unsigned int Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bi, long long Bx, int Cp, int Ci,
-          long long Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx,
-          int Cp, int Ci, unsigned long long Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bi, float Bx, int Cp, int Ci, float Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bi, double Bx, int Cp, int Ci, double Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bi, long double Bx, int Cp, int Ci,
-          long double Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx,
-          int Cp, int Ci, npy_cfloat_wrapper Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx,
-          int Cp, int Ci, npy_cdouble_wrapper Cx)
-      csc_plus_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx,
-          int Cp, int Ci, npy_clongdouble_wrapper Cx)
-      """
-    return _csc.csc_plus_csc(*args)
+  return _csc.csc_plus_csc(*args)
 
 def csc_minus_csc(*args):
+  """
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax, 
+        int Bp, int Bi, signed char Bx, int Cp, int Ci, 
+        signed char Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx, int Cp, 
+        int Ci, unsigned char Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp, 
+        int Bi, short Bx, int Cp, int Ci, short Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx, int Cp, 
+        int Ci, unsigned short Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp, 
+        int Bi, int Bx, int Cp, int Ci, int Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx, int Cp, 
+        int Ci, unsigned int Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, long long Ax, 
+        int Bp, int Bi, long long Bx, int Cp, int Ci, 
+        long long Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx, 
+        int Cp, int Ci, unsigned long long Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp, 
+        int Bi, float Bx, int Cp, int Ci, float Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp, 
+        int Bi, double Bx, int Cp, int Ci, double Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, long double Ax, 
+        int Bp, int Bi, long double Bx, int Cp, int Ci, 
+        long double Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx, 
+        int Cp, int Ci, npy_cfloat_wrapper Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx, 
+        int Cp, int Ci, npy_cdouble_wrapper Cx)
+    csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx, 
+        int Cp, int Ci, npy_clongdouble_wrapper Cx)
     """
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, signed char Ax,
-          int Bp, int Bi, signed char Bx, int Cp, int Ci,
-          signed char Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx, int Cp,
-          int Ci, unsigned char Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, short Ax, int Bp,
-          int Bi, short Bx, int Cp, int Ci, short Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx, int Cp,
-          int Ci, unsigned short Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, int Ax, int Bp,
-          int Bi, int Bx, int Cp, int Ci, int Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx, int Cp,
-          int Ci, unsigned int Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, long long Ax,
-          int Bp, int Bi, long long Bx, int Cp, int Ci,
-          long long Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx,
-          int Cp, int Ci, unsigned long long Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, float Ax, int Bp,
-          int Bi, float Bx, int Cp, int Ci, float Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, double Ax, int Bp,
-          int Bi, double Bx, int Cp, int Ci, double Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, long double Ax,
-          int Bp, int Bi, long double Bx, int Cp, int Ci,
-          long double Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx,
-          int Cp, int Ci, npy_cfloat_wrapper Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx,
-          int Cp, int Ci, npy_cdouble_wrapper Cx)
-      csc_minus_csc(int n_row, int n_col, int Ap, int Ai, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx,
-          int Cp, int Ci, npy_clongdouble_wrapper Cx)
-      """
-    return _csc.csc_minus_csc(*args)
+  return _csc.csc_minus_csc(*args)
+

Modified: trunk/scipy/sparse/sparsetools/csr.py
===================================================================
--- trunk/scipy/sparse/sparsetools/csr.py	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/csr.py	2008-08-14 20:44:07 UTC (rev 4645)
@@ -50,568 +50,569 @@
 
 
 def expandptr(*args):
-    """expandptr(int n_row, int Ap, int Bi)"""
-    return _csr.expandptr(*args)
+  """expandptr(int n_row, int Ap, int Bi)"""
+  return _csr.expandptr(*args)
 
 def csr_count_blocks(*args):
-    """csr_count_blocks(int n_row, int n_col, int R, int C, int Ap, int Aj) -> int"""
-    return _csr.csr_count_blocks(*args)
+  """csr_count_blocks(int n_row, int n_col, int R, int C, int Ap, int Aj) -> int"""
+  return _csr.csr_count_blocks(*args)
 
 def csr_matmat_pass1(*args):
+  """
+    csr_matmat_pass1(int n_row, int n_col, int Ap, int Aj, int Bp, int Bj, 
+        int Cp)
     """
-      csr_matmat_pass1(int n_row, int n_col, int Ap, int Aj, int Bp, int Bj,
-          int Cp)
-      """
-    return _csr.csr_matmat_pass1(*args)
+  return _csr.csr_matmat_pass1(*args)
 
 def csr_has_sorted_indices(*args):
-    """csr_has_sorted_indices(int n_row, int Ap, int Aj) -> bool"""
-    return _csr.csr_has_sorted_indices(*args)
+  """csr_has_sorted_indices(int n_row, int Ap, int Aj) -> bool"""
+  return _csr.csr_has_sorted_indices(*args)
 
 
 def csr_diagonal(*args):
+  """
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        signed char Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, short Ax, short Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, int Ax, int Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        long long Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, float Ax, float Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, double Ax, double Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        long double Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Yx)
+    csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Yx)
     """
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          signed char Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          unsigned char Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, short Ax, short Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          unsigned short Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, int Ax, int Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          unsigned int Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          long long Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, float Ax, float Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, double Ax, double Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          long double Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Yx)
-      csr_diagonal(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _csr.csr_diagonal(*args)
+  return _csr.csr_diagonal(*args)
 
 def csr_scale_rows(*args):
+  """
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        signed char Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        long long Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        long double Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx)
+    csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx)
     """
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          signed char Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          unsigned char Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          unsigned short Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          unsigned int Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          long long Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          long double Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx)
-      csr_scale_rows(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx)
-      """
-    return _csr.csr_scale_rows(*args)
+  return _csr.csr_scale_rows(*args)
 
 def csr_scale_columns(*args):
+  """
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        signed char Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        long long Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        long double Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx)
+    csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx)
     """
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          signed char Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          unsigned char Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          unsigned short Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          unsigned int Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          long long Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          long double Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx)
-      csr_scale_columns(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx)
-      """
-    return _csr.csr_scale_columns(*args)
+  return _csr.csr_scale_columns(*args)
 
 def csr_tocsc(*args):
+  """
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bi, signed char Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bi, unsigned char Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bi, short Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bi, unsigned short Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bi, int Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bi, unsigned int Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bi, long long Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bi, unsigned long long Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bi, float Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bi, double Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bi, long double Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bi, npy_cfloat_wrapper Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bi, npy_cdouble_wrapper Bx)
+    csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bi, npy_clongdouble_wrapper Bx)
     """
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bi, signed char Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bi, unsigned char Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bi, short Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bi, unsigned short Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bi, int Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bi, unsigned int Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bi, long long Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bi, unsigned long long Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bi, float Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bi, double Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bi, long double Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bi, npy_cfloat_wrapper Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bi, npy_cdouble_wrapper Bx)
-      csr_tocsc(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bi, npy_clongdouble_wrapper Bx)
-      """
-    return _csr.csr_tocsc(*args)
+  return _csr.csr_tocsc(*args)
 
 def csr_tobsr(*args):
+  """
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        signed char Ax, int Bp, int Bj, signed char Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned char Ax, int Bp, int Bj, unsigned char Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        short Ax, int Bp, int Bj, short Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned short Ax, int Bp, int Bj, unsigned short Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        int Ax, int Bp, int Bj, int Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned int Ax, int Bp, int Bj, unsigned int Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long long Ax, int Bp, int Bj, long long Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        unsigned long long Ax, int Bp, int Bj, unsigned long long Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        float Ax, int Bp, int Bj, float Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        double Ax, int Bp, int Bj, double Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        long double Ax, int Bp, int Bj, long double Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx)
+    csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj, 
+        npy_clongdouble_wrapper Ax, int Bp, int Bj, 
+        npy_clongdouble_wrapper Bx)
     """
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          signed char Ax, int Bp, int Bj, signed char Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned char Ax, int Bp, int Bj, unsigned char Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          short Ax, int Bp, int Bj, short Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned short Ax, int Bp, int Bj, unsigned short Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          int Ax, int Bp, int Bj, int Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned int Ax, int Bp, int Bj, unsigned int Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long long Ax, int Bp, int Bj, long long Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          unsigned long long Ax, int Bp, int Bj, unsigned long long Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          float Ax, int Bp, int Bj, float Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          double Ax, int Bp, int Bj, double Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          long double Ax, int Bp, int Bj, long double Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cfloat_wrapper Ax, int Bp, int Bj, npy_cfloat_wrapper Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_cdouble_wrapper Ax, int Bp, int Bj, npy_cdouble_wrapper Bx)
-      csr_tobsr(int n_row, int n_col, int R, int C, int Ap, int Aj,
-          npy_clongdouble_wrapper Ax, int Bp, int Bj,
-          npy_clongdouble_wrapper Bx)
-      """
-    return _csr.csr_tobsr(*args)
+  return _csr.csr_tobsr(*args)
 
 def csr_matmat_pass2(*args):
+  """
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx, int Cp, int Cj, 
+        signed char Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx, int Cp, 
+        int Cj, unsigned char Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bj, short Bx, int Cp, int Cj, short Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx, int Cp, 
+        int Cj, unsigned short Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bj, int Bx, int Cp, int Cj, int Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx, int Cp, 
+        int Cj, unsigned int Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx, int Cp, int Cj, 
+        long long Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bj, float Bx, int Cp, int Cj, float Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bj, double Bx, int Cp, int Cj, double Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx, int Cp, int Cj, 
+        long double Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx, 
+        int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx, int Cp, int Cj,
-          signed char Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx, int Cp,
-          int Cj, unsigned char Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bj, short Bx, int Cp, int Cj, short Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx, int Cp,
-          int Cj, unsigned short Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bj, int Bx, int Cp, int Cj, int Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx, int Cp,
-          int Cj, unsigned int Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx, int Cp, int Cj,
-          long long Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bj, float Bx, int Cp, int Cj, float Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bj, double Bx, int Cp, int Cj, double Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx, int Cp, int Cj,
-          long double Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      csr_matmat_pass2(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx,
-          int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _csr.csr_matmat_pass2(*args)
+  return _csr.csr_matmat_pass2(*args)
 
 def csr_matvec(*args):
+  """
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        signed char Xx, signed char Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Xx, unsigned char Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx, 
+        short Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Xx, unsigned short Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx, 
+        int Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Xx, unsigned int Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        long long Xx, long long Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Xx, unsigned long long Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx, 
+        float Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx, 
+        double Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        long double Xx, long double Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx, npy_cfloat_wrapper Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx, npy_cdouble_wrapper Yx)
+    csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
     """
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          signed char Xx, signed char Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          unsigned char Xx, unsigned char Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, short Ax, short Xx,
-          short Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          unsigned short Xx, unsigned short Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, int Ax, int Xx,
-          int Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          unsigned int Xx, unsigned int Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          long long Xx, long long Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Xx, unsigned long long Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, float Ax, float Xx,
-          float Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, double Ax, double Xx,
-          double Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          long double Xx, long double Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx, npy_cfloat_wrapper Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx, npy_cdouble_wrapper Yx)
-      csr_matvec(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx, npy_clongdouble_wrapper Yx)
-      """
-    return _csr.csr_matvec(*args)
+  return _csr.csr_matvec(*args)
 
 def csr_matvecs(*args):
+  """
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, signed char Ax, 
+        signed char Xx, signed char Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned char Ax, 
+        unsigned char Xx, unsigned char Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, short Ax, 
+        short Xx, short Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned short Ax, 
+        unsigned short Xx, unsigned short Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, int Ax, 
+        int Xx, int Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned int Ax, 
+        unsigned int Xx, unsigned int Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, long long Ax, 
+        long long Xx, long long Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned long long Ax, 
+        unsigned long long Xx, 
+        unsigned long long Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, float Ax, 
+        float Xx, float Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, double Ax, 
+        double Xx, double Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, long double Ax, 
+        long double Xx, long double Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        npy_clongdouble_wrapper Xx, 
+        npy_clongdouble_wrapper Yx)
     """
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, signed char Ax,
-          signed char Xx, signed char Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned char Ax,
-          unsigned char Xx, unsigned char Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, short Ax,
-          short Xx, short Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned short Ax,
-          unsigned short Xx, unsigned short Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, int Ax,
-          int Xx, int Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned int Ax,
-          unsigned int Xx, unsigned int Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, long long Ax,
-          long long Xx, long long Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, unsigned long long Ax,
-          unsigned long long Xx,
-          unsigned long long Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, float Ax,
-          float Xx, float Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, double Ax,
-          double Xx, double Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, long double Ax,
-          long double Xx, long double Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      csr_matvecs(int n_row, int n_col, int n_vecs, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          npy_clongdouble_wrapper Xx,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _csr.csr_matvecs(*args)
+  return _csr.csr_matvecs(*args)
 
 def csr_elmul_csr(*args):
+  """
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx, int Cp, int Cj, 
+        signed char Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx, int Cp, 
+        int Cj, unsigned char Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bj, short Bx, int Cp, int Cj, short Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx, int Cp, 
+        int Cj, unsigned short Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bj, int Bx, int Cp, int Cj, int Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx, int Cp, 
+        int Cj, unsigned int Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx, int Cp, int Cj, 
+        long long Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bj, float Bx, int Cp, int Cj, float Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bj, double Bx, int Cp, int Cj, double Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx, int Cp, int Cj, 
+        long double Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx, 
+        int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx, int Cp, int Cj,
-          signed char Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx, int Cp,
-          int Cj, unsigned char Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bj, short Bx, int Cp, int Cj, short Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx, int Cp,
-          int Cj, unsigned short Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bj, int Bx, int Cp, int Cj, int Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx, int Cp,
-          int Cj, unsigned int Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx, int Cp, int Cj,
-          long long Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bj, float Bx, int Cp, int Cj, float Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bj, double Bx, int Cp, int Cj, double Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx, int Cp, int Cj,
-          long double Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      csr_elmul_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx,
-          int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _csr.csr_elmul_csr(*args)
+  return _csr.csr_elmul_csr(*args)
 
 def csr_eldiv_csr(*args):
+  """
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx, int Cp, int Cj, 
+        signed char Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx, int Cp, 
+        int Cj, unsigned char Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bj, short Bx, int Cp, int Cj, short Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx, int Cp, 
+        int Cj, unsigned short Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bj, int Bx, int Cp, int Cj, int Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx, int Cp, 
+        int Cj, unsigned int Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx, int Cp, int Cj, 
+        long long Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bj, float Bx, int Cp, int Cj, float Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bj, double Bx, int Cp, int Cj, double Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx, int Cp, int Cj, 
+        long double Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx, 
+        int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx, int Cp, int Cj,
-          signed char Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx, int Cp,
-          int Cj, unsigned char Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bj, short Bx, int Cp, int Cj, short Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx, int Cp,
-          int Cj, unsigned short Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bj, int Bx, int Cp, int Cj, int Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx, int Cp,
-          int Cj, unsigned int Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx, int Cp, int Cj,
-          long long Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bj, float Bx, int Cp, int Cj, float Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bj, double Bx, int Cp, int Cj, double Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx, int Cp, int Cj,
-          long double Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      csr_eldiv_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx,
-          int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _csr.csr_eldiv_csr(*args)
+  return _csr.csr_eldiv_csr(*args)
 
 def csr_plus_csr(*args):
+  """
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx, int Cp, int Cj, 
+        signed char Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx, int Cp, 
+        int Cj, unsigned char Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bj, short Bx, int Cp, int Cj, short Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx, int Cp, 
+        int Cj, unsigned short Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bj, int Bx, int Cp, int Cj, int Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx, int Cp, 
+        int Cj, unsigned int Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx, int Cp, int Cj, 
+        long long Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bj, float Bx, int Cp, int Cj, float Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bj, double Bx, int Cp, int Cj, double Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx, int Cp, int Cj, 
+        long double Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx, 
+        int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx, int Cp, int Cj,
-          signed char Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx, int Cp,
-          int Cj, unsigned char Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bj, short Bx, int Cp, int Cj, short Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx, int Cp,
-          int Cj, unsigned short Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bj, int Bx, int Cp, int Cj, int Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx, int Cp,
-          int Cj, unsigned int Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx, int Cp, int Cj,
-          long long Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bj, float Bx, int Cp, int Cj, float Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bj, double Bx, int Cp, int Cj, double Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx, int Cp, int Cj,
-          long double Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      csr_plus_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx,
-          int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _csr.csr_plus_csr(*args)
+  return _csr.csr_plus_csr(*args)
 
 def csr_minus_csr(*args):
+  """
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int Bp, int Bj, signed char Bx, int Cp, int Cj, 
+        signed char Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int Bp, int Bj, unsigned char Bx, int Cp, 
+        int Cj, unsigned char Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp, 
+        int Bj, short Bx, int Cp, int Cj, short Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int Bp, int Bj, unsigned short Bx, int Cp, 
+        int Cj, unsigned short Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp, 
+        int Bj, int Bx, int Cp, int Cj, int Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int Bp, int Bj, unsigned int Bx, int Cp, 
+        int Cj, unsigned int Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int Bp, int Bj, long long Bx, int Cp, int Cj, 
+        long long Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int Bp, int Bj, unsigned long long Bx, 
+        int Cp, int Cj, unsigned long long Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp, 
+        int Bj, float Bx, int Cp, int Cj, float Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp, 
+        int Bj, double Bx, int Cp, int Cj, double Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int Bp, int Bj, long double Bx, int Cp, int Cj, 
+        long double Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int Bp, int Bj, npy_cfloat_wrapper Bx, 
+        int Cp, int Cj, npy_cfloat_wrapper Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int Bp, int Bj, npy_cdouble_wrapper Bx, 
+        int Cp, int Cj, npy_cdouble_wrapper Cx)
+    csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int Bp, int Bj, npy_clongdouble_wrapper Bx, 
+        int Cp, int Cj, npy_clongdouble_wrapper Cx)
     """
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int Bp, int Bj, signed char Bx, int Cp, int Cj,
-          signed char Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int Bp, int Bj, unsigned char Bx, int Cp,
-          int Cj, unsigned char Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, short Ax, int Bp,
-          int Bj, short Bx, int Cp, int Cj, short Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int Bp, int Bj, unsigned short Bx, int Cp,
-          int Cj, unsigned short Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, int Ax, int Bp,
-          int Bj, int Bx, int Cp, int Cj, int Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int Bp, int Bj, unsigned int Bx, int Cp,
-          int Cj, unsigned int Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int Bp, int Bj, long long Bx, int Cp, int Cj,
-          long long Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int Bp, int Bj, unsigned long long Bx,
-          int Cp, int Cj, unsigned long long Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, float Ax, int Bp,
-          int Bj, float Bx, int Cp, int Cj, float Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, double Ax, int Bp,
-          int Bj, double Bx, int Cp, int Cj, double Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int Bp, int Bj, long double Bx, int Cp, int Cj,
-          long double Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int Bp, int Bj, npy_cfloat_wrapper Bx,
-          int Cp, int Cj, npy_cfloat_wrapper Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int Bp, int Bj, npy_cdouble_wrapper Bx,
-          int Cp, int Cj, npy_cdouble_wrapper Cx)
-      csr_minus_csr(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int Bp, int Bj, npy_clongdouble_wrapper Bx,
-          int Cp, int Cj, npy_clongdouble_wrapper Cx)
-      """
-    return _csr.csr_minus_csr(*args)
+  return _csr.csr_minus_csr(*args)
 
 def csr_sort_indices(*args):
+  """
+    csr_sort_indices(int n_row, int Ap, int Aj, signed char Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, unsigned char Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, short Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, unsigned short Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, int Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, unsigned int Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, long long Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, unsigned long long Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, float Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, double Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, long double Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, npy_cfloat_wrapper Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, npy_cdouble_wrapper Ax)
+    csr_sort_indices(int n_row, int Ap, int Aj, npy_clongdouble_wrapper Ax)
     """
-      csr_sort_indices(int n_row, int Ap, int Aj, signed char Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, unsigned char Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, short Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, unsigned short Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, int Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, unsigned int Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, long long Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, unsigned long long Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, float Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, double Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, long double Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, npy_cfloat_wrapper Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, npy_cdouble_wrapper Ax)
-      csr_sort_indices(int n_row, int Ap, int Aj, npy_clongdouble_wrapper Ax)
-      """
-    return _csr.csr_sort_indices(*args)
+  return _csr.csr_sort_indices(*args)
 
 def csr_eliminate_zeros(*args):
+  """
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, signed char Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned char Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, short Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned short Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, int Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned int Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, long long Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, float Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, double Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, long double Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax)
+    csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax)
     """
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, signed char Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned char Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, short Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned short Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, int Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned int Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, long long Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, float Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, double Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, long double Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax)
-      csr_eliminate_zeros(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax)
-      """
-    return _csr.csr_eliminate_zeros(*args)
+  return _csr.csr_eliminate_zeros(*args)
 
 def csr_sum_duplicates(*args):
+  """
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, signed char Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned char Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, short Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned short Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, int Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned int Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, long long Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, float Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, double Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, long double Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax)
+    csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax)
     """
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, signed char Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned char Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, short Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned short Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, int Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned int Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, long long Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, float Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, double Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, long double Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax)
-      csr_sum_duplicates(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax)
-      """
-    return _csr.csr_sum_duplicates(*args)
+  return _csr.csr_sum_duplicates(*args)
 
 def get_csr_submatrix(*args):
+  """
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, signed char Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(signed char)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned char Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(unsigned char)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, short Ax, int ir0, 
+        int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(short)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned short Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(unsigned short)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, int Ax, int ir0, 
+        int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(int)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned int Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(unsigned int)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, long long Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(long long)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax, 
+        int ir0, int ir1, int ic0, int ic1, 
+        std::vector<(int)> Bp, std::vector<(int)> Bj, 
+        std::vector<(unsigned long long)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, float Ax, int ir0, 
+        int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(float)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, double Ax, int ir0, 
+        int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(double)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, long double Ax, 
+        int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp, 
+        std::vector<(int)> Bj, std::vector<(long double)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax, 
+        int ir0, int ir1, int ic0, int ic1, 
+        std::vector<(int)> Bp, std::vector<(int)> Bj, 
+        std::vector<(npy_cfloat_wrapper)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax, 
+        int ir0, int ir1, int ic0, int ic1, 
+        std::vector<(int)> Bp, std::vector<(int)> Bj, 
+        std::vector<(npy_cdouble_wrapper)> Bx)
+    get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax, 
+        int ir0, int ir1, int ic0, int ic1, 
+        std::vector<(int)> Bp, std::vector<(int)> Bj, 
+        std::vector<(npy_clongdouble_wrapper)> Bx)
     """
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, signed char Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(signed char)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned char Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(unsigned char)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, short Ax, int ir0,
-          int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(short)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned short Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(unsigned short)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, int Ax, int ir0,
-          int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(int)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned int Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(unsigned int)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, long long Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(long long)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, unsigned long long Ax,
-          int ir0, int ir1, int ic0, int ic1,
-          std::vector<(int)> Bp, std::vector<(int)> Bj,
-          std::vector<(unsigned long long)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, float Ax, int ir0,
-          int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(float)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, double Ax, int ir0,
-          int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(double)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, long double Ax,
-          int ir0, int ir1, int ic0, int ic1, std::vector<(int)> Bp,
-          std::vector<(int)> Bj, std::vector<(long double)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_cfloat_wrapper Ax,
-          int ir0, int ir1, int ic0, int ic1,
-          std::vector<(int)> Bp, std::vector<(int)> Bj,
-          std::vector<(npy_cfloat_wrapper)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_cdouble_wrapper Ax,
-          int ir0, int ir1, int ic0, int ic1,
-          std::vector<(int)> Bp, std::vector<(int)> Bj,
-          std::vector<(npy_cdouble_wrapper)> Bx)
-      get_csr_submatrix(int n_row, int n_col, int Ap, int Aj, npy_clongdouble_wrapper Ax,
-          int ir0, int ir1, int ic0, int ic1,
-          std::vector<(int)> Bp, std::vector<(int)> Bj,
-          std::vector<(npy_clongdouble_wrapper)> Bx)
-      """
-    return _csr.get_csr_submatrix(*args)
+  return _csr.get_csr_submatrix(*args)
+

Modified: trunk/scipy/sparse/sparsetools/csr_wrap.cxx
===================================================================
--- trunk/scipy/sparse/sparsetools/csr_wrap.cxx	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/csr_wrap.cxx	2008-08-14 20:44:07 UTC (rev 4645)
@@ -42270,23 +42270,23 @@
   get_csr_submatrix< int,signed char >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(signed char const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_BYTE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(signed char)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_BYTE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(signed char)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -42447,23 +42447,23 @@
   get_csr_submatrix< int,unsigned char >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(unsigned char const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_UBYTE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(unsigned char)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_UBYTE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(unsigned char)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -42624,23 +42624,23 @@
   get_csr_submatrix< int,short >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(short const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_SHORT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(short)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_SHORT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(short)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -42801,23 +42801,23 @@
   get_csr_submatrix< int,unsigned short >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(unsigned short const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_USHORT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(unsigned short)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_USHORT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(unsigned short)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -42978,23 +42978,23 @@
   get_csr_submatrix< int,int >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(int const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(int)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -43155,23 +43155,23 @@
   get_csr_submatrix< int,unsigned int >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(unsigned int const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_UINT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(unsigned int)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_UINT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(unsigned int)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -43332,23 +43332,23 @@
   get_csr_submatrix< int,long long >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(long long const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_LONGLONG); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(long long)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_LONGLONG); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(long long)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -43509,23 +43509,23 @@
   get_csr_submatrix< int,unsigned long long >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(unsigned long long const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_ULONGLONG); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(unsigned long long)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_ULONGLONG); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(unsigned long long)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -43686,23 +43686,23 @@
   get_csr_submatrix< int,float >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(float const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_FLOAT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(float)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_FLOAT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(float)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -43863,23 +43863,23 @@
   get_csr_submatrix< int,double >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(double const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_DOUBLE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(double)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_DOUBLE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(double)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -44040,23 +44040,23 @@
   get_csr_submatrix< int,long double >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(long double const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_LONGDOUBLE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(long double)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_LONGDOUBLE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(long double)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -44217,23 +44217,23 @@
   get_csr_submatrix< int,npy_cfloat_wrapper >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(npy_cfloat_wrapper const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_CFLOAT); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(npy_cfloat_wrapper)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_CFLOAT); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(npy_cfloat_wrapper)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -44394,23 +44394,23 @@
   get_csr_submatrix< int,npy_cdouble_wrapper >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(npy_cdouble_wrapper const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_CDOUBLE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(npy_cdouble_wrapper)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_CDOUBLE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(npy_cdouble_wrapper)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
@@ -44571,23 +44571,23 @@
   get_csr_submatrix< int,npy_clongdouble_wrapper >(arg1,arg2,(int const (*))arg3,(int const (*))arg4,(npy_clongdouble_wrapper const (*))arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
   resultobj = SWIG_Py_Void();
   {
-    int length = (arg10)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg10))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg10)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg10))[0]), sizeof(int)*length);
     delete arg10; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg11)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_INT); 
-    memcpy(PyArray_DATA(obj),&((*(arg11))[0]),sizeof(int)*length);	 
+    npy_intp length = (arg11)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_INT); 
+    memcpy(PyArray_DATA(obj), &((*(arg11))[0]), sizeof(int)*length);
     delete arg11; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }
   {
-    int length = (arg12)->size(); 
-    PyObject *obj = PyArray_FromDims(1, &length,PyArray_CLONGDOUBLE); 
-    memcpy(PyArray_DATA(obj),&((*(arg12))[0]),sizeof(npy_clongdouble_wrapper)*length);	 
+    npy_intp length = (arg12)->size(); 
+    PyObject *obj = PyArray_SimpleNew(1, &length,PyArray_CLONGDOUBLE); 
+    memcpy(PyArray_DATA(obj), &((*(arg12))[0]), sizeof(npy_clongdouble_wrapper)*length);
     delete arg12; 
     resultobj = helper_appendToTuple( resultobj, (PyObject *)obj ); 
   }

Modified: trunk/scipy/sparse/sparsetools/dia.py
===================================================================
--- trunk/scipy/sparse/sparsetools/dia.py	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/dia.py	2008-08-14 20:44:07 UTC (rev 4645)
@@ -51,39 +51,40 @@
 
 
 def dia_matvec(*args):
+  """
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        signed char diags, signed char Xx, signed char Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        unsigned char diags, unsigned char Xx, unsigned char Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        short diags, short Xx, short Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        unsigned short diags, unsigned short Xx, 
+        unsigned short Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        int diags, int Xx, int Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        unsigned int diags, unsigned int Xx, unsigned int Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        long long diags, long long Xx, long long Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        unsigned long long diags, unsigned long long Xx, 
+        unsigned long long Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        float diags, float Xx, float Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        double diags, double Xx, double Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        long double diags, long double Xx, long double Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        npy_cfloat_wrapper diags, npy_cfloat_wrapper Xx, 
+        npy_cfloat_wrapper Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        npy_cdouble_wrapper diags, npy_cdouble_wrapper Xx, 
+        npy_cdouble_wrapper Yx)
+    dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets, 
+        npy_clongdouble_wrapper diags, npy_clongdouble_wrapper Xx, 
+        npy_clongdouble_wrapper Yx)
     """
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          signed char diags, signed char Xx, signed char Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          unsigned char diags, unsigned char Xx, unsigned char Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          short diags, short Xx, short Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          unsigned short diags, unsigned short Xx,
-          unsigned short Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          int diags, int Xx, int Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          unsigned int diags, unsigned int Xx, unsigned int Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          long long diags, long long Xx, long long Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          unsigned long long diags, unsigned long long Xx,
-          unsigned long long Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          float diags, float Xx, float Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          double diags, double Xx, double Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          long double diags, long double Xx, long double Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          npy_cfloat_wrapper diags, npy_cfloat_wrapper Xx,
-          npy_cfloat_wrapper Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          npy_cdouble_wrapper diags, npy_cdouble_wrapper Xx,
-          npy_cdouble_wrapper Yx)
-      dia_matvec(int n_row, int n_col, int n_diags, int L, int offsets,
-          npy_clongdouble_wrapper diags, npy_clongdouble_wrapper Xx,
-          npy_clongdouble_wrapper Yx)
-      """
-    return _dia.dia_matvec(*args)
+  return _dia.dia_matvec(*args)
+

Modified: trunk/scipy/sparse/sparsetools/numpy.i
===================================================================
--- trunk/scipy/sparse/sparsetools/numpy.i	2008-08-12 19:20:31 UTC (rev 4644)
+++ trunk/scipy/sparse/sparsetools/numpy.i	2008-08-14 20:44:07 UTC (rev 4645)
@@ -522,9 +522,9 @@
   $1 = tmp; 
 }; 
 %typemap( argout ) std::vector<ctype>* array_argout { 
-  int length = ($1)->size(); 
-  PyObject *obj = PyArray_FromDims(1, &length, ##atype); 
-  memcpy(PyArray_DATA(obj),&((*($1))[0]),sizeof(ctype)*length);	 
+  npy_intp length = ($1)->size(); 
+  PyObject *obj = PyArray_SimpleNew(1, &length, ##atype); 
+  memcpy(PyArray_DATA(obj), &((*($1))[0]), sizeof(ctype)*length);
   delete $1; 
   $result = helper_appendToTuple( $result, (PyObject *)obj ); 
 }; 



More information about the Scipy-svn mailing list