未验证 提交 51248f89 编写于 作者: J JYChen 提交者: GitHub

[Cherry-pick] remove functions not belong to public-api from __all__ (#47577)

* remove functions not belong to public-api from __all__

* fix code style

* fix error in distributed
上级 ea5f44b8
...@@ -20,7 +20,7 @@ from paddle.utils import download ...@@ -20,7 +20,7 @@ from paddle.utils import download
from paddle.dataset.common import DATA_HOME from paddle.dataset.common import DATA_HOME
from .dataset import AudioClassificationDataset from .dataset import AudioClassificationDataset
__all__ = ['ESC50'] __all__ = []
class ESC50(AudioClassificationDataset): class ESC50(AudioClassificationDataset):
......
...@@ -20,7 +20,7 @@ from paddle.utils import download ...@@ -20,7 +20,7 @@ from paddle.utils import download
from paddle.dataset.common import DATA_HOME from paddle.dataset.common import DATA_HOME
from .dataset import AudioClassificationDataset from .dataset import AudioClassificationDataset
__all__ = ['TESS'] __all__ = []
class TESS(AudioClassificationDataset): class TESS(AudioClassificationDataset):
......
...@@ -51,7 +51,7 @@ from .collective import batch_isend_irecv # noqa: F401 ...@@ -51,7 +51,7 @@ from .collective import batch_isend_irecv # noqa: F401
from .collective import P2POp # noqa: F401 from .collective import P2POp # noqa: F401
from .collective import reduce_scatter # noqa: F401 from .collective import reduce_scatter # noqa: F401
from .communication import * # noqa: F401 from .communication import stream
from .auto_parallel import shard_op # noqa: F401 from .auto_parallel import shard_op # noqa: F401
from .auto_parallel import shard_tensor # noqa: F401 from .auto_parallel import shard_tensor # noqa: F401
...@@ -66,15 +66,43 @@ from paddle.fluid.dygraph.parallel import ParallelEnv # noqa: F401 ...@@ -66,15 +66,43 @@ from paddle.fluid.dygraph.parallel import ParallelEnv # noqa: F401
from . import cloud_utils # noqa: F401 from . import cloud_utils # noqa: F401
from .sharding import * # noqa: F401 from .sharding import group_sharded_parallel, save_group_sharded_model
__all__ = [ # noqa __all__ = [ # noqa
"spawn", "launch", "scatter", "broadcast", "ParallelEnv", "new_group", "spawn",
"init_parallel_env", "gloo_init_parallel_env", "gloo_barrier", "launch",
"gloo_release", "QueueDataset", "split", "CountFilterEntry", "scatter",
"ShowClickEntry", "get_world_size", "get_group", "all_gather", "broadcast",
"all_gather_object", "InMemoryDataset", "barrier", "all_reduce", "alltoall", "ParallelEnv",
"alltoall_single", "send", "reduce", "recv", "ReduceOp", "wait", "get_rank", "new_group",
"ProbabilityEntry", "ParallelMode", "is_initialized", "init_parallel_env",
"destroy_process_group", "isend", "irecv", "reduce_scatter", "stream" "gloo_init_parallel_env",
"gloo_barrier",
"gloo_release",
"QueueDataset",
"split",
"CountFilterEntry",
"ShowClickEntry",
"get_world_size",
"get_group",
"all_gather",
"all_gather_object",
"InMemoryDataset",
"barrier",
"all_reduce",
"alltoall",
"alltoall_single",
"send",
"reduce",
"recv",
"ReduceOp",
"wait",
"get_rank",
"ProbabilityEntry",
"ParallelMode",
"is_initialized",
"destroy_process_group",
"isend",
"irecv",
"reduce_scatter",
] ]
...@@ -11,5 +11,3 @@ ...@@ -11,5 +11,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
__all__ = ["stream"]
...@@ -16,8 +16,4 @@ from .send_recv import send_u_recv # noqa: F401 ...@@ -16,8 +16,4 @@ from .send_recv import send_u_recv # noqa: F401
from .send_recv import send_ue_recv # noqa: F401 from .send_recv import send_ue_recv # noqa: F401
from .send_recv import send_uv # noqa: F401 from .send_recv import send_uv # noqa: F401
__all__ = [ __all__ = []
'send_u_recv',
'send_ue_recv',
'send_uv',
]
...@@ -14,6 +14,4 @@ ...@@ -14,6 +14,4 @@
from .neighbors import sample_neighbors # noqa: F401 from .neighbors import sample_neighbors # noqa: F401
__all__ = [ __all__ = []
'sample_neighbors',
]
...@@ -19,8 +19,6 @@ __all__ = [] ...@@ -19,8 +19,6 @@ __all__ = []
from multiprocessing import * # noqa: F403 from multiprocessing import * # noqa: F403
__all__ += multiprocessing.__all__ # type: ignore[attr-defined]
# Only support linux for now # Only support linux for now
# Only support file_system sharing strategy. # Only support file_system sharing strategy.
......
...@@ -14,17 +14,27 @@ ...@@ -14,17 +14,27 @@
from __future__ import print_function from __future__ import print_function
import os import os
from .layer_function_generator import generate_layer_fn, generate_activation_fn, generate_inplace_fn, add_sample_code from .layer_function_generator import (
generate_layer_fn,
generate_activation_fn,
generate_inplace_fn,
add_sample_code,
)
from ..framework import core from ..framework import core
from ..framework import convert_np_dtype_to_dtype_ from ..framework import convert_np_dtype_to_dtype_
from ..static import Variable from ..static import Variable
from ..fluid.data_feeder import convert_dtype, check_variable_and_dtype, check_type, check_dtype from ..fluid.data_feeder import (
convert_dtype,
check_variable_and_dtype,
check_type,
check_dtype,
)
from ..fluid.framework import in_dygraph_mode from ..fluid.framework import in_dygraph_mode
from .. import _C_ops, _legacy_C_ops from .. import _C_ops, _legacy_C_ops
__deprecated_func_name__ = { __deprecated_func_name__ = {
'tanh_shrink': 'tanhshrink', 'tanh_shrink': 'tanhshrink',
'logsigmoid': 'log_sigmoid' 'logsigmoid': 'log_sigmoid',
} }
__activations_noattr__ = [ __activations_noattr__ = [
...@@ -73,9 +83,6 @@ __inplace_unary_func__ = [ ...@@ -73,9 +83,6 @@ __inplace_unary_func__ = [
__all__ = [] __all__ = []
for _OP in set(__all__):
globals()[_OP] = generate_layer_fn(_OP)
# It is a hot fix in some unittest using: # It is a hot fix in some unittest using:
# fluid.layers.scale(x=x, scale=10.0, out=out_var) # fluid.layers.scale(x=x, scale=10.0, out=out_var)
# e.g.: test_program_code.py, test_dist_train.py # e.g.: test_program_code.py, test_dist_train.py
...@@ -83,10 +90,6 @@ globals()['_scale'] = generate_layer_fn('scale') ...@@ -83,10 +90,6 @@ globals()['_scale'] = generate_layer_fn('scale')
globals()['_elementwise_div'] = generate_layer_fn('elementwise_div') globals()['_elementwise_div'] = generate_layer_fn('elementwise_div')
__all__ += __activations_noattr__
__all__ += __unary_func__
__all__ += __inplace_unary_func__
for _OP in set(__activations_noattr__): for _OP in set(__activations_noattr__):
_new_OP = _OP _new_OP = _OP
if _OP in __deprecated_func_name__: if _OP in __deprecated_func_name__:
...@@ -109,7 +112,8 @@ for _OP in set(__inplace_unary_func__): ...@@ -109,7 +112,8 @@ for _OP in set(__inplace_unary_func__):
globals()[_OP] = _func globals()[_OP] = _func
add_sample_code( add_sample_code(
globals()["sigmoid"], r""" globals()["sigmoid"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -121,10 +125,12 @@ Examples: ...@@ -121,10 +125,12 @@ Examples:
print(out) print(out)
# [0.40131234 0.450166 0.52497919 0.57444252] # [0.40131234 0.450166 0.52497919 0.57444252]
""") """,
)
add_sample_code( add_sample_code(
globals()["silu"], r""" globals()["silu"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -136,10 +142,12 @@ Examples: ...@@ -136,10 +142,12 @@ Examples:
print(out) print(out)
# [ 0.7310586 1.7615942 2.8577224, 3.9280552 ] # [ 0.7310586 1.7615942 2.8577224, 3.9280552 ]
""") """,
)
add_sample_code( add_sample_code(
globals()["logsigmoid"], r""" globals()["logsigmoid"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -151,10 +159,12 @@ Examples: ...@@ -151,10 +159,12 @@ Examples:
print(out) print(out)
# [-0.91301525 -0.79813887 -0.64439666 -0.55435524] # [-0.91301525 -0.79813887 -0.64439666 -0.55435524]
""") """,
)
add_sample_code( add_sample_code(
globals()["exp"], r""" globals()["exp"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -165,10 +175,12 @@ Examples: ...@@ -165,10 +175,12 @@ Examples:
print(out) print(out)
# [0.67032005 0.81873075 1.10517092 1.34985881] # [0.67032005 0.81873075 1.10517092 1.34985881]
""") """,
)
add_sample_code( add_sample_code(
globals()["expm1"], r""" globals()["expm1"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -179,10 +191,12 @@ Examples: ...@@ -179,10 +191,12 @@ Examples:
print(out) print(out)
# [-0.32967997, -0.18126924, 0.10517092, 0.34985882] # [-0.32967997, -0.18126924, 0.10517092, 0.34985882]
""") """,
)
add_sample_code( add_sample_code(
globals()["tanh"], r""" globals()["tanh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -193,10 +207,12 @@ Examples: ...@@ -193,10 +207,12 @@ Examples:
print(out) print(out)
# [-0.37994896 -0.19737532 0.09966799 0.29131261] # [-0.37994896 -0.19737532 0.09966799 0.29131261]
""") """,
)
add_sample_code( add_sample_code(
globals()["atan"], r""" globals()["atan"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -207,10 +223,12 @@ Examples: ...@@ -207,10 +223,12 @@ Examples:
print(out) print(out)
# [-0.38050638 -0.19739556 0.09966865 0.29145679] # [-0.38050638 -0.19739556 0.09966865 0.29145679]
""") """,
)
add_sample_code( add_sample_code(
globals()["tanh_shrink"], r""" globals()["tanh_shrink"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -222,10 +240,12 @@ Examples: ...@@ -222,10 +240,12 @@ Examples:
print(out) print(out)
# [-0.020051, -0.00262468, 0.000332005, 0.00868739] # [-0.020051, -0.00262468, 0.000332005, 0.00868739]
""") """,
)
add_sample_code( add_sample_code(
globals()["sqrt"], r""" globals()["sqrt"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -236,10 +256,12 @@ Examples: ...@@ -236,10 +256,12 @@ Examples:
print(out) print(out)
# [0.31622777 0.4472136 0.54772256 0.63245553] # [0.31622777 0.4472136 0.54772256 0.63245553]
""") """,
)
add_sample_code( add_sample_code(
globals()["rsqrt"], r""" globals()["rsqrt"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -250,10 +272,12 @@ Examples: ...@@ -250,10 +272,12 @@ Examples:
print(out) print(out)
# [3.16227766 2.23606798 1.82574186 1.58113883] # [3.16227766 2.23606798 1.82574186 1.58113883]
""") """,
)
add_sample_code( add_sample_code(
globals()["abs"], r""" globals()["abs"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -264,10 +288,12 @@ Examples: ...@@ -264,10 +288,12 @@ Examples:
print(out) print(out)
# [0.4 0.2 0.1 0.3] # [0.4 0.2 0.1 0.3]
""") """,
)
add_sample_code( add_sample_code(
globals()["ceil"], r""" globals()["ceil"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -278,10 +304,12 @@ Examples: ...@@ -278,10 +304,12 @@ Examples:
print(out) print(out)
# [-0. -0. 1. 1.] # [-0. -0. 1. 1.]
""") """,
)
add_sample_code( add_sample_code(
globals()["floor"], r""" globals()["floor"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -292,10 +320,12 @@ Examples: ...@@ -292,10 +320,12 @@ Examples:
print(out) print(out)
# [-1. -1. 0. 0.] # [-1. -1. 0. 0.]
""") """,
)
add_sample_code( add_sample_code(
globals()["cos"], r""" globals()["cos"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -306,10 +336,12 @@ Examples: ...@@ -306,10 +336,12 @@ Examples:
print(out) print(out)
# [0.92106099 0.98006658 0.99500417 0.95533649] # [0.92106099 0.98006658 0.99500417 0.95533649]
""") """,
)
add_sample_code( add_sample_code(
globals()["tan"], r""" globals()["tan"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -320,10 +352,12 @@ Examples: ...@@ -320,10 +352,12 @@ Examples:
print(out) print(out)
# [-0.42279324, -0.20271005, 0.10033467, 0.30933627] # [-0.42279324, -0.20271005, 0.10033467, 0.30933627]
""") """,
)
add_sample_code( add_sample_code(
globals()["acos"], r""" globals()["acos"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -334,10 +368,12 @@ Examples: ...@@ -334,10 +368,12 @@ Examples:
print(out) print(out)
# [1.98231317 1.77215425 1.47062891 1.26610367] # [1.98231317 1.77215425 1.47062891 1.26610367]
""") """,
)
add_sample_code( add_sample_code(
globals()["sin"], r""" globals()["sin"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -348,10 +384,12 @@ Examples: ...@@ -348,10 +384,12 @@ Examples:
print(out) print(out)
# [-0.38941834 -0.19866933 0.09983342 0.29552021] # [-0.38941834 -0.19866933 0.09983342 0.29552021]
""") """,
)
add_sample_code( add_sample_code(
globals()["asin"], r""" globals()["asin"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -362,10 +400,12 @@ Examples: ...@@ -362,10 +400,12 @@ Examples:
print(out) print(out)
# [-0.41151685 -0.20135792 0.10016742 0.30469265] # [-0.41151685 -0.20135792 0.10016742 0.30469265]
""") """,
)
add_sample_code( add_sample_code(
globals()["cosh"], r""" globals()["cosh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -376,10 +416,12 @@ Examples: ...@@ -376,10 +416,12 @@ Examples:
print(out) print(out)
# [1.08107237 1.02006676 1.00500417 1.04533851] # [1.08107237 1.02006676 1.00500417 1.04533851]
""") """,
)
add_sample_code( add_sample_code(
globals()["sinh"], r""" globals()["sinh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -390,10 +432,12 @@ Examples: ...@@ -390,10 +432,12 @@ Examples:
print(out) print(out)
# [-0.41075233 -0.201336 0.10016675 0.30452029] # [-0.41075233 -0.201336 0.10016675 0.30452029]
""") """,
)
add_sample_code( add_sample_code(
globals()["asinh"], r""" globals()["asinh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -404,10 +448,12 @@ Examples: ...@@ -404,10 +448,12 @@ Examples:
print(out) print(out)
# [-0.39003533, -0.19869010, 0.09983408, 0.29567307] # [-0.39003533, -0.19869010, 0.09983408, 0.29567307]
""") """,
)
add_sample_code( add_sample_code(
globals()["acosh"], r""" globals()["acosh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -418,10 +464,12 @@ Examples: ...@@ -418,10 +464,12 @@ Examples:
print(out) print(out)
# [0. , 1.76274729, 2.06343699, 2.29243159] # [0. , 1.76274729, 2.06343699, 2.29243159]
""") """,
)
add_sample_code( add_sample_code(
globals()["atanh"], r""" globals()["atanh"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -432,10 +480,12 @@ Examples: ...@@ -432,10 +480,12 @@ Examples:
print(out) print(out)
# [-0.42364895, -0.20273256, 0.10033535, 0.30951962] # [-0.42364895, -0.20273256, 0.10033535, 0.30951962]
""") """,
)
add_sample_code( add_sample_code(
globals()["round"], r""" globals()["round"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -446,10 +496,12 @@ Examples: ...@@ -446,10 +496,12 @@ Examples:
print(out) print(out)
# [-1. -0. 1. 2.] # [-1. -0. 1. 2.]
""") """,
)
add_sample_code( add_sample_code(
globals()["reciprocal"], r""" globals()["reciprocal"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -460,10 +512,12 @@ Examples: ...@@ -460,10 +512,12 @@ Examples:
print(out) print(out)
# [-2.5 -5. 10. 3.33333333] # [-2.5 -5. 10. 3.33333333]
""") """,
)
add_sample_code( add_sample_code(
globals()["square"], r""" globals()["square"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -474,10 +528,12 @@ Examples: ...@@ -474,10 +528,12 @@ Examples:
print(out) print(out)
# [0.16 0.04 0.01 0.09] # [0.16 0.04 0.01 0.09]
""") """,
)
add_sample_code( add_sample_code(
globals()["softplus"], r""" globals()["softplus"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -489,10 +545,12 @@ Examples: ...@@ -489,10 +545,12 @@ Examples:
print(out) print(out)
# [0.513015, 0.598139, 0.744397, 0.854355] # [0.513015, 0.598139, 0.744397, 0.854355]
""") """,
)
add_sample_code( add_sample_code(
globals()["softsign"], r""" globals()["softsign"],
r"""
Examples: Examples:
.. code-block:: python .. code-block:: python
...@@ -504,9 +562,8 @@ Examples: ...@@ -504,9 +562,8 @@ Examples:
print(out) print(out)
# [-0.285714, -0.166667, 0.0909091, 0.230769] # [-0.285714, -0.166667, 0.0909091, 0.230769]
""") """,
)
__all__ += ['erf']
_erf_ = generate_layer_fn('erf') _erf_ = generate_layer_fn('erf')
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册