Merge pull request #67 from loganbvh/sparray

Allow scipy.sparse.sparray inputs

pypardiso/pardiso_wrapper.py

@@ -216,10 +216,10 @@ def _check_A(self, A):
         if A.shape[0] != A.shape[1]:
             raise ValueError('Matrix A needs to be square, but has shape: {}'.format(A.shape))
 
-        if sp.isspmatrix_csr(A):
+        if sp.issparse(A) and A.format == "csr":
             self._solve_transposed = False
             self.set_iparm(12, 0)
-        elif sp.isspmatrix_csc(A):
+        elif sp.issparse(A) and A.format == "csc":
             self._solve_transposed = True
             self.set_iparm(12, 1)
         else:
@@ -241,7 +241,7 @@ def _check_A(self, A):
             raise TypeError('PyPardiso currently only supports float64, but matrix A has dtype: {}'.format(A.dtype))
 
     def _check_b(self, A, b):
-        if sp.isspmatrix(b):
+        if sp.issparse(b):
             warnings.warn('PyPardiso requires the right-hand side b to be a dense array for maximum efficiency',
                           SparseEfficiencyWarning)
             b = b.todense()

pypardiso/scipy_aliases.py

@@ -38,7 +38,7 @@ def spsolve(A, b, factorize=True, squeeze=True, solver=pypardiso_solver, *args,
         in two steps, therefore it is factorized by default. Subsequent calls to spsolve with the same matrix A
         will be drastically faster. This makes the "factorized" method obsolete, but it is kept for compatibility.
     """
-    if sp.isspmatrix_csc(A):
+    if sp.issparse(A) and A.format == "csc":
         A = A.tocsr()  # fixes issue with brightway2 technosphere matrix
 
     solver._check_A(A)