From 36369c06a4e7aaa677ae8fe0656ca8c68c830dc3 Mon Sep 17 00:00:00 2001 From: Sergei Izmailov Date: Fri, 1 Sep 2023 07:17:24 +0900 Subject: [PATCH] chore: Apply changes to py 3.7 an 3.8 stubs --- .../pybind11-master/demo/_bindings/eigen.pyi | 70 +++++++++++++++++++ .../pybind11-master/demo/_bindings/numpy.pyi | 10 +-- .../pybind11-master/demo/_bindings/eigen.pyi | 70 +++++++++++++++++++ .../pybind11-master/demo/_bindings/numpy.pyi | 10 +-- 4 files changed, 152 insertions(+), 8 deletions(-) diff --git a/tests/stubs/python-3.7/pybind11-master/demo/_bindings/eigen.pyi b/tests/stubs/python-3.7/pybind11-master/demo/_bindings/eigen.pyi index cc65a21..a702dc3 100644 --- a/tests/stubs/python-3.7/pybind11-master/demo/_bindings/eigen.pyi +++ b/tests/stubs/python-3.7/pybind11-master/demo/_bindings/eigen.pyi @@ -2,12 +2,22 @@ from __future__ import annotations import numpy import pybind11_stubgen.typing_ext +import scipy.sparse __all__ = [ "accept_matrix_int", "accept_vector_float64", + "dense_matrix_c", + "dense_matrix_r", + "fixed_mutator_a", + "fixed_mutator_c", + "fixed_mutator_r", + "four_col_matrix_r", + "four_row_matrix_r", "get_matrix_int", "get_vector_float64", + "sparse_matrix_c", + "sparse_matrix_r", ] def accept_matrix_int( @@ -20,9 +30,69 @@ def accept_vector_float64( numpy.ndarray, numpy.float64, pybind11_stubgen.typing_ext.FixedSize(3, 1) ] ) -> None: ... +def dense_matrix_c( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") +]: ... +def dense_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") +]: ... +def fixed_mutator_a( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + ] +) -> None: ... +def fixed_mutator_c( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + numpy.ndarray.flags.f_contiguous, + ] +) -> None: ... +def fixed_mutator_r( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + numpy.ndarray.flags.c_contiguous, + ] +) -> None: ... +def four_col_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", 4) + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", 4) +]: ... +def four_row_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize(4, "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize(4, "n") +]: ... def get_matrix_int() -> typing.Annotated[ numpy.ndarray, numpy.int32, pybind11_stubgen.typing_ext.FixedSize(3, 3) ]: ... def get_vector_float64() -> typing.Annotated[ numpy.ndarray, numpy.float64, pybind11_stubgen.typing_ext.FixedSize(3, 1) ]: ... +def sparse_matrix_c( + arg0: typing.Annotated[scipy.sparse.csc_matrix, numpy.float32] +) -> typing.Annotated[scipy.sparse.csc_matrix, numpy.float32]: ... +def sparse_matrix_r( + arg0: typing.Annotated[scipy.sparse.csr_matrix, numpy.float32] +) -> typing.Annotated[scipy.sparse.csr_matrix, numpy.float32]: ... diff --git a/tests/stubs/python-3.7/pybind11-master/demo/_bindings/numpy.pyi b/tests/stubs/python-3.7/pybind11-master/demo/_bindings/numpy.pyi index 385d679..918e736 100644 --- a/tests/stubs/python-3.7/pybind11-master/demo/_bindings/numpy.pyi +++ b/tests/stubs/python-3.7/pybind11-master/demo/_bindings/numpy.pyi @@ -9,7 +9,9 @@ __all__ = [ "get_ndarray_int", ] -def accept_ndarray_float64(arg0: numpy.ndarray[numpy.float64]) -> None: ... -def accept_ndarray_int(arg0: numpy.ndarray[numpy.int32]) -> None: ... -def get_ndarray_float64() -> numpy.ndarray[numpy.float64]: ... -def get_ndarray_int() -> numpy.ndarray[numpy.int32]: ... +def accept_ndarray_float64( + arg0: typing.Annotated[numpy.ndarray, numpy.float64] +) -> None: ... +def accept_ndarray_int(arg0: typing.Annotated[numpy.ndarray, numpy.int32]) -> None: ... +def get_ndarray_float64() -> typing.Annotated[numpy.ndarray, numpy.float64]: ... +def get_ndarray_int() -> typing.Annotated[numpy.ndarray, numpy.int32]: ... diff --git a/tests/stubs/python-3.8/pybind11-master/demo/_bindings/eigen.pyi b/tests/stubs/python-3.8/pybind11-master/demo/_bindings/eigen.pyi index cc65a21..a702dc3 100644 --- a/tests/stubs/python-3.8/pybind11-master/demo/_bindings/eigen.pyi +++ b/tests/stubs/python-3.8/pybind11-master/demo/_bindings/eigen.pyi @@ -2,12 +2,22 @@ from __future__ import annotations import numpy import pybind11_stubgen.typing_ext +import scipy.sparse __all__ = [ "accept_matrix_int", "accept_vector_float64", + "dense_matrix_c", + "dense_matrix_r", + "fixed_mutator_a", + "fixed_mutator_c", + "fixed_mutator_r", + "four_col_matrix_r", + "four_row_matrix_r", "get_matrix_int", "get_vector_float64", + "sparse_matrix_c", + "sparse_matrix_r", ] def accept_matrix_int( @@ -20,9 +30,69 @@ def accept_vector_float64( numpy.ndarray, numpy.float64, pybind11_stubgen.typing_ext.FixedSize(3, 1) ] ) -> None: ... +def dense_matrix_c( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") +]: ... +def dense_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", "n") +]: ... +def fixed_mutator_a( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + ] +) -> None: ... +def fixed_mutator_c( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + numpy.ndarray.flags.f_contiguous, + ] +) -> None: ... +def fixed_mutator_r( + arg0: typing.Annotated[ + numpy.ndarray, + numpy.float32, + pybind11_stubgen.typing_ext.FixedSize(5, 6), + numpy.ndarray.flags.writeable, + numpy.ndarray.flags.c_contiguous, + ] +) -> None: ... +def four_col_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", 4) + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize("m", 4) +]: ... +def four_row_matrix_r( + arg0: typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize(4, "n") + ] +) -> typing.Annotated[ + numpy.ndarray, numpy.float32, pybind11_stubgen.typing_ext.DynamicSize(4, "n") +]: ... def get_matrix_int() -> typing.Annotated[ numpy.ndarray, numpy.int32, pybind11_stubgen.typing_ext.FixedSize(3, 3) ]: ... def get_vector_float64() -> typing.Annotated[ numpy.ndarray, numpy.float64, pybind11_stubgen.typing_ext.FixedSize(3, 1) ]: ... +def sparse_matrix_c( + arg0: typing.Annotated[scipy.sparse.csc_matrix, numpy.float32] +) -> typing.Annotated[scipy.sparse.csc_matrix, numpy.float32]: ... +def sparse_matrix_r( + arg0: typing.Annotated[scipy.sparse.csr_matrix, numpy.float32] +) -> typing.Annotated[scipy.sparse.csr_matrix, numpy.float32]: ... diff --git a/tests/stubs/python-3.8/pybind11-master/demo/_bindings/numpy.pyi b/tests/stubs/python-3.8/pybind11-master/demo/_bindings/numpy.pyi index 385d679..918e736 100644 --- a/tests/stubs/python-3.8/pybind11-master/demo/_bindings/numpy.pyi +++ b/tests/stubs/python-3.8/pybind11-master/demo/_bindings/numpy.pyi @@ -9,7 +9,9 @@ __all__ = [ "get_ndarray_int", ] -def accept_ndarray_float64(arg0: numpy.ndarray[numpy.float64]) -> None: ... -def accept_ndarray_int(arg0: numpy.ndarray[numpy.int32]) -> None: ... -def get_ndarray_float64() -> numpy.ndarray[numpy.float64]: ... -def get_ndarray_int() -> numpy.ndarray[numpy.int32]: ... +def accept_ndarray_float64( + arg0: typing.Annotated[numpy.ndarray, numpy.float64] +) -> None: ... +def accept_ndarray_int(arg0: typing.Annotated[numpy.ndarray, numpy.int32]) -> None: ... +def get_ndarray_float64() -> typing.Annotated[numpy.ndarray, numpy.float64]: ... +def get_ndarray_int() -> typing.Annotated[numpy.ndarray, numpy.int32]: ...