Updated imports to be compatible with latest version of cupy (rapidsa…

…i#2473)

Updated imports to be compatible with latest version of cupy and also changed corresponding scipy imports for consistency.

Authors:
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)

URL: rapidsai#2473

python/cugraph/cugraph/tests/test_bfs.py

@@ -23,12 +23,12 @@
 
 import pandas as pd
 import cupy as cp
-from cupyx.scipy.sparse.coo import coo_matrix as cp_coo_matrix
-from cupyx.scipy.sparse.csr import csr_matrix as cp_csr_matrix
-from cupyx.scipy.sparse.csc import csc_matrix as cp_csc_matrix
-from scipy.sparse.coo import coo_matrix as sp_coo_matrix
-from scipy.sparse.csr import csr_matrix as sp_csr_matrix
-from scipy.sparse.csc import csc_matrix as sp_csc_matrix
+from cupyx.scipy.sparse import coo_matrix as cp_coo_matrix
+from cupyx.scipy.sparse import csr_matrix as cp_csr_matrix
+from cupyx.scipy.sparse import csc_matrix as cp_csc_matrix
+from scipy.sparse import coo_matrix as sp_coo_matrix
+from scipy.sparse import csr_matrix as sp_csr_matrix
+from scipy.sparse import csc_matrix as sp_csc_matrix
 
 # Temporarily suppress warnings till networkX fixes deprecation warnings
 # (Using or importing the ABCs from 'collections' instead of from

python/cugraph/cugraph/tests/test_connectivity.py

@@ -18,12 +18,12 @@
 import pytest
 import cupy as cp
 import numpy as np
-from cupyx.scipy.sparse.coo import coo_matrix as cp_coo_matrix
-from cupyx.scipy.sparse.csr import csr_matrix as cp_csr_matrix
-from cupyx.scipy.sparse.csc import csc_matrix as cp_csc_matrix
-from scipy.sparse.coo import coo_matrix as sp_coo_matrix
-from scipy.sparse.csr import csr_matrix as sp_csr_matrix
-from scipy.sparse.csc import csc_matrix as sp_csc_matrix
+from cupyx.scipy.sparse import coo_matrix as cp_coo_matrix
+from cupyx.scipy.sparse import csr_matrix as cp_csr_matrix
+from cupyx.scipy.sparse import csc_matrix as cp_csc_matrix
+from scipy.sparse import coo_matrix as sp_coo_matrix
+from scipy.sparse import csr_matrix as sp_csr_matrix
+from scipy.sparse import csc_matrix as sp_csc_matrix
 
 import cudf
 import cugraph

python/cugraph/cugraph/tests/test_sssp.py

@@ -18,12 +18,12 @@
 import pytest
 import pandas as pd
 import cupy as cp
-from cupyx.scipy.sparse.coo import coo_matrix as cp_coo_matrix
-from cupyx.scipy.sparse.csr import csr_matrix as cp_csr_matrix
-from cupyx.scipy.sparse.csc import csc_matrix as cp_csc_matrix
-from scipy.sparse.coo import coo_matrix as sp_coo_matrix
-from scipy.sparse.csr import csr_matrix as sp_csr_matrix
-from scipy.sparse.csc import csc_matrix as sp_csc_matrix
+from cupyx.scipy.sparse import coo_matrix as cp_coo_matrix
+from cupyx.scipy.sparse import csr_matrix as cp_csr_matrix
+from cupyx.scipy.sparse import csc_matrix as cp_csc_matrix
+from scipy.sparse import coo_matrix as sp_coo_matrix
+from scipy.sparse import csr_matrix as sp_csr_matrix
+from scipy.sparse import csc_matrix as sp_csc_matrix
 
 import cudf
 import cugraph