diff --git a/src/numpy-stubs/matlib.pyi b/src/numpy-stubs/matlib.pyi index a0af92e0..5ab527de 100644 --- a/src/numpy-stubs/matlib.pyi +++ b/src/numpy-stubs/matlib.pyi @@ -600,72 +600,75 @@ __all__ += [ # noqa: RUF022 ### -_T = TypeVar("_T", bound=np.generic) -_Matrix: TypeAlias = np.matrix[tuple[int, int], np.dtype[_T]] +_ScalarT = TypeVar("_ScalarT", bound=np.generic) _Order: TypeAlias = Literal["C", "F"] ### # @overload -def empty(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _Matrix[np.float64]: ... +def empty(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _nt.Matrix[np.float64]: ... @overload -def empty(shape: int | tuple[int, int], dtype: _DTypeLike[_T], order: _Order = "C") -> _Matrix[_T]: ... +def empty(shape: int | tuple[int, int], dtype: _DTypeLike[_ScalarT], order: _Order = "C") -> _nt.Matrix[_ScalarT]: ... @overload -def empty(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _Matrix[Any]: ... +def empty(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _nt.Matrix[Any]: ... # @overload -def ones(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _Matrix[np.float64]: ... +def ones(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _nt.Matrix[np.float64]: ... @overload -def ones(shape: int | tuple[int, int], dtype: _DTypeLike[_T], order: _Order = "C") -> _Matrix[_T]: ... +def ones(shape: int | tuple[int, int], dtype: _DTypeLike[_ScalarT], order: _Order = "C") -> _nt.Matrix[_ScalarT]: ... @overload -def ones(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _Matrix[Any]: ... +def ones(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _nt.Matrix[Any]: ... # @overload -def zeros(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _Matrix[np.float64]: ... +def zeros(shape: int | tuple[int, int], dtype: None = None, order: _Order = "C") -> _nt.Matrix[np.float64]: ... @overload -def zeros(shape: int | tuple[int, int], dtype: _DTypeLike[_T], order: _Order = "C") -> _Matrix[_T]: ... +def zeros(shape: int | tuple[int, int], dtype: _DTypeLike[_ScalarT], order: _Order = "C") -> _nt.Matrix[_ScalarT]: ... @overload -def zeros(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _Matrix[Any]: ... +def zeros(shape: int | tuple[int, int], dtype: npt.DTypeLike, order: _Order = "C") -> _nt.Matrix[Any]: ... # @overload -def identity(n: int, dtype: None = None) -> _Matrix[np.float64]: ... +def identity(n: int, dtype: None = None) -> _nt.Matrix[np.float64]: ... @overload -def identity(n: int, dtype: _DTypeLike[_T]) -> _Matrix[_T]: ... +def identity(n: int, dtype: _DTypeLike[_ScalarT]) -> _nt.Matrix[_ScalarT]: ... @overload -def identity(n: int, dtype: npt.DTypeLike | None = None) -> _Matrix[Any]: ... +def identity(n: int, dtype: npt.DTypeLike | None = None) -> _nt.Matrix[Any]: ... # @overload def eye( n: int, M: int | None = None, k: int = 0, dtype: type[np.float64] | None = ..., order: _Order = "C" -) -> _Matrix[np.float64]: ... +) -> _nt.Matrix[np.float64]: ... @overload -def eye(n: int, M: int | None, k: int, dtype: _DTypeLike[_T], order: _Order = "C") -> _Matrix[_T]: ... +def eye(n: int, M: int | None, k: int, dtype: _DTypeLike[_ScalarT], order: _Order = "C") -> _nt.Matrix[_ScalarT]: ... @overload -def eye(n: int, M: int | None = None, k: int = 0, *, dtype: _DTypeLike[_T], order: _Order = "C") -> _Matrix[_T]: ... +def eye( + n: int, M: int | None = None, k: int = 0, *, dtype: _DTypeLike[_ScalarT], order: _Order = "C" +) -> _nt.Matrix[_ScalarT]: ... @overload -def eye(n: int, M: int | None = None, k: int = 0, dtype: npt.DTypeLike = ..., order: _Order = "C") -> _Matrix[Any]: ... +def eye( + n: int, M: int | None = None, k: int = 0, dtype: npt.DTypeLike = ..., order: _Order = "C" +) -> _nt.Matrix[Any]: ... # @overload -def rand(arg: int | tuple[()] | tuple[int] | tuple[int, int], /) -> _Matrix[np.float64]: ... +def rand(arg: int | tuple[()] | tuple[int] | tuple[int, int], /) -> _nt.Matrix[np.float64]: ... @overload -def rand(arg: int, /, *args: int) -> _Matrix[np.float64]: ... +def rand(arg: int, /, *args: int) -> _nt.Matrix[np.float64]: ... # @overload -def randn(arg: int | tuple[()] | tuple[int] | tuple[int, int], /) -> _Matrix[np.float64]: ... +def randn(arg: int | tuple[()] | tuple[int] | tuple[int, int], /) -> _nt.Matrix[np.float64]: ... @overload -def randn(arg: int, /, *args: int) -> _Matrix[np.float64]: ... +def randn(arg: int, /, *args: int) -> _nt.Matrix[np.float64]: ... # @overload -def repmat(a: _Matrix[_T], m: int, n: int) -> _Matrix[_T]: ... +def repmat(a: _nt.Matrix[_ScalarT], m: int, n: int) -> _nt.Matrix[_ScalarT]: ... @overload -def repmat(a: _ArrayLike[_T], m: int, n: int) -> _nt.Array[_T]: ... +def repmat(a: _ArrayLike[_ScalarT], m: int, n: int) -> _nt.Array[_ScalarT]: ... @overload def repmat(a: npt.ArrayLike, m: int, n: int) -> _nt.Array[Any]: ...