added read MM file format

Author: counterclocker

examples/mm.py

@@ -0,0 +1,9 @@
+from sparse_lib.sparse.ll_mat import MakeLLSparseMatrix
+
+import sys
+
+A = MakeLLSparseMatrix(mm_filename="simple_matrix.mm")
+
+print type(A)
+
+A.print_to(sys.stdout)

examples/simple_matrix.mm

@@ -0,0 +1,12 @@
+%%MatrixMarket matrix coordinate real general
+% Generated 27-Feb-2012
+3 4 9
+1 1  0.8147236863931789
+2 1  0.9057919370756192
+3 1  0.1269868162935061
+2 2  0.6323592462254095
+3 2  0.09754040499940952
+1 3  0.2784982188670484
+2 3  0.5468815192049838
+3 3  0.9575068354342976
+2 4  0.1576130816775483

setup.py

@@ -59,10 +59,16 @@ def get_path_option(config, section, option):
   Extension("sparse_lib.sparse.csr_mat", ["sparse_lib/sparse/csr_mat.pxd", "sparse_lib/sparse/csr_mat.pyx"], **sparse_ext_params),
   Extension("sparse_lib.sparse.csc_mat", ["sparse_lib/sparse/csc_mat.pxd", "sparse_lib/sparse/csc_mat.pyx"], **sparse_ext_params),
   Extension("sparse_lib.sparse.ll_mat_view", ["sparse_lib/sparse/ll_mat_view.pxd", "sparse_lib/sparse/ll_mat_view.pyx"], **sparse_ext_params),
-  Extension("sparse_lib.utils.equality", ["sparse_lib/utils/equality.pxd", "sparse_lib/utils/equality.pyx"], **sparse_ext_params),
+  Extension("sparse_lib.sparse.IO.mm", ["sparse_lib/sparse/IO/mm_read_file.pxi", "sparse_lib/sparse/IO/mm.pxd", "sparse_lib/sparse/IO/mm.pyx"], **sparse_ext_params),
   #Extension("sparse.ll_vec", ["sparse_lib/sparse/ll_vec.pyx"], **sparse_ext_params)
 ]
 
+########################################################################################################################
+#                                                *** utils ***
+utils_ext = [
+    Extension("sparse_lib.utils.equality", ["sparse_lib/utils/equality.pxd", "sparse_lib/utils/equality.pyx"], **sparse_ext_params),
+]
+
 ########################################################################################################################
 #                                                *** umfpack ***
 umfpack_ext_params = ext_params.copy()
@@ -82,7 +88,7 @@ def get_path_option(config, section, option):
 ########################################################################################################################
 # SETUP
 ########################################################################################################################
-ext_modules = sparse_ext  + umfpack_ext
+ext_modules = sparse_ext  + utils_ext + umfpack_ext
 
 
 setup(name=  'SparseLib',
@@ -95,6 +101,7 @@ def get_path_option(config, section, option):
             'sparse_lib.utils',
             'sparse_lib.solvers',
             'sparse_lib.solvers.suitesparse',
+            'sparse_lib.sparse.IO'
             ]
 
 )

sparse_lib/solvers/suitesparse/umfpack.c

@@ -410,7 +410,7 @@ cdef class UmfpackSolver:
 
         return (lnz, unz, n_row, n_col, nz_udiag)
 
-    def get_LU(self):
+    def get_LU(self, get_L=True, get_U=True, get_P=True, get_Q=True, get_D=True, get_R=True):
         """
         Return LU factorisation objects. If needed, the LU factorisation is triggered.
 
@@ -435,6 +435,8 @@ cdef class UmfpackSolver:
 
         """
         # TODO: use properties?? we can only get matrices, not set them...
+        # TODO: implement the use of L=True, U=True, P=True, Q=True, D=True, R=True
+        # i.e. allow to return only parts of the arguments and not necessarily all of them...
         self.create_numeric()
 
         cdef: