Skip to content

Commit 14d03c8

Browse files
JulVandenBroeckJulVandenBroeck
committed
Cleaned up overloads with type aliases
1 parent 8d5637d commit 14d03c8

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
@@ -90,6 +90,9 @@ _ToBlocksCanStack: TypeAlias = Seq[Seq[_CanStack[_T] | None]]
9090
_ToBlocksCanStackAs: TypeAlias = Seq[Seq[_CanStackAs[_SCT0, _T] | None]]
9191
_ToBlocksUnkown: TypeAlias = _ToBlocksSPArray | _ToBlocksArray
9292

93+
_ToMatsDiagKnown: TypeAlias = Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]]
94+
_ToMatsDiagUnknown: TypeAlias = Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]]
95+
9396
@type_check_only
9497
class _DataSampler(Protocol):
9598
def __call__(self, /, *, size: int) -> onp.ArrayND[_Numeric]: ...
@@ -1898,121 +1901,56 @@ def block_diag(mats: Iterable[sparray], format: _FmtLIL, dtype: onp.ToDType[_SCT
18981901
#
18991902
@overload # mats: <unknown, known>, format: <default>, dtype: None
19001903
def block_diag(
1901-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCOO | None = None, dtype: None = None
1904+
mats: _ToMatsDiagKnown[_SCT], format: _FmtCOO | None = None, dtype: None = None
19021905
) -> _COOArray2D[_SCT] | coo_matrix[_SCT]: ...
19031906
@overload # mats: <unknown, known>, format: "bsr", dtype: None
1904-
def block_diag(
1905-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtBSR, dtype: None = None
1906-
) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
1907+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtBSR, dtype: None = None) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
19071908
@overload # mats: <unknown, known>, format: "csc", dtype: None
1908-
def block_diag(
1909-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCSC, dtype: None = None
1910-
) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
1909+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtCSC, dtype: None = None) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
19111910
@overload # mats: <unknown, known>, format: "csr", dtype: None
1912-
def block_diag(
1913-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtCSR, dtype: None = None
1914-
) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
1911+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtCSR, dtype: None = None) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
19151912
@overload # mats: <unknown, known>, format: "dia", dtype: None
1916-
def block_diag(
1917-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtDIA, dtype: None = None
1918-
) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
1913+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtDIA, dtype: None = None) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
19191914
@overload # mats: <unknown, known>, format: "dok", dtype: None
1920-
def block_diag(
1921-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtDOK, dtype: None = None
1922-
) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
1915+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtDOK, dtype: None = None) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
19231916
@overload # mats: <unknown, known>, format: "lil", dtype: None
1924-
def block_diag(
1925-
mats: Iterable[_spbase[_SCT] | onp.ToArrayND[_SCT]], format: _FmtLIL, dtype: None = None
1926-
) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
1917+
def block_diag(mats: _ToMatsDiagKnown[_SCT], format: _FmtLIL, dtype: None = None) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
19271918

19281919
#
19291920
@overload # mats: <unknown, unknown>, format: <default>, dtype: <known>
19301921
def block_diag(
1931-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1932-
format: _FmtCOO | None = None,
1933-
*,
1934-
dtype: onp.ToDType[_SCT],
1922+
mats: _ToMatsDiagUnknown, format: _FmtCOO | None = None, *, dtype: onp.ToDType[_SCT]
19351923
) -> _COOArray2D[_SCT] | coo_matrix[_SCT]: ...
19361924
@overload # mats: <unknown, unknown>, format: "bsr", dtype: <known>
1937-
def block_diag(
1938-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1939-
format: _FmtBSR,
1940-
dtype: onp.ToDType[_SCT],
1941-
) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
1925+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtBSR, dtype: onp.ToDType[_SCT]) -> _BSRArray[_SCT] | bsr_matrix[_SCT]: ...
19421926
@overload # mats: <unknown, unknown>, format: "csc", dtype: <known>
1943-
def block_diag(
1944-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1945-
format: _FmtCSC,
1946-
dtype: onp.ToDType[_SCT],
1947-
) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
1927+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSC, dtype: onp.ToDType[_SCT]) -> _CSCArray[_SCT] | csc_matrix[_SCT]: ...
19481928
@overload # mats: <unknown, unknown>, format: "csr", dtype: <known>
1949-
def block_diag(
1950-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1951-
format: _FmtCSR,
1952-
dtype: onp.ToDType[_SCT],
1953-
) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
1929+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSR, dtype: onp.ToDType[_SCT]) -> _CSRArray2D[_SCT] | csr_matrix[_SCT]: ...
19541930
@overload # mats: <unknown, unknown>, format: "dia", dtype: <known>
1955-
def block_diag(
1956-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1957-
format: _FmtDIA,
1958-
dtype: onp.ToDType[_SCT],
1959-
) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
1931+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDIA, dtype: onp.ToDType[_SCT]) -> _DIAArray[_SCT] | dia_matrix[_SCT]: ...
19601932
@overload # mats: <unknown, unknown>, format: "dok", dtype: <known>
1961-
def block_diag(
1962-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1963-
format: _FmtDOK,
1964-
dtype: onp.ToDType[_SCT],
1965-
) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
1933+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDOK, dtype: onp.ToDType[_SCT]) -> _DOKArray2D[_SCT] | dok_matrix[_SCT]: ...
19661934
@overload # mats: <unknown, unknown>, format: "lil", dtype: <known>
1967-
def block_diag(
1968-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1969-
format: _FmtLIL,
1970-
dtype: onp.ToDType[_SCT],
1971-
) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
1935+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtLIL, dtype: onp.ToDType[_SCT]) -> _LILArray[_SCT] | lil_matrix[_SCT]: ...
19721936

19731937
#
19741938
@overload # mats: <unknown, unknown>, format: <default>, dtype: <unknown>
19751939
def block_diag(
1976-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1977-
format: _FmtCOO | None = None,
1978-
dtype: npt.DTypeLike | None = None,
1940+
mats: _ToMatsDiagUnknown, format: _FmtCOO | None = None, dtype: npt.DTypeLike | None = None
19791941
) -> _COOArray2D | coo_matrix: ...
19801942
@overload # mats: <unknown, unknown>, format: "bsr", dtype: <unknown>
1981-
def block_diag(
1982-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1983-
format: _FmtBSR,
1984-
dtype: npt.DTypeLike | None = None,
1985-
) -> _BSRArray | bsr_matrix: ...
1943+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtBSR, dtype: npt.DTypeLike | None = None) -> _BSRArray | bsr_matrix: ...
19861944
@overload # mats: <unknown, unknown>, format: "csc", dtype: <unknown>
1987-
def block_diag(
1988-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1989-
format: _FmtCSC,
1990-
dtype: npt.DTypeLike | None = None,
1991-
) -> _CSCArray | csc_matrix: ...
1945+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSC, dtype: npt.DTypeLike | None = None) -> _CSCArray | csc_matrix: ...
19921946
@overload # mats: <unknown, unknown>, format: "csr", dtype: <unknown>
1993-
def block_diag(
1994-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
1995-
format: _FmtCSR,
1996-
dtype: npt.DTypeLike | None = None,
1997-
) -> _CSRArray2D | csr_matrix: ...
1947+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtCSR, dtype: npt.DTypeLike | None = None) -> _CSRArray2D | csr_matrix: ...
19981948
@overload # mats: <unknown, unknown>, format: "dia", dtype: <unknown>
1999-
def block_diag(
2000-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
2001-
format: _FmtDIA,
2002-
dtype: npt.DTypeLike | None = None,
2003-
) -> _DIAArray | dia_matrix: ...
1949+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDIA, dtype: npt.DTypeLike | None = None) -> _DIAArray | dia_matrix: ...
20041950
@overload # mats: <unknown, unknown>, format: "dok", dtype: <unknown>
2005-
def block_diag(
2006-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
2007-
format: _FmtDOK,
2008-
dtype: npt.DTypeLike | None = None,
2009-
) -> _DOKArray2D | dok_matrix: ...
1951+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtDOK, dtype: npt.DTypeLike | None = None) -> _DOKArray2D | dok_matrix: ...
20101952
@overload # mats: <unknown, unknown>, format: "lil", dtype: <unknown>
2011-
def block_diag(
2012-
mats: Iterable[_spbase | onp.ArrayND[_Numeric] | complex | Seq[onp.ToComplex] | Seq[onp.ToComplex1D]],
2013-
format: _FmtLIL,
2014-
dtype: npt.DTypeLike | None = None,
2015-
) -> _LILArray | lil_matrix: ...
1953+
def block_diag(mats: _ToMatsDiagUnknown, format: _FmtLIL, dtype: npt.DTypeLike | None = None) -> _LILArray | lil_matrix: ...
20161954

20171955
###
20181956
@overload # shape: T, format: <default>, dtype: <default>

0 commit comments

Comments
 (0)