[Scipy-svn] r4379 - in branches/refactor_fft: . scipy/sparse scipy/sparse/sparsetools scipy/sparse/tests

scipy-svn at scipy.org scipy-svn at scipy.org
Sat May 24 06:45:18 EDT 2008


Author: cdavid
Date: 2008-05-24 05:44:59 -0500 (Sat, 24 May 2008)
New Revision: 4379

Modified:
   branches/refactor_fft/
   branches/refactor_fft/scipy/sparse/lil.py
   branches/refactor_fft/scipy/sparse/sparsetools/bsr.py
   branches/refactor_fft/scipy/sparse/sparsetools/bsr_wrap.cxx
   branches/refactor_fft/scipy/sparse/sparsetools/complex_ops.h
   branches/refactor_fft/scipy/sparse/sparsetools/coo.py
   branches/refactor_fft/scipy/sparse/sparsetools/coo_wrap.cxx
   branches/refactor_fft/scipy/sparse/sparsetools/csc.py
   branches/refactor_fft/scipy/sparse/sparsetools/csc_wrap.cxx
   branches/refactor_fft/scipy/sparse/sparsetools/csr.py
   branches/refactor_fft/scipy/sparse/sparsetools/csr_wrap.cxx
   branches/refactor_fft/scipy/sparse/sparsetools/dia.py
   branches/refactor_fft/scipy/sparse/sparsetools/dia_wrap.cxx
   branches/refactor_fft/scipy/sparse/sparsetools/numpy.i
   branches/refactor_fft/scipy/sparse/tests/test_base.py
Log:
Merged revisions 4369-4378 via svnmerge from 
http://svn.scipy.org/svn/scipy/trunk

........
  r4377 | wnbell | 2008-05-22 07:52:19 +0900 (Thu, 22 May 2008) | 2 lines
  
  resolves ticket #671, division error in complex_ops.h
........
  r4378 | wnbell | 2008-05-22 15:01:12 +0900 (Thu, 22 May 2008) | 2 lines
  
  add parens to make icc happy
........



Property changes on: branches/refactor_fft
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/build_with_scons:1-3868 /branches/scipy.scons:1-3533 /branches/sparse_build_reduce_mem:1-4005 /branches/testing_cleanup:1-3662 /trunk:1-4368
   + /branches/build_with_scons:1-3868 /branches/scipy.scons:1-3533 /branches/sparse_build_reduce_mem:1-4005 /branches/testing_cleanup:1-3662 /trunk:1-4378

Modified: branches/refactor_fft/scipy/sparse/lil.py
===================================================================
--- branches/refactor_fft/scipy/sparse/lil.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/lil.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -346,38 +346,39 @@
         else:
             return self.tocsr() / other
 
-    def multiply(self, other):
-        """Point-wise multiplication by another lil_matrix.
+## This code doesn't work with complex matrices
+#    def multiply(self, other):
+#        """Point-wise multiplication by another lil_matrix.
+#
+#        """
+#        if isscalar(other):
+#            return self.__mul__(other)
+#
+#        if isspmatrix_lil(other):
+#            reference,target = self,other
+#
+#            if reference.shape != target.shape:
+#                raise ValueError("Dimensions do not match.")
+#
+#            if len(reference.data) > len(target.data):
+#                reference,target = target,reference
+#
+#            new = lil_matrix(reference.shape)
+#            for r,row in enumerate(reference.rows):
+#                tr = target.rows[r]
+#                td = target.data[r]
+#                rd = reference.data[r]
+#                L = len(tr)
+#                for c,column in enumerate(row):
+#                    ix = bisect_left(tr,column)
+#                    if ix < L and tr[ix] == column:
+#                        new.rows[r].append(column)
+#                        new.data[r].append(rd[c] * td[ix])
+#            return new
+#        else:
+#            raise ValueError("Point-wise multiplication only allowed "
+#                             "with another lil_matrix.")
 
-        """
-        if isscalar(other):
-            return self.__mul__(other)
-
-        if isspmatrix_lil(other):
-            reference,target = self,other
-
-            if reference.shape != target.shape:
-                raise ValueError("Dimensions do not match.")
-
-            if len(reference.data) > len(target.data):
-                reference,target = target,reference
-
-            new = lil_matrix(reference.shape)
-            for r,row in enumerate(reference.rows):
-                tr = target.rows[r]
-                td = target.data[r]
-                rd = reference.data[r]
-                L = len(tr)
-                for c,column in enumerate(row):
-                    ix = bisect_left(tr,column)
-                    if ix < L and tr[ix] == column:
-                        new.rows[r].append(column)
-                        new.data[r].append(rd[c] * td[ix])
-            return new
-        else:
-            raise ValueError("Point-wise multiplication only allowed "
-                             "with another lil_matrix.")
-
     def copy(self):
         new = lil_matrix(self.shape, dtype=self.dtype)
         new.data = copy.deepcopy(self.data)

Modified: branches/refactor_fft/scipy/sparse/sparsetools/bsr.py
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/bsr.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/bsr.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -51,441 +51,442 @@
 
 
 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_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: branches/refactor_fft/scipy/sparse/sparsetools/bsr_wrap.cxx
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/bsr_wrap.cxx	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/bsr_wrap.cxx	2008-05-24 10:44:59 UTC (rev 4379)
@@ -36966,3 +36966,4 @@
   
 }
 
+ 

Modified: branches/refactor_fft/scipy/sparse/sparsetools/complex_ops.h
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/complex_ops.h	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/complex_ops.h	2008-05-24 10:44:59 UTC (rev 4379)
@@ -34,8 +34,8 @@
         complex_wrapper operator/(const complex_wrapper& B) const {
           complex_wrapper result;
           c_type denom = 1.0 / (B.real * B.real + B.imag * B.imag);
-          result.real = (npy_type::real * npy_type::real + npy_type::imag * B.imag) * denom;
-          result.imag = (npy_type::real * npy_type::imag - npy_type::imag * B.real) * denom;
+          result.real = (npy_type::real * B.real + npy_type::imag * B.imag) * denom;
+          result.imag = (npy_type::imag * B.real - npy_type::real * B.imag) * denom;
           return result;
         }
         complex_wrapper& operator+=(const complex_wrapper & B){
@@ -57,7 +57,7 @@
         complex_wrapper& operator/=(const complex_wrapper & B){
           c_type denom   = 1.0 / (B.real * B.real + B.imag * B.imag);
           c_type temp    = (npy_type::real * B.real + npy_type::imag * B.imag) * denom; 
-          npy_type::imag = (npy_type::real * B.imag - npy_type::imag * B.real) * denom;
+          npy_type::imag = (npy_type::imag * B.real - npy_type::real * B.imag) * denom;
           npy_type::real = temp;
           return (*this);
         }

Modified: branches/refactor_fft/scipy/sparse/sparsetools/coo.py
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/coo.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/coo.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -51,100 +51,101 @@
 
 
 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)
+

Modified: branches/refactor_fft/scipy/sparse/sparsetools/coo_wrap.cxx
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/coo_wrap.cxx	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/coo_wrap.cxx	2008-05-24 10:44:59 UTC (rev 4379)
@@ -10815,3 +10815,4 @@
   
 }
 
+ 

Modified: branches/refactor_fft/scipy/sparse/sparsetools/csc.py
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/csc.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/csc.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -50,319 +50,320 @@
 
 
 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_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: branches/refactor_fft/scipy/sparse/sparsetools/csc_wrap.cxx
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/csc_wrap.cxx	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/csc_wrap.cxx	2008-05-24 10:44:59 UTC (rev 4379)
@@ -27099,3 +27099,4 @@
   
 }
 
+ 

Modified: branches/refactor_fft/scipy/sparse/sparsetools/csr.py
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/csr.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/csr.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -50,531 +50,532 @@
 
 
 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_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: branches/refactor_fft/scipy/sparse/sparsetools/csr_wrap.cxx
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/csr_wrap.cxx	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/csr_wrap.cxx	2008-05-24 10:44:59 UTC (rev 4379)
@@ -40812,3 +40812,4 @@
   
 }
 
+ 

Modified: branches/refactor_fft/scipy/sparse/sparsetools/dia.py
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/dia.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/dia.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -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: branches/refactor_fft/scipy/sparse/sparsetools/dia_wrap.cxx
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/dia_wrap.cxx	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/dia_wrap.cxx	2008-05-24 10:44:59 UTC (rev 4379)
@@ -5992,3 +5992,4 @@
   
 }
 
+ 

Modified: branches/refactor_fft/scipy/sparse/sparsetools/numpy.i
===================================================================
--- branches/refactor_fft/scipy/sparse/sparsetools/numpy.i	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/sparsetools/numpy.i	2008-05-24 10:44:59 UTC (rev 4379)
@@ -383,7 +383,7 @@
   $1 = (type*) array->data;
 }
 %typemap(freearg) type*  IN_ARRAY1 {
-  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
+  if (is_new_object$argnum && array$argnum) { Py_DECREF(array$argnum); }
 }
 %enddef
 
@@ -401,7 +401,7 @@
   $1 = (type*) array->data;
 }
 %typemap(freearg) (type* IN_ARRAY2) {
-  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
+  if (is_new_object$argnum && array$argnum) { Py_DECREF(array$argnum); }
 }
 %enddef
 

Modified: branches/refactor_fft/scipy/sparse/tests/test_base.py
===================================================================
--- branches/refactor_fft/scipy/sparse/tests/test_base.py	2008-05-22 06:01:12 UTC (rev 4378)
+++ branches/refactor_fft/scipy/sparse/tests/test_base.py	2008-05-24 10:44:59 UTC (rev 4379)
@@ -221,6 +221,13 @@
         c = temp.multiply(self.datsp)
         assert_array_equal(c.todense(),[[1,0,0,4],[9,0,1,0],[0,4,0,0]])
 
+        # complex
+        A = array([[1-2j,0+5j,-1+0j],[4-3j,-3+6j,5]])
+        B = array([[5+2j,7-3j,-2+1j],[0-1j,-4+2j,9]])
+        Asp = self.spmatrix(A)
+        Bsp = self.spmatrix(B)
+        assert_almost_equal( Asp.multiply(Bsp).todense(), A*B)
+
     def test_eldiv(self):
         expected = [[1,0,0,1],[1,0,1,0],[0,1,0,0]]
         assert_array_equal((self.datsp / self.datsp).todense(),expected)
@@ -229,6 +236,13 @@
         res = matrix([[1,0,0,0.5],[-3,0,numpy.inf,0],[0,0.25,0,0]],'d')
         assert_array_equal((self.datsp / denom).todense(),res)
 
+        # complex
+        A = array([[1-2j,0+5j,-1+0j],[4-3j,-3+6j,5]])
+        B = array([[5+2j,7-3j,-2+1j],[0-1j,-4+2j,9]])
+        Asp = self.spmatrix(A)
+        Bsp = self.spmatrix(B)
+        assert_almost_equal( (Asp / Bsp).todense(), A/B)
+
     def test_pow(self):
         A = matrix([[1,0,2,0],[0,3,4,0],[0,5,0,0],[0,6,7,8]])
         B = self.spmatrix( A )




More information about the Scipy-svn mailing list