Feature sparse linalg solvers#2841
Conversation
…oneMKL hooks
- _interface.py: add full operator algebra (.H, .T, +, *, **, neg),
_AdjointLinearOperator, _TransposedLinearOperator, _SumLinearOperator,
_ProductLinearOperator, _ScaledLinearOperator, _PowerLinearOperator,
IdentityOperator, MatrixLinearOperator, _AdjointMatrixOperator,
_CustomLinearOperator factory dispatch; extend aslinearoperator
to handle dpnp sparse and dense arrays
- _iterative.py: add _make_system (dtype validation, preconditioner
wiring, working dtype selection); add _make_fast_matvec CSR/oneMKL
SpMV hook; fix GMRES Arnoldi inner product to single oneMKL BLAS
gemv (dpnp.dot) instead of slow Python vdot loop; offload
Hessenberg lstsq to numpy.linalg.lstsq (CPU, matches CuPy);
fix SciPy host-fallback tol->rtol deprecation via _scipy_tol_kwarg;
add preconditioner support to CG; keep MINRES as SciPy-backed stub
Refs: CuPy v14.0.1 cupyx/scipy/sparse/linalg/_interface.py,
cupyx/scipy/sparse/linalg/_iterative.py"
…gmres, minres
Modeled after CuPy's cupyx_tests/scipy_tests/sparse_tests/test_linalg.py.
Covers:
- LinearOperator: shape, dtype inference, matvec/rmatvec/matmat,
subclassing, __matmul__, __call__, edge cases
- aslinearoperator: dense array, duck-type, identity passthrough,
rmatvec from dense, invalid inputs
- cg: SPD convergence, scipy reference match, x0 warm start, b_ndim=2,
callback, atol, LinearOperator path, invalid inputs,
non-convergence info check
- gmres: diag-dominant convergence, scipy reference match, restart
variants, x0, b_ndim=2, callbacks, complex systems, atol,
non-convergence info check, Hilbert-matrix stress test
- minres: SPD, symmetric-indefinite, scipy reference, shift parameter,
non-square guard, LinearOperator path, callback
- Integration: parametric (n, dtype) cross-solver tests via LinearOperator
- Import smoke tests: __all__ completeness
- Use dpnp.tests.helper: assert_dtype_allclose, generate_random_numpy_array, get_all_dtypes, get_float_complex_dtypes, has_support_aspect64 - Use dpnp.tests.third_party.cupy testing harness (with_requires, etc.) - Use numpy.testing assert_allclose / assert_array_equal / assert_raises - Use dpnp.asnumpy() instead of numpy.asarray() - Use pytest parametrize ids matching existing test conventions - Use is_scipy_available() helper from tests/helper.py - Strict class-per-solver organisation matching TestCholesky / TestDet etc.
…or dtype Two bugs fixed: 1. _init_dtype() was calling dpnp.zeros(n) which defaults to float64, so a float32 matvec would upcast and return float64, making the inferred dtype wrong. Fix: use dpnp.zeros(n, dtype=dpnp.int8) as SciPy/CuPy do — any numeric matvec will promote int8 to its own dtype. 2. _CustomLinearOperator.__init__ called _init_dtype() even when an explicit dtype was already supplied, overwriting the caller's value. Fix: _init_dtype() now short-circuits when self.dtype is already set.
…ption handling Align gemv.cpp with the conventions established in blas/gemm.cpp: Headers added: - ext/common.hpp (dpctl_td_ns, consistent with other extensions) - utils/memory_overlap.hpp (MemoryOverlap guard on x vs y) - utils/output_validation.hpp (CheckWritable + AmpleMemory on y) - utils/type_utils.hpp (validate_type_for_device<T> in impl) - <sstream> (needed for stringstream error_msg) Exception handling added in sparse_gemv_impl(): - try/catch(oneapi::mkl::exception) around all oneMKL sparse calls - try/catch(sycl::exception) around all oneMKL sparse calls - release_matrix_handle cleanup in the exception error path - throw std::runtime_error with descriptive message on catch Input validation added in sparse_gemv(): - ndim checks: x and y must be 1-D - queues_are_compatible() across all 5 USM arrays - MemoryOverlap()(x, y) aliasing guard - CheckWritable::throw_if_not_writable(y) - AmpleMemory::throw_if_not_ample(y, num_rows) - keep_args_alive() at function exit (was missing, returning empty event)
… table
Modeled after blas/gemm.cpp (2-D table: value type x index type) and
blas/gemv.cpp (dispatch vector pattern with ContigFactory + init_dispatch_table).
Changes:
- Add sparse/types_matrix.hpp with SparseGemvTypePairSupportFactory<Tv, Ti>
encoding the 4 supported combinations: {float32,float64} x {int32,int64}
- Rewrite sparse_gemv_impl() to take typeless char* pointers (matching
the blas gemv_impl signature style) — type info flows through template
params only, no runtime branching inside the impl
- Replace the 60-line if/else val_typenum/idx_typenum chain in sparse_gemv()
with a 2-D dispatch table lookup (gemv_dispatch_table[val_id][idx_id])
- Rename init_sparse_gemv_dispatch_vector -> init_sparse_gemv_dispatch_table
and implement it via init_dispatch_table<> from ext/common.hpp
- All validation guards and exception handling from prior commit are preserved
…se_gemv_dispatch_table Follows the rename made in gemv.cpp when the dispatch mechanism was changed from a 1-D vector to a 2-D table (value type x index type). All other declarations (sparse_gemv signature, parameters) are unchanged.
The oneMKL 2025-2 sparse BLAS API deprecated the old 8-argument
set_csr_data(queue, handle, nrows, ncols, index_base, row_ptr, col_ind,
values, deps) overload in favour of a new signature that takes the
sparse matrix handle as `spmat` and adds an explicit `nnz` argument:
set_csr_data(queue, spmat, nrows, ncols, nnz, index_base,
row_ptr, col_ind, values, deps)
Fixes:
- Replace old set_csr_data call with the new nnz-aware signature
- Silences the resulting -Wunused-parameter warning on `nnz` (now used)
- No functional change; all other logic is unchanged
…tring Line 477: `hasattr(A, "rmatmat\")` had a Markdown-escaped backslash leaked into the Python source, causing an unterminated string literal. Fixed to `hasattr(A, "rmatmat")`.
dpnp.ndarray blocks implicit NumPy conversion via __array__ to prevent silent dtype=object arrays. All test assertions must use .asnumpy() to materialize device arrays onto the host explicitly. Also replaces numpy.asarray(x_dp) in _rel_residual helper.
…dation order - _iterative.py: raise NotImplementedError for M != None *before* the _HOST_N_THRESHOLD SciPy fast-path in cg() and gmres(), so the contract is enforced regardless of system size (fixes test_cg_preconditioner_unsupported_raises, test_gmres_preconditioner_unsupported_raises). - _iterative.py: validate callback_type and raise NotImplementedError for 'pr_norm' *before* the _HOST_N_THRESHOLD branch in gmres(), so small-n systems also see the error (fixes test_gmres_callback_type_pr_norm_raises). - _iterative.py: pass callback_type='legacy' to scipy.sparse.linalg.gmres when delegating on the fast path to suppress SciPy DeprecationWarning. - test_scipy_sparse_linalg.py: add dtype=numpy.float64 to expected arange() calls in test_identity_operator and test_gmres_happy_breakdown so strict NumPy 2.0 dtype-equality checks pass (float64 result vs int64 expected).
… port SciPy corner cases
- Replace .asnumpy() method calls with dpnp.asnumpy() module fn (asnumpy is not an ndarray method in dpnp; it is a top-level fn) - Fix dpnp.any(x) ambiguous truth value in x0 zero-check; replace with explicit `x0 is not None` guard for r0 initialisation - Fix V_mat.T.conj() -> dpnp.conj(V_mat.T) in GMRES Arnoldi step - Guard minres beta sqrt against tiny negative floats: sqrt(abs(...)) - Unify GMRES Hessenberg h_np assignment to avoid .real stripping producing wrong dtype for complex systems - Fix float() cast on dpnp scalar norm inside GMRES inner h_j1 line
…failures) The committed code used hypot(gbar, oldb) as delta_k which is the gamma (norm) from the PREVIOUS rotation step, not the correct diagonal entry from applying the previous Givens rotation to the current column. The correct Paige-Saunders (1975) two-rotation recurrence is: oldeps = epsln delta = cs * dbar + sn * alpha # apply previous rotation gbar_k = sn * dbar - cs * alpha # residual -> new rotation input epsln = sn * beta dbar = -cs * beta gamma = hypot(gbar_k, beta) # NEW rotation eliminates beta cs = gbar_k / gamma sn = beta / gamma w_new = (v - oldeps*w - delta*w2) / gamma # three-term update This matches scipy.sparse.linalg.minres and Choi (2006) eq. 6.11. The buggy recurrence produced solutions ~1.08x away from the true solution (rel_err ~1e0) instead of the expected ~1e-13. Co-authored-by: fix-minres-recurrence
|
@antonwolfy @vlad-perevezentsev Could you please confirm the failing git actions: https://github.com/IntelPython/dpnp/actions/runs/27830969946/job/82761533818#step:13:2975 are from an in-progress work upstream and was wondering if the PR is GTO =================================== FAILURES ===================================
_ TestNdarrayTakeErrorTypeMismatch_param_0_{indices=(2, 3), out_shape=(2, 3), shape=(3, 4, 5)}.test_output_type_mismatch _
[gw2] linux -- Python 3.13.14 /home/runner/miniconda3/envs/test/bin/python
self = <<cupy.core_tests.test_ndarray.TestNdarrayTakeErrorTypeMismatch_param_0_{indices=(2, 3), out_shape=(2, 3), shape=(3, 4, 5)} testMethod=test_output_type_mismatch> parameter: {'shape': (3, 4, 5), 'indices': (2, 3), 'out_shape': (2, 3)}>
def test_output_type_mismatch(self):
for xp in (numpy, cupy):
a = testing.shaped_arange(self.shape, xp, numpy.int32)
i = testing.shaped_arange(self.indices, xp, numpy.int32) % 3
o = testing.shaped_arange(self.out_shape, xp, numpy.float32)
> with pytest.raises(TypeError):
^^^^^^^^^^^^^^^^^^^^^^^^
E Failed: DID NOT RAISE TypeError
../../../miniconda3/envs/test/lib/python3.13/site-packages/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py:572: Failed
_ TestNdarrayTakeErrorTypeMismatch_param_1_{indices=(), out_shape=(), shape=()}.test_output_type_mismatch _
[gw2] linux -- Python 3.13.14 /home/runner/miniconda3/envs/test/bin/python
self = <<cupy.core_tests.test_ndarray.TestNdarrayTakeErrorTypeMismatch_param_1_{indices=(), out_shape=(), shape=()} testMethod=test_output_type_mismatch> parameter: {'shape': (), 'indices': (), 'out_shape': ()}>
def test_output_type_mismatch(self):
for xp in (numpy, cupy):
a = testing.shaped_arange(self.shape, xp, numpy.int32)
i = testing.shaped_arange(self.indices, xp, numpy.int32) % 3
o = testing.shaped_arange(self.out_shape, xp, numpy.float32)
> with pytest.raises(TypeError):
^^^^^^^^^^^^^^^^^^^^^^^^
E Failed: DID NOT RAISE TypeError
../../../miniconda3/envs/test/lib/python3.13/site-packages/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py:572: Failed |
|
@abagusetty, it should work now. The fail was caused by new NumPy 2.5 release, but already resolved in #2959 |
Co-authored-by: Anton <100830759+antonwolfy@users.noreply.github.com>
| and a small set of Krylov solvers (``cg``, ``gmres``, ``minres``). | ||
| """ | ||
|
|
||
| from __future__ import annotations |
There was a problem hiding this comment.
Do we need that? Is it used somewhere?
|
|
||
| __all__ = [ | ||
| "linalg", | ||
| "SparseABC", |
There was a problem hiding this comment.
Why do we need to expose SparseABC as part of scipy.sparse submodule?
SciPy does not did that.
| @@ -0,0 +1,27 @@ | |||
| """Sparse base class and predicate, mirroring scipy/_lib/_sparse.py. | |||
There was a problem hiding this comment.
Should we mimic and move the file to dpnp/scipy/_lib/_sparse.py?
|
|
||
| from abc import ABC | ||
|
|
||
|
|
There was a problem hiding this comment.
| __all__ = ["SparseABC", "issparse"] | |
| """Abstract base for all dpnp.scipy.sparse format classes.""" | ||
|
|
||
|
|
||
| def issparse(x): |
There was a problem hiding this comment.
We need to add rendering of documentation for the new sparse submodule.
Use doc/reference/scipy_linalg.rst as a reference.
| # set_csr_data + optimize_gemv must complete before any compute | ||
| # call can dispatch against the handle. This is the only blocking | ||
| # sync; subsequent matvecs return without waiting. | ||
| ev.wait() |
There was a problem hiding this comment.
Why do we need to have that call as a blocking? We can add the returned event under control of SequentialOrderManager.
Or alternatively we no need to return the event from _sparse_gemv_init and to implement the wait inside.
| _manager.add_event_pair(ht_ev, comp_ev) | ||
| return y | ||
|
|
||
| # Dense fallback. Materialises ``self`` once -- this path is |
There was a problem hiding this comment.
I wonder if it is a fare option to implement the fallback silently. It does not seem present in CuPy. CuPy raises the explicit exception for unsupported dtypes. While SciPy support any dtypes, since implements own sparse kernels.
In fallback case we have to allocate the full dense array, which may cause protentional OOM issue.
And so leaving the fallback implementation under the user control might be more friendly.
Also, as an option, we can implement upcasting of input arrays to support more wide range of dtypes.
| f"csr_matrix.dot: x dtype {x.dtype} does not " | ||
| f"match matrix dtype {self.data.dtype}" | ||
| ) | ||
| y = _dpnp.empty(nrows, dtype=self.data.dtype, sycl_queue=exec_q) |
There was a problem hiding this comment.
| y = _dpnp.empty(nrows, dtype=self.data.dtype, sycl_queue=exec_q) | |
| y = _dpnp.empty_like(self.data, nrows) |
| return | ||
|
|
||
| release_fn = getattr(si, "_sparse_gemv_release", None) | ||
| if release_fn is None: |
There was a problem hiding this comment.
When there might be no _sparse_gemv_release available?
|
|
||
| try: | ||
| # pylint: disable-next=not-callable | ||
| release_fn(self._spmv_exec_q, handle, []) |
There was a problem hiding this comment.
Why no dependencies need to be passed?
There was a problem hiding this comment.
Also release_fn returns the SYCL event but seems no handling
Adds support for
from dpnp.scipy.sparse.linalg import LinearOperator, cg, gmres, minresFixes: #2831