fix scipy v1.13 sparse monkey patch bug

jcmgray · Apr 4, 2024 · 6bc0064 · 6bc0064
1 parent 7141a73
commit 6bc0064
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -77,6 +77,9 @@ Release notes for `quimb`.
   [`TN2D_rand_symmetric`](quimb.tensor.tensor_builder.TN2D_rand_symmetric)
   for generating random symmetric arrays, tensors and 2D tensor networks.
 
+**Bug fixes:**
+
+- fix scipy sparse monkey patch for scipy>=1.13 ({issue}`222`)
 
 
 (whats-new-1-7-3)=

diff --git a/quimb/core.py b/quimb/core.py
@@ -2183,12 +2183,25 @@ def qarrayed_fn(self, other):
     return qarrayed_fn
 
 
-sp.csr_matrix._mul_vector = csr_mulvec_wrap(sp.csr_matrix._mul_vector)
-sp.csc_matrix._mul_vector = sp_mulvec_wrap(sp.csc_matrix._mul_vector)
-sp.coo_matrix._mul_vector = sp_mulvec_wrap(sp.coo_matrix._mul_vector)
-sp.bsr_matrix._mul_vector = sp_mulvec_wrap(sp.bsr_matrix._mul_vector)
-
-sp.csr_matrix._mul_multivector = sp_mulvec_wrap(sp.csr_matrix._mul_multivector)
-sp.csc_matrix._mul_multivector = sp_mulvec_wrap(sp.csc_matrix._mul_multivector)
-sp.coo_matrix._mul_multivector = sp_mulvec_wrap(sp.coo_matrix._mul_multivector)
-sp.bsr_matrix._mul_multivector = sp_mulvec_wrap(sp.bsr_matrix._mul_multivector)
+try:
+    # scipy>=1.13
+    sp.csr_matrix._matmul_vector = csr_mulvec_wrap(sp.csr_matrix._matmul_vector)
+    sp.csc_matrix._matmul_vector = sp_mulvec_wrap(sp.csc_matrix._matmul_vector)
+    sp.coo_matrix._matmul_vector = sp_mulvec_wrap(sp.coo_matrix._matmul_vector)
+    sp.bsr_matrix._matmul_vector = sp_mulvec_wrap(sp.bsr_matrix._matmul_vector)
+
+    sp.csr_matrix._matmul_multivector = sp_mulvec_wrap(sp.csr_matrix._matmul_multivector)
+    sp.csc_matrix._matmul_multivector = sp_mulvec_wrap(sp.csc_matrix._matmul_multivector)
+    sp.coo_matrix._matmul_multivector = sp_mulvec_wrap(sp.coo_matrix._matmul_multivector)
+    sp.bsr_matrix._matmul_multivector = sp_mulvec_wrap(sp.bsr_matrix._matmul_multivector)
+except AttributeError:
+    # scipy <=1.12"
+    sp.csr_matrix._mul_vector = csr_mulvec_wrap(sp.csr_matrix._mul_vector)
+    sp.csc_matrix._mul_vector = sp_mulvec_wrap(sp.csc_matrix._mul_vector)
+    sp.coo_matrix._mul_vector = sp_mulvec_wrap(sp.coo_matrix._mul_vector)
+    sp.bsr_matrix._mul_vector = sp_mulvec_wrap(sp.bsr_matrix._mul_vector)
+
+    sp.csr_matrix._mul_multivector = sp_mulvec_wrap(sp.csr_matrix._mul_multivector)
+    sp.csc_matrix._mul_multivector = sp_mulvec_wrap(sp.csc_matrix._mul_multivector)
+    sp.coo_matrix._mul_multivector = sp_mulvec_wrap(sp.coo_matrix._mul_multivector)
+    sp.bsr_matrix._mul_multivector = sp_mulvec_wrap(sp.bsr_matrix._mul_multivector)