added NonZeros context manager, memory indicators

Author: counterclocker

examples/mul.py

@@ -22,4 +22,5 @@
 print "*" * 80
 
 RC = R * C
-print RC
+print RC
+RC.print_to(sys.stdout)

examples/umfpack.py

@@ -1,6 +1,8 @@
 from sparse_lib.sparse.ll_mat import MakeLLSparseMatrix
 import sparse_lib.solvers.suitesparse.umfpack as umfpack
 
+import sys
+
 import numpy
 
 A = MakeLLSparseMatrix(size=4)
@@ -43,7 +45,9 @@
 (L, U, P, Q, D, do_recip, R) = solver.get_LU()
 
 print L
+L.print_to(sys.stdout)
 print U
+U.print_to(sys.stdout)
 print P
 print Q
 print D
@@ -55,7 +59,18 @@
 LU = L * U
 
 
-print "heheh"
+print "heheh" * 20
 print LU
 import sys
+LU.print_to(sys.stdout)
+
+print LU.memory_virtual()
+print LU.memory_element()
+print LU.memory_real()
+
+LU.compress()
+
+print "new matrix:"
+
+print LU.memory_real()
 LU.print_to(sys.stdout)

sparse_lib/sparse/csr_mat.c

@@ -393,14 +393,19 @@ cdef LLSparseMatrix multiply_csr_mat_by_csc_mat(CSRSparseMatrix A, CSCSparseMatr
         int i, j, k
         int sum
 
-    for i from 0 <= i < A.nrow:
-        for j from 0 <= j < A.ncol:
+    # don't keep zeros, no matter what
+    cdef bint old_store_zeros = store_zeros
+    C.store_zeros = 0
+
+    for i from 0 <= i < C_nrow:
+        for j from 0 <= j < C_ncol:
             sum = 0
 
-            for k from 0 <= k < A.ncol:
-                sum += A[i, k] * B[k, j]
+            for k from 0 <= k < A_ncol:
+                sum += (A[i, k] * B[k, j])
 
             C.put(i, j, sum)
 
+    C.store_zeros = old_store_zeros
 
     return C