Skip to content

Commit 64fca16

Browse files
JulVandenBroeckjulvdb
JulVandenBroeck
authored and
julvdb
committed
Cleaned up overloads with type aliases
1 parent 59f1aa4 commit 64fca16

File tree

1 file changed

+24
-86
lines changed

1 file changed

+24
-86
lines changed

‎scipy-stubs/sparse/_construct.pyi‎

Lines changed: 24 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ _ToBlocksCanStack: TypeAlias = Seq[Seq[_CanStack[_T] | None]]
8383
_ToBlocksCanStackAs: TypeAlias = Seq[Seq[_CanStackAs[_SCT0, _T] | None]]
8484
_ToBlocksUnkown: TypeAlias = _ToBlocksSPArray | _ToBlocksArray
8585

86+
_ToMatsDiagKnown: TypeAlias = Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]]
87+
_ToMatsDiagUnknown: TypeAlias = Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]]
88+
8689
@type_check_only
8790
class _DataSampler(Protocol):
8891
def __call__(self, /, *, size: int) -> onp.ArrayND[_Numeric]: ...
@@ -1891,121 +1894,56 @@ def block_diag(mats: Iterable[sparray], format: _FmtLIL, dtype: onp.ToDType[_SCT
18911894
#
18921895
@overload # mats: <unknown, known>, format: <default>, dtype: None
18931896
def block_diag(
1894-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCOO | None = None, dtype: None = None
1897+
mats: _ToMatsDiagKnown[_SCT], format: _FmtCOO | None = None, dtype: None = None
18951898
) -> _COOArray2D[_SCT] | coo_matrix[_SCT]: ...
18961899
@overload # mats: <unknown, known>, format: "bsr", dtype: None
1897-
def block_diag(
1898-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtBSR, dtype: None = None
1899-
) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
1900+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtBSR, dtype: None = None) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
19001901
@overload # mats: <unknown, known>, format: "csc", dtype: None
1901-
def block_diag(
1902-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCSC, dtype: None = None
1903-
) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
1902+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtCSC, dtype: None = None) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
19041903
@overload # mats: <unknown, known>, format: "csr", dtype: None
1905-
def block_diag(
1906-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCSR, dtype: None = None
1907-
) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
1904+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtCSR, dtype: None = None) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
19081905
@overload # mats: <unknown, known>, format: "dia", dtype: None
1909-
def block_diag(
1910-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtDIA, dtype: None = None
1911-
) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
1906+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtDIA, dtype: None = None) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
19121907
@overload # mats: <unknown, known>, format: "dok", dtype: None
1913-
def block_diag(
1914-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtDOK, dtype: None = None
1915-
) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
1908+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtDOK, dtype: None = None) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
19161909
@overload # mats: <unknown, known>, format: "lil", dtype: None
1917-
def block_diag(
1918-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtLIL, dtype: None = None
1919-
) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
1910+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtLIL, dtype: None = None) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
19201911

19211912
#
19221913
@overload # mats: <unknown, unknown>, format: <default>, dtype: <known>
19231914
def block_diag(
1924-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1925-
format: _FmtCOO | None = None,
1926-
*,
1927-
dtype: onp.ToDType[_SCT],
1915+
mats: _ToMatsDiagUnknown, format: _FmtCOO | None = None, *, dtype: onp.ToDType[_SCT]
19281916
) -> _COOArray2D[_SCT] | coo_matrix[_SCT]: ...
19291917
@overload # mats: <unknown, unknown>, format: "bsr", dtype: <known>
1930-
def block_diag(
1931-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1932-
format: _FmtBSR,
1933-
dtype: onp.ToDType[_SCT],
1934-
) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
1918+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtBSR, dtype: onp.ToDType[_SCT]) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
19351919
@overload # mats: <unknown, unknown>, format: "csc", dtype: <known>
1936-
def block_diag(
1937-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1938-
format: _FmtCSC,
1939-
dtype: onp.ToDType[_SCT],
1940-
) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
1920+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSC, dtype: onp.ToDType[_SCT]) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
19411921
@overload # mats: <unknown, unknown>, format: "csr", dtype: <known>
1942-
def block_diag(
1943-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1944-
format: _FmtCSR,
1945-
dtype: onp.ToDType[_SCT],
1946-
) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
1922+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSR, dtype: onp.ToDType[_SCT]) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
19471923
@overload # mats: <unknown, unknown>, format: "dia", dtype: <known>
1948-
def block_diag(
1949-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1950-
format: _FmtDIA,
1951-
dtype: onp.ToDType[_SCT],
1952-
) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
1924+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDIA, dtype: onp.ToDType[_SCT]) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
19531925
@overload # mats: <unknown, unknown>, format: "dok", dtype: <known>
1954-
def block_diag(
1955-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1956-
format: _FmtDOK,
1957-
dtype: onp.ToDType[_SCT],
1958-
) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
1926+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDOK, dtype: onp.ToDType[_SCT]) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
19591927
@overload # mats: <unknown, unknown>, format: "lil", dtype: <known>
1960-
def block_diag(
1961-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1962-
format: _FmtLIL,
1963-
dtype: onp.ToDType[_SCT],
1964-
) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
1928+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtLIL, dtype: onp.ToDType[_SCT]) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
19651929

19661930
#
19671931
@overload # mats: <unknown, unknown>, format: <default>, dtype: <unknown>
19681932
def block_diag(
1969-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1970-
format: _FmtCOO | None = None,
1971-
dtype: npt.DTypeLike | None = None,
1933+
mats: _ToMatsDiagUnknown, format: _FmtCOO | None = None, dtype: npt.DTypeLike | None = None
19721934
) -> _COOArray2D | coo_matrix: ...
19731935
@overload # mats: <unknown, unknown>, format: "bsr", dtype: <unknown>
1974-
def block_diag(
1975-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1976-
format: _FmtBSR,
1977-
dtype: npt.DTypeLike | None = None,
1978-
) -> _BSRArray | bsr_matrix: ...
1936+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtBSR, dtype: npt.DTypeLike | None = None) -> _BSRArray | bsr_matrix: ...
19791937
@overload # mats: <unknown, unknown>, format: "csc", dtype: <unknown>
1980-
def block_diag(
1981-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1982-
format: _FmtCSC,
1983-
dtype: npt.DTypeLike | None = None,
1984-
) -> _CSCArray | csc_matrix: ...
1938+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSC, dtype: npt.DTypeLike | None = None) -> _CSCArray | csc_matrix: ...
19851939
@overload # mats: <unknown, unknown>, format: "csr", dtype: <unknown>
1986-
def block_diag(
1987-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1988-
format: _FmtCSR,
1989-
dtype: npt.DTypeLike | None = None,
1990-
) -> _CSRArray2D | csr_matrix: ...
1940+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSR, dtype: npt.DTypeLike | None = None) -> _CSRArray2D | csr_matrix: ...
19911941
@overload # mats: <unknown, unknown>, format: "dia", dtype: <unknown>
1992-
def block_diag(
1993-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1994-
format: _FmtDIA,
1995-
dtype: npt.DTypeLike | None = None,
1996-
) -> _DIAArray | dia_matrix: ...
1942+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDIA, dtype: npt.DTypeLike | None = None) -> _DIAArray | dia_matrix: ...
19971943
@overload # mats: <unknown, unknown>, format: "dok", dtype: <unknown>
1998-
def block_diag(
1999-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
2000-
format: _FmtDOK,
2001-
dtype: npt.DTypeLike | None = None,
2002-
) -> _DOKArray2D | dok_matrix: ...
1944+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDOK, dtype: npt.DTypeLike | None = None) -> _DOKArray2D | dok_matrix: ...
20031945
@overload # mats: <unknown, unknown>, format: "lil", dtype: <unknown>
2004-
def block_diag(
2005-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
2006-
format: _FmtLIL,
2007-
dtype: npt.DTypeLike | None = None,
2008-
) -> _LILArray | lil_matrix: ...
1946+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtLIL, dtype: npt.DTypeLike | None = None) -> _LILArray | lil_matrix: ...
20091947

20101948
###
20111949
@overload # shape: T, format: <default>, dtype: <default>

0 commit comments

Comments
 (0)