diff --git a/ci_scripts/Dockerfile b/ci_scripts/Dockerfile index 9a1b5cb8ae3..10ef2e64d71 100644 --- a/ci_scripts/Dockerfile +++ b/ci_scripts/Dockerfile @@ -28,7 +28,6 @@ pytest' >requirements && \ RUN echo 'Pillow\n\ numpy\n\ gast==0.3.3\n\ -six\n\ protobuf\n\ urllib3\n\ certifi\n\ diff --git a/ci_scripts/check_api_parameters.py b/ci_scripts/check_api_parameters.py index ab4b557ff74..1e02e9d1fe0 100644 --- a/ci_scripts/check_api_parameters.py +++ b/ci_scripts/check_api_parameters.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import json import argparse import os.path as osp @@ -51,8 +50,11 @@ def parse_args(): parser = argparse.ArgumentParser(description='check api parameters') parser.add_argument('--debug', dest='debug', action="store_true") for item in arguments: - parser.add_argument( - item[0], dest=item[1], help=item[4], type=item[2], default=item[3]) + parser.add_argument(item[0], + dest=item[1], + help=item[4], + type=item[2], + default=item[3]) args = parser.parse_args() return args diff --git a/ci_scripts/check_pr_approval.py b/ci_scripts/check_pr_approval.py index 937b0be7562..cb8e5df571a 100644 --- a/ci_scripts/check_pr_approval.py +++ b/ci_scripts/check_pr_approval.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function import sys import json diff --git a/docs/api/paddle/static/Program_cn.rst b/docs/api/paddle/static/Program_cn.rst index e81e60e2b34..0d1ca36c986 100644 --- a/docs/api/paddle/static/Program_cn.rst +++ b/docs/api/paddle/static/Program_cn.rst @@ -122,16 +122,14 @@ Program,当 ``for_test=True`` 时返回一个新的、仅包含当前 Program .. code-block:: python - import six - def print_prog(prog): - for name, value in sorted(six.iteritems(prog.block(0).vars)): + for name, value in sorted(prog.block(0).vars.items()): print(value) for op in prog.block(0).ops: print("op type is {}".format(op.type)) print("op inputs are {}".format(op.input_arg_names)) print("op outputs are {}".format(op.output_arg_names)) - for key, value in sorted(six.iteritems(op.all_attrs())): + for key, value in sorted(op.all_attrs().items()): if key not in ['op_callstack', 'op_role_var']: print(" [ attrs: {}: {} ]".format(key, value)) @@ -139,7 +137,6 @@ Program,当 ``for_test=True`` 时返回一个新的、仅包含当前 Program .. code-block:: python - import six import paddle import paddle.static as static import paddle.utils as utils @@ -148,13 +145,13 @@ Program,当 ``for_test=True`` 时返回一个新的、仅包含当前 Program paddle.enable_static() def print_prog(prog): - for name, value in sorted(six.iteritems(prog.block(0).vars)): + for name, value in sorted(prog.block(0).vars.items()): print(value) for op in prog.block(0).ops: print("op type is {}".format(op.type)) print("op inputs are {}".format(op.input_arg_names)) print("op outputs are {}".format(op.output_arg_names)) - for key, value in sorted(six.iteritems(op.all_attrs())): + for key, value in sorted(op.all_attrs().items()): if key not in ['op_callstack', 'op_role_var']: print(" [ attrs: {}: {} ]".format(key, value)) @@ -192,7 +189,6 @@ Program,当 ``for_test=True`` 时返回一个新的、仅包含当前 Program .. code-block:: python - import six import paddle import paddle.static as static import paddle.utils as utils @@ -201,13 +197,13 @@ Program,当 ``for_test=True`` 时返回一个新的、仅包含当前 Program paddle.enable_static() def print_prog(prog): - for name, value in sorted(six.iteritems(prog.block(0).vars)): + for name, value in sorted(prog.block(0).vars.items()): print(value) for op in prog.block(0).ops: print("op type is {}".format(op.type)) print("op inputs are {}".format(op.input_arg_names)) print("op outputs are {}".format(op.output_arg_names)) - for key, value in sorted(six.iteritems(op.all_attrs())): + for key, value in sorted(op.all_attrs().items()): if key not in ['op_callstack', 'op_role_var']: print(" [ attrs: {}: {} ]".format(key, value)) diff --git a/docs/api/paddle/static/nn/multi_box_head_cn.rst b/docs/api/paddle/static/nn/multi_box_head_cn.rst index f21c51a3b35..ac969be6456 100644 --- a/docs/api/paddle/static/nn/multi_box_head_cn.rst +++ b/docs/api/paddle/static/nn/multi_box_head_cn.rst @@ -25,7 +25,7 @@ multi_box_head min_sizes = [] max_sizes = [] step = int(math.floor(((max_ratio - min_ratio)) / (num_layer - 2))) - for ratio in six.moves.range(min_ratio, max_ratio + 1, step): + for ratio in range(min_ratio, max_ratio + 1, step): min_sizes.append(base_size * ratio / 100.) max_sizes.append(base_size * (ratio + step) / 100.) min_sizes = [base_size * .10] + min_sizes diff --git a/docs/api/paddle/static/py_func_cn.rst b/docs/api/paddle/static/py_func_cn.rst index 2e30b545ff5..4cfe4513152 100644 --- a/docs/api/paddle/static/py_func_cn.rst +++ b/docs/api/paddle/static/py_func_cn.rst @@ -40,7 +40,6 @@ Tensor|tuple(Tensor)|list[Tensor],前向函数的输出 ``out`` .. code-block:: python import paddle - import six import numpy as np paddle.enable_static() @@ -64,7 +63,7 @@ Tensor|tuple(Tensor)|list[Tensor],前向函数的输出 ``out`` def simple_net(img, label): hidden = img - for idx in six.moves.range(4): + for idx in range(4): hidden = paddle.static.nn.fc(hidden, size=200) new_hidden = create_tmp_var(name='hidden_{}'.format(idx), dtype=hidden.dtype, shape=hidden.shape) diff --git a/docs/guides/06_distributed_training/cluster_quick_start_en.rst b/docs/guides/06_distributed_training/cluster_quick_start_en.rst index f5eb67e6a3c..557c674ba19 100644 --- a/docs/guides/06_distributed_training/cluster_quick_start_en.rst +++ b/docs/guides/06_distributed_training/cluster_quick_start_en.rst @@ -33,7 +33,6 @@ tasks through different startup commands. .. code-block:: python - from __future__ import print_function from args import parse_args import os import sys diff --git a/docs/guides/model_convert/update_cn.md b/docs/guides/model_convert/update_cn.md index e8846b67606..cc3bf9bfc12 100644 --- a/docs/guides/model_convert/update_cn.md +++ b/docs/guides/model_convert/update_cn.md @@ -367,8 +367,6 @@ $ python -m paddle.distributed.launch train.py launch 方式启动训练,以文件为单位启动多进程,需要在启动时调用 ``paddle.distributed.launch`` ,对于进程的管理要求较高。飞桨框架 2.0 版本增加了 ``spawn`` 启动方式,可以更好地控制进程,在日志打印、训练退出时更友好。使用示例如下: ```python -from __future__ import print_function - import paddle import paddle.nn as nn import paddle.optimizer as opt diff --git a/docs/guides/model_convert/update_en.md b/docs/guides/model_convert/update_en.md index 34d82d18913..7d0ce2a3d5e 100644 --- a/docs/guides/model_convert/update_en.md +++ b/docs/guides/model_convert/update_en.md @@ -368,8 +368,6 @@ $ python -m paddle.distributed.launch train.py Launch method need to start multiple processes as a file. You need to call ``paddle.distributed.launch`` at launch time with a higher process management requirements. PaddlePaddle framework 2.0 added ``spawn`` launch method, for better controlling the process and more friendly in the log printing and training exit. Usage examples are as follows. ```python -from __future__ import print_function - import paddle import paddle.nn as nn import paddle.optimizer as opt @@ -435,8 +433,6 @@ if __name__ == '__main__': # {0,1,2,3,4,5,6,7}, but you do not have the right to configure CUDA_VISIBLE_DEVICES, then you can # Specify the parameter selected_gpus to select the card you wish to use, e.g. selected_gpus='4,5'. # You can specify the use of card #4 and card #5 - -Translated with www.DeepL.com/Translator (free version) if __name__ == '__main__': dist.spawn(train, nprocs=2, selected_gpus='4,5') diff --git a/docs/install/FAQ.md b/docs/install/FAQ.md index 0cc2ecf46ac..2b3bb22f7b1 100644 --- a/docs/install/FAQ.md +++ b/docs/install/FAQ.md @@ -5,10 +5,6 @@ > 请[安装 nccl2](https://developer.nvidia.com/nccl/nccl-download) -- 报错`Cannot uninstall 'six'.` - - > 此问题可能与系统中已有 Python 有关,请使用`pip install paddlepaddle --ignore-installed six`(CPU)或`pip install paddlepaddle --ignore-installed six`(GPU)解决 - - CentOS6 下如何编译 python2.7 为共享库? > 使用以下指令: diff --git a/docs/practices/gan/dcgan_face/dcgan_face.ipynb b/docs/practices/gan/dcgan_face/dcgan_face.ipynb index 81f5d9cb691..a9b1da91c94 100644 --- a/docs/practices/gan/dcgan_face/dcgan_face.ipynb +++ b/docs/practices/gan/dcgan_face/dcgan_face.ipynb @@ -201,7 +201,6 @@ "import time\n", "import paddle\n", "from paddle.io import Dataset\n", - "import six\n", "from PIL import Image as PilImage\n", "from paddle.static import InputSpec\n", "paddle.enable_static()\n",