Replaced some more coo_matrix calls

Author: nathanneike

ot/backend.py

@@ -94,7 +94,7 @@
 import scipy
 import scipy.linalg
 import scipy.special as special
-from scipy.sparse import coo_array, coo_matrix, csr_matrix, issparse
+from scipy.sparse import coo_array, csr_matrix, issparse
 
 DISABLE_TORCH_KEY = "POT_BACKEND_DISABLE_PYTORCH"
 DISABLE_JAX_KEY = "POT_BACKEND_DISABLE_JAX"
@@ -1384,9 +1384,8 @@ def todense(self, a):
             return a
 
     def sparse_coo_data(self, a):
-        # Convert to COO format if needed
-        if not isinstance(a, (coo_array, coo_matrix)):
-            # Try to convert to coo_array (prefer modern API)
+        # Convert to COO array format if needed
+        if not isinstance(a, coo_array):
             a_coo = coo_array(a)
         else:
             a_coo = a
@@ -2803,10 +2802,10 @@ def coo_matrix(self, data, rows, cols, shape=None, type_as=None):
         rows = self.from_numpy(rows)
         cols = self.from_numpy(cols)
         if type_as is None:
-            return cupyx.scipy.sparse.coo_matrix((data, (rows, cols)), shape=shape)
+            return cupyx.scipy.sparse.coo_array((data, (rows, cols)), shape=shape)
         else:
             with cp.cuda.Device(type_as.device):
-                return cupyx.scipy.sparse.coo_matrix(
+                return cupyx.scipy.sparse.coo_array(
                     (data, (rows, cols)), shape=shape, dtype=type_as.dtype
                 )
 

ot/plot.py

@@ -15,6 +15,8 @@
 import numpy as np
 import matplotlib.pylab as pl
 from matplotlib import gridspec
+from . import backend
+from scipy.sparse import issparse, coo_array
 
 
 def plot1D_mat(
@@ -232,8 +234,6 @@ def plot2D_samples_mat(xs, xt, G, thr=1e-8, **kwargs):
         parameters given to the plot functions (default color is black if
         nothing given)
     """
-    from . import backend
-    from scipy.sparse import issparse, coo_matrix
 
     if ("color" not in kwargs) and ("c" not in kwargs):
         kwargs["color"] = "k"
@@ -258,7 +258,7 @@ def plot2D_samples_mat(xs, xt, G, thr=1e-8, **kwargs):
         # Not a backend array, check if scipy.sparse
         is_sparse = issparse(G)
         if is_sparse:
-            G_coo = G if isinstance(G, coo_matrix) else G.tocoo()
+            G_coo = G if isinstance(G, coo_array) else G.tocoo()
             rows, cols, data = G_coo.row, G_coo.col, G_coo.data
 
     if is_sparse: