Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d87d900

Browse filesBrowse files
MAINT: sparse: Invert the sparray / spmatrix hierarchy (scipy#18440)
* MAINT: sparse: Invert sparray / spmatrix hierarchy * address review comments * Reinstate scipy.sparse.spmatrix
1 parent 60ec4d7 commit d87d900
Copy full SHA for d87d900

19 files changed

+486
-498
lines changed

‎scipy/optimize/_milp.py

Copy file name to clipboardExpand all lines: scipy/optimize/_milp.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def _constraints_to_components(constraints):
6161
b_us.append(np.atleast_1d(constraint.ub).astype(np.double))
6262

6363
if len(As) > 1:
64-
A = vstack(As)
64+
A = vstack(As, format="csc")
6565
b_l = np.concatenate(b_ls)
6666
b_u = np.concatenate(b_us)
6767
else: # avoid unnecessary copying

‎scipy/sparse/__init__.py

Copy file name to clipboardExpand all lines: scipy/sparse/__init__.py
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,9 @@
279279
from ._bsr import *
280280
from ._construct import *
281281
from ._extract import *
282+
from ._matrix import spmatrix
282283
from ._matrix_io import *
283284

284-
from ._arrays import (
285-
csr_array, csc_array, lil_array, dok_array, coo_array, dia_array, bsr_array
286-
)
287-
288285
# For backward compatibility with v0.19.
289286
from . import csgraph
290287

‎scipy/sparse/_arrays.py

Copy file name to clipboardExpand all lines: scipy/sparse/_arrays.py
-98Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.