[Typing] 修改 tensor.prototype.pyi 不再使用 Protocol 以及缺失的参数类型 (#65697)

megemini · web-flow · commit 0fdd4d1682ea · 2024-07-04T22:09:35.000+08:00
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -3188,7 +3188,7 @@ def squeeze(
 
 @inplace_apis_in_dygraph_only
 def squeeze_(
-    x: Tensor, axis: int | Sequence[int] = None, name: str | None = None
+    x: Tensor, axis: int | Sequence[int] | None = None, name: str | None = None
 ) -> Tensor:
     """
     Inplace version of ``squeeze`` API, the output Tensor will be inplaced with input ``x``.
diff --git a/python/paddle/tensor/stat.py b/python/paddle/tensor/stat.py
@@ -962,7 +962,7 @@ def quantile(
 def nanquantile(
     x: Tensor,
     q: float | Sequence[float] | Tensor,
-    axis: list[int] | int = None,
+    axis: list[int] | int | None = None,
     keepdim: bool = False,
     interpolation: _Interpolation = "linear",
 ) -> Tensor:
diff --git a/python/paddle/tensor/tensor.prototype.pyi b/python/paddle/tensor/tensor.prototype.pyi
@@ -24,7 +24,7 @@ from paddle._typing import *  # noqa: F403
 
 # isort: on
 
-from typing import Any, Iterator, Literal, Protocol, overload
+from typing import Any, Iterator, Literal, overload
 
 import numpy.typing as npt
 
@@ -36,9 +36,11 @@ from paddle import (
 from paddle.base.dygraph.tensor_patch_methods import (
     TensorHookRemoveHelper,  # noqa: F401
 )
+from paddle.tensor.linalg import _POrder  # noqa: F401
+from paddle.tensor.stat import _Interpolation  # noqa: F401
 
 # annotation: ${eager_param_base_begin}
-class AbstractEagerParamBase(Protocol):
+class AbstractEagerParamBase:
     # annotation: ${eager_param_base_docstring}
 
     # annotation: ${eager_param_base_attributes}
@@ -54,9 +56,7 @@ class AbstractEagerParamBase(Protocol):
 # annotation: ${eager_param_base_end}
 
 # annotation: ${tensor_begin}
-class AbstractTensor(Protocol):
-    # annotation: ${tensor_docstring}
-
+class AbstractTensor:
     # annotation: ${tensor_attributes}
 
     # If method defined below, we should make the method's signature complete,
@@ -272,7 +272,7 @@ class AbstractTensor(Protocol):
     def process_mesh(self) -> paddle.distributed.ProcessMesh | None: ...
     def rows(self) -> list[int]: ...
     def set_string_list(self, value: str) -> None: ...
-    def set_vocab(self, value: dict) -> None: ...
+    def set_vocab(self, value: dict[str, int]) -> None: ...
     @property
     def shape(self) -> list[int]: ...
     @property
@@ -294,7 +294,9 @@ class AbstractTensor(Protocol):
 
     # annotation: ${tensor_alias}
 
-# annotation: ${tensor_end}
-
 class Tensor(AbstractTensor, AbstractEagerParamBase):
+    # annotation: ${tensor_docstring}
+
     __qualname__: Literal["Tensor"]
+
+# annotation: ${tensor_end}
