diff --git a/paddle/fluid/inference/tests/api/full_pascalvoc_test_preprocess.py b/paddle/fluid/inference/tests/api/full_pascalvoc_test_preprocess.py index a8671be62f24a..74739530b4724 100644 --- a/paddle/fluid/inference/tests/api/full_pascalvoc_test_preprocess.py +++ b/paddle/fluid/inference/tests/api/full_pascalvoc_test_preprocess.py @@ -19,7 +19,7 @@ import sys from paddle.dataset.common import download import tarfile -from six.moves import StringIO +from io import StringIO import hashlib import tarfile import argparse diff --git a/python/paddle/dataset/cifar.py b/python/paddle/dataset/cifar.py index 579422887fe84..0a05ecde4738a 100644 --- a/python/paddle/dataset/cifar.py +++ b/python/paddle/dataset/cifar.py @@ -31,8 +31,7 @@ import paddle.dataset.common import paddle.utils.deprecated as deprecated import tarfile -import six -from six.moves import cPickle as pickle +import pickle __all__ = [] @@ -46,11 +45,10 @@ def reader_creator(filename, sub_name, cycle=False): def read_batch(batch): - data = batch[six.b('data')] - labels = batch.get(six.b('labels'), batch.get(six.b('fine_labels'), - None)) + data = batch[b'data'] + labels = batch.get(b'labels', batch.get(b'fine_labels', None)) assert labels is not None - for sample, label in six.moves.zip(data, labels): + for sample, label in zip(data, labels): yield (sample / 255.0).astype(numpy.float32), int(label) def reader(): diff --git a/python/paddle/dataset/common.py b/python/paddle/dataset/common.py index a7aa2716917fd..b8004be3a41b5 100644 --- a/python/paddle/dataset/common.py +++ b/python/paddle/dataset/common.py @@ -20,7 +20,7 @@ import sys import importlib import paddle.dataset -import six.moves.cPickle as pickle +import pickle import tempfile import glob import paddle diff --git a/python/paddle/dataset/conll05.py b/python/paddle/dataset/conll05.py index 0ffdce8ae8cb0..9333d7350e8c6 100644 --- a/python/paddle/dataset/conll05.py +++ b/python/paddle/dataset/conll05.py @@ -24,7 +24,6 @@ import gzip import paddle.dataset.common import paddle.utils.deprecated as deprecated -from six.moves import zip, range __all__ = [] diff --git a/python/paddle/dataset/image.py b/python/paddle/dataset/image.py index 1251b998a0c3e..98ad9299c1b08 100644 --- a/python/paddle/dataset/image.py +++ b/python/paddle/dataset/image.py @@ -30,39 +30,34 @@ be keep consistent between the training and inference period. """ -import six import numpy as np # FIXME(minqiyang): this is an ugly fix for the numpy bug reported here # https://github.com/numpy/numpy/issues/12497 -if six.PY3: - import subprocess - import sys - import os - interpreter = sys.executable - # Note(zhouwei): if use Python/C 'PyRun_SimpleString', 'sys.executable' - # will be the C++ execubable on Windows - if sys.platform == 'win32' and 'python.exe' not in interpreter: - interpreter = sys.exec_prefix + os.sep + 'python.exe' - import_cv2_proc = subprocess.Popen([interpreter, "-c", "import cv2"], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - out, err = import_cv2_proc.communicate() - retcode = import_cv2_proc.poll() - if retcode != 0: - cv2 = None - else: - try: - import cv2 - except ImportError: - cv2 = None +import subprocess +import sys +import os + +interpreter = sys.executable +# Note(zhouwei): if use Python/C 'PyRun_SimpleString', 'sys.executable' +# will be the C++ execubable on Windows +if sys.platform == 'win32' and 'python.exe' not in interpreter: + interpreter = sys.exec_prefix + os.sep + 'python.exe' +import_cv2_proc = subprocess.Popen([interpreter, "-c", "import cv2"], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) +out, err = import_cv2_proc.communicate() +retcode = import_cv2_proc.poll() +if retcode != 0: + cv2 = None else: try: import cv2 except ImportError: cv2 = None + import os import tarfile -import six.moves.cPickle as pickle +import pickle __all__ = [] diff --git a/python/paddle/dataset/imdb.py b/python/paddle/dataset/imdb.py index 178a74c3d6fbe..bed7f03090bf9 100644 --- a/python/paddle/dataset/imdb.py +++ b/python/paddle/dataset/imdb.py @@ -26,7 +26,6 @@ import tarfile import re import string -import six __all__ = [] @@ -49,9 +48,8 @@ def tokenize(pattern): while tf != None: if bool(pattern.match(tf.name)): # newline and punctuations removal and ad-hoc tokenization. - yield tarf.extractfile(tf).read().rstrip( - six.b("\n\r")).translate(None, six.b( - string.punctuation)).lower().split() + yield tarf.extractfile(tf).read().rstrip(b'\n\r').translate( + None, string.punctuation.encode('latin-1')).lower().split() tf = tarf.next() @@ -66,11 +64,11 @@ def build_dict(pattern, cutoff): word_freq[word] += 1 # Not sure if we should prune less-frequent words here. - word_freq = [x for x in six.iteritems(word_freq) if x[1] > cutoff] + word_freq = [x for x in word_freq.items() if x[1] > cutoff] dictionary = sorted(word_freq, key=lambda x: (-x[1], x[0])) words, _ = list(zip(*dictionary)) - word_idx = dict(list(zip(words, six.moves.range(len(words))))) + word_idx = dict(list(zip(words, range(len(words))))) word_idx[''] = len(words) return word_idx diff --git a/python/paddle/dataset/imikolov.py b/python/paddle/dataset/imikolov.py index 55babd314cdce..b94513ec13afe 100644 --- a/python/paddle/dataset/imikolov.py +++ b/python/paddle/dataset/imikolov.py @@ -23,7 +23,6 @@ import paddle.utils.deprecated as deprecated import collections import tarfile -import six __all__ = [] @@ -68,13 +67,11 @@ def build_dict(min_word_freq=50): # remove for now, since we will set it as last index del word_freq[''] - word_freq = [ - x for x in six.iteritems(word_freq) if x[1] > min_word_freq - ] + word_freq = [x for x in word_freq.items() if x[1] > min_word_freq] word_freq_sorted = sorted(word_freq, key=lambda x: (-x[1], x[0])) words, _ = list(zip(*word_freq_sorted)) - word_idx = dict(list(zip(words, six.moves.range(len(words))))) + word_idx = dict(list(zip(words, range(len(words))))) word_idx[''] = len(words) return word_idx @@ -96,7 +93,7 @@ def reader(): l = [''] + l.strip().split() + [''] if len(l) >= n: l = [word_idx.get(w, UNK) for w in l] - for i in six.moves.range(n, len(l) + 1): + for i in range(n, len(l) + 1): yield tuple(l[i - n:i]) elif DataType.SEQ == data_type: l = l.strip().split() diff --git a/python/paddle/dataset/mnist.py b/python/paddle/dataset/mnist.py index 544ffb0ebb288..12f03dd837d45 100644 --- a/python/paddle/dataset/mnist.py +++ b/python/paddle/dataset/mnist.py @@ -23,7 +23,6 @@ import gzip import numpy import struct -from six.moves import range __all__ = [] diff --git a/python/paddle/dataset/movielens.py b/python/paddle/dataset/movielens.py index db07525d31130..513e5d2a5d65e 100644 --- a/python/paddle/dataset/movielens.py +++ b/python/paddle/dataset/movielens.py @@ -28,7 +28,6 @@ import paddle.utils.deprecated as deprecated import re import functools -import six __all__ = [] @@ -206,7 +205,7 @@ def max_movie_id(): Get the maximum value of movie id. """ __initialize_meta_info__() - return six.moves.reduce(__max_index_info__, list(MOVIE_INFO.values())).index + return functools.reduce(__max_index_info__, list(MOVIE_INFO.values())).index @deprecated( @@ -219,7 +218,7 @@ def max_user_id(): Get the maximum value of user id. """ __initialize_meta_info__() - return six.moves.reduce(__max_index_info__, list(USER_INFO.values())).index + return functools.reduce(__max_index_info__, list(USER_INFO.values())).index def __max_job_id_impl__(a, b): @@ -239,7 +238,7 @@ def max_job_id(): Get the maximum value of job id. """ __initialize_meta_info__() - return six.moves.reduce(__max_job_id_impl__, + return functools.reduce(__max_job_id_impl__, list(USER_INFO.values())).job_id diff --git a/python/paddle/dataset/uci_housing.py b/python/paddle/dataset/uci_housing.py index 8fc4dda80c055..66c6ab3c47989 100644 --- a/python/paddle/dataset/uci_housing.py +++ b/python/paddle/dataset/uci_housing.py @@ -20,7 +20,6 @@ """ import numpy as np -import six import tempfile import tarfile import os @@ -75,7 +74,7 @@ def load_data(filename, feature_num=14, ratio=0.8): axis=0), data.sum(axis=0) / data.shape[0] # if you want to print the distribution of input data, you could use function of feature_range #feature_range(maximums[:-1], minimums[:-1]) - for i in six.moves.range(feature_num - 1): + for i in range(feature_num - 1): data[:, i] = (data[:, i] - avgs[i]) / (maximums[i] - minimums[i]) offset = int(data.shape[0] * ratio) UCI_TRAIN_DATA = data[:offset] diff --git a/python/paddle/dataset/wmt14.py b/python/paddle/dataset/wmt14.py index 0007bc2770d48..33ad05c36d019 100644 --- a/python/paddle/dataset/wmt14.py +++ b/python/paddle/dataset/wmt14.py @@ -20,7 +20,6 @@ """ -import six import tarfile import paddle.dataset.common @@ -173,8 +172,8 @@ def get_dict(dict_size, reverse=True): tar_file = paddle.dataset.common.download(URL_TRAIN, 'wmt14', MD5_TRAIN) src_dict, trg_dict = __read_to_dict(tar_file, dict_size) if reverse: - src_dict = {v: k for k, v in six.iteritems(src_dict)} - trg_dict = {v: k for k, v in six.iteritems(trg_dict)} + src_dict = {v: k for k, v in src_dict.items()} + trg_dict = {v: k for k, v in trg_dict.items()} return src_dict, trg_dict diff --git a/python/paddle/dataset/wmt16.py b/python/paddle/dataset/wmt16.py index e208f342490c3..f5a97172a7d82 100644 --- a/python/paddle/dataset/wmt16.py +++ b/python/paddle/dataset/wmt16.py @@ -29,7 +29,6 @@ """ import os -import six import tarfile from collections import defaultdict @@ -63,9 +62,7 @@ def __build_dict(tar_file, dict_size, save_path, lang): with open(save_path, "wb") as fout: fout.write(("%s\n%s\n%s\n" % (START_MARK, END_MARK, UNK_MARK)).encode()) for idx, word in enumerate( - sorted(six.iteritems(word_dict), - key=lambda x: x[1], - reverse=True)): + sorted(word_dict.items(), key=lambda x: x[1], reverse=True)): if idx + 3 == dict_size: break fout.write(word[0].encode()) fout.write(b'\n') diff --git a/python/paddle/distributed/elastic.py b/python/paddle/distributed/elastic.py index 933550b75ad5b..b13eb07ee28c0 100644 --- a/python/paddle/distributed/elastic.py +++ b/python/paddle/distributed/elastic.py @@ -13,7 +13,6 @@ # limitations under the License. import argparse -import six import os @@ -30,7 +29,7 @@ def __init__(self, server, name): self.np_path = self.prefix + '/np' def set_np(self, np): - self.etcd.put(self.np_path, six.b('{}'.format(np))) + self.etcd.put(self.np_path, '{}'.format(np).encode('latin-1')) def scale_np(self, np): if self.etcd.get(self.np_path)[0] != None: diff --git a/python/paddle/distributed/fleet/elastic/manager.py b/python/paddle/distributed/fleet/elastic/manager.py index d03bbde89b3f4..84cf95742e309 100644 --- a/python/paddle/distributed/fleet/elastic/manager.py +++ b/python/paddle/distributed/fleet/elastic/manager.py @@ -262,7 +262,7 @@ def lease_heartbeat(): logger.info( f"[lease_heartbeat] register host={self.curr_host}") self.etcd.put(self.host_path, - six.b(self.curr_host), + self.curr_host.encode('latin-1'), lease=host_lease) except Exception as e: logger.error( @@ -276,11 +276,15 @@ def lease_heartbeat(): daemon=True) keepalived_thread.start() - self.etcd.put(self.host_path, six.b(self.curr_host), lease=host_lease) + self.etcd.put(self.host_path, + self.curr_host.encode('latin-1'), + lease=host_lease) # endpoints handle DISTRIBUTED_TRAINER_ENDPOINTS and PADDLE_TRAINERS - self.etcd.put(self.endpoints_path, - six.b('{}|{}'.format(self.dist_endpoints, self.trainers))) + self.etcd.put( + self.endpoints_path, + '{}|{}'.format(self.dist_endpoints, + self.trainers).encode('latin-1')) def endpoints_call_back(event): if not self.dist_endpoints: @@ -433,7 +437,7 @@ def _match(self, host_list: list = None): def _update_endpoint(self, endpoints, hosts): self.etcd.put(self.endpoints_path, - six.b('{}|{}'.format(endpoints, hosts))) + '{}|{}'.format(endpoints, hosts).encode('latin-1')) def _update_fault_tolrance(self): rank = int(os.getenv('PADDLE_TRAINER_ID', -1)) diff --git a/python/paddle/distributed/fleet/launch.py b/python/paddle/distributed/fleet/launch.py index 98919fe241445..d8d754e7fbad4 100755 --- a/python/paddle/distributed/fleet/launch.py +++ b/python/paddle/distributed/fleet/launch.py @@ -59,7 +59,6 @@ import tempfile import os import time -import six import copy import pathlib from argparse import ArgumentParser, REMAINDER @@ -78,7 +77,7 @@ def _print_arguments(args): print("----------- Configuration Arguments -----------") - for arg, value in sorted(six.iteritems(vars(args))): + for arg, value in sorted(vars(args).items()): print("%s: %s" % (arg, value)) print("------------------------------------------------") diff --git a/python/paddle/distributed/fleet/launch_utils.py b/python/paddle/distributed/fleet/launch_utils.py index d0559809730b1..d29741cbef605 100755 --- a/python/paddle/distributed/fleet/launch_utils.py +++ b/python/paddle/distributed/fleet/launch_utils.py @@ -24,7 +24,6 @@ from contextlib import closing import multiprocessing import socket -import six import struct import json @@ -835,9 +834,7 @@ def get_device_proc_info(args): "gpus' number:{} mod args.nproc_per_node:{} must == 0".format(len(gpus), args.nproc_per_node) n = int(len(gpus) / int(args.nproc_per_node)) - devices_per_proc = [ - gpus[i:i + n] for i in six.moves.range(0, len(gpus), n) - ] + devices_per_proc = [gpus[i:i + n] for i in range(0, len(gpus), n)] else: devices_per_proc = gpus elif device_mode == DeviceMode.ASCEND_NPU: @@ -847,9 +844,7 @@ def get_device_proc_info(args): "npus' number:{} mod args.nproc_per_node:{} must == 0".format(len(npus), args.nproc_per_node) n = int(len(npus) / int(args.nproc_per_node)) - devices_per_proc = [ - npus[i:i + n] for i in six.moves.range(0, len(npus), n) - ] + devices_per_proc = [npus[i:i + n] for i in range(0, len(npus), n)] else: devices_per_proc = npus elif device_mode == DeviceMode.XPU: @@ -859,9 +854,7 @@ def get_device_proc_info(args): "xpus' number:{} mod args.nproc_per_node:{} must == 0".format(len(xpus), args.nproc_per_node) n = int(len(xpus) / int(args.nproc_per_node)) - devices_per_proc = [ - xpus[i:i + n] for i in six.moves.range(0, len(xpus), n) - ] + devices_per_proc = [xpus[i:i + n] for i in range(0, len(xpus), n)] else: devices_per_proc = xpus elif device_mode == DeviceMode.MLU: @@ -871,9 +864,7 @@ def get_device_proc_info(args): "mlus' number:{} mod args.nproc_per_node:{} must == 0".format(len(mlus), args.nproc_per_node) n = int(len(mlus) / int(args.nproc_per_node)) - devices_per_proc = [ - mlus[i:i + n] for i in six.moves.range(0, len(mlus), n) - ] + devices_per_proc = [mlus[i:i + n] for i in range(0, len(mlus), n)] else: devices_per_proc = mlus elif device_mode == DeviceMode.CPU: diff --git a/python/paddle/distributed/fleet/utils/fs.py b/python/paddle/distributed/fleet/utils/fs.py index 6181376521ea8..cf0a6475d0e57 100644 --- a/python/paddle/distributed/fleet/utils/fs.py +++ b/python/paddle/distributed/fleet/utils/fs.py @@ -17,7 +17,6 @@ import re import time -import six import abc from paddle.fluid import core import functools @@ -456,7 +455,7 @@ def __init__( self.pre_commands.append(dfs) if configs: - for k, v in six.iteritems(configs): + for k, v in configs.items(): config_command = '-D%s=%s' % (k, v) self.pre_commands.append(config_command) diff --git a/python/paddle/distributed/launch/context/__init__.py b/python/paddle/distributed/launch/context/__init__.py index b067973d3749d..9936b534edfcd 100644 --- a/python/paddle/distributed/launch/context/__init__.py +++ b/python/paddle/distributed/launch/context/__init__.py @@ -17,7 +17,6 @@ from .node import Node from .status import Status from .args_envs import parse_args, fetch_envs, env_args_mapping -import six import logging @@ -43,7 +42,7 @@ def __init__(self, enable_plugin=True): def print(self): self.logger.info("----------- Configuration ----------------------") - for arg, value in sorted(six.iteritems(vars(self.args))): + for arg, value in sorted(vars(self.args).items()): self.logger.info("%s: %s" % (arg, value)) self.logger.info("--------------------------------------------------") diff --git a/python/paddle/distributed/launch/controllers/master.py b/python/paddle/distributed/launch/controllers/master.py index c71d0890f196a..da240ceffa9f3 100644 --- a/python/paddle/distributed/launch/controllers/master.py +++ b/python/paddle/distributed/launch/controllers/master.py @@ -204,7 +204,7 @@ def sync_peers(self, prefix, key, value, size, rank=-1) -> (list, int): self.ctx.logger.debug("sync path {} value {}".format(path, value)) while not self.ctx.status.is_done(): - self.client.put(path, six.b(value)) + self.client.put(path, value.encode('latin-1')) result = [i for i in self.client.get_prefix(prefix)] result = copy.deepcopy(result) @@ -244,7 +244,7 @@ def register_heartbeat(self, job_id, pod_id, ttl=10): #self.client.delete_prefix(self.job_prefix) beat_path = "{}/{}".format(self.heartbeat_prefix, pod_id) - self.client.put(beat_path, six.b(pod_id), lease=lease) + self.client.put(beat_path, pod_id.encode('latin-1'), lease=lease) def _beat_watch(event): self.ctx.status.restart() @@ -257,7 +257,9 @@ def _heartbeat(): try: lease.refresh() if pod_id not in self.fetch_peer_alive(): - self.client.put(beat_path, six.b(pod_id), lease=lease) + self.client.put(beat_path, + pod_id.encode('latin-1'), + lease=lease) self.ctx.logger.debug("Heartbeat register again") except Exception as e: self.ctx.logger.error("Heartbeat error {}".format(e)) @@ -307,7 +309,8 @@ def restart_peer(self): def set_status(self, status): assert self.client.put( - self.job_prefix, six.b(status), + self.job_prefix, + status.encode('latin-1'), lease=self.client.lease(600)), "set status failed {}".format(status) def get_status(self): diff --git a/python/paddle/distributed/launch/plugins/__init__.py b/python/paddle/distributed/launch/plugins/__init__.py index c82fa55de430a..91a2dee09a3b8 100644 --- a/python/paddle/distributed/launch/plugins/__init__.py +++ b/python/paddle/distributed/launch/plugins/__init__.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import os __all__ = [] @@ -21,7 +20,7 @@ # print configuration after args are well filled in controller init def log(ctx): ctx.logger.info("----------- Configuration ----------------------") - for arg, value in sorted(six.iteritems(vars(ctx.args))): + for arg, value in sorted(vars(ctx.args).items()): ctx.logger.info("%s: %s" % (arg, value)) ctx.logger.info("--------------------------------------------------") diff --git a/python/paddle/distributed/ps/utils/public.py b/python/paddle/distributed/ps/utils/public.py index 9ecdd15442d36..c5835c730eeb3 100755 --- a/python/paddle/distributed/ps/utils/public.py +++ b/python/paddle/distributed/ps/utils/public.py @@ -18,7 +18,6 @@ import os import warnings import logging -import six import paddle.fluid as fluid from paddle.fluid import core import paddle.fluid.framework as framework @@ -1029,7 +1028,7 @@ def _get_output_map_from_op(varmap, op): def get_varlist_from_op_map(var_map): var_list = [] - for key, varlist in six.iteritems(var_map): + for key, varlist in var_map.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): @@ -1079,7 +1078,7 @@ def block_append_op(program, origin_program, block, op): merge_ordereddict = origin_program.global_block().vars.copy() merge_ordereddict.update(block.vars) inputs = _get_input_map_from_op(merge_ordereddict, op) - for key, varlist in six.iteritems(inputs): + for key, varlist in inputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: @@ -1092,7 +1091,7 @@ def block_append_op(program, origin_program, block, op): block._clone_variable(var, force_persistable=False) outputs = _get_output_map_from_op(origin_program.global_block().vars, op) - for key, varlist in six.iteritems(outputs): + for key, varlist in outputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: diff --git a/python/paddle/distributed/spawn.py b/python/paddle/distributed/spawn.py index 2e998b58cc533..7deebdf549eba 100644 --- a/python/paddle/distributed/spawn.py +++ b/python/paddle/distributed/spawn.py @@ -15,7 +15,6 @@ import multiprocessing import os import signal -import six import sys import warnings @@ -171,7 +170,7 @@ def _get_subprocess_env_list(nprocs, options): env_devices = os.getenv("CUDA_VISIBLE_DEVICES", None) if env_devices is None or env_devices == "": env_devices_list = [ - str(x) for x in six.moves.range(core.get_cuda_device_count()) + str(x) for x in range(core.get_cuda_device_count()) ] else: env_devices_list = env_devices.split(',') @@ -206,7 +205,7 @@ def _get_subprocess_env_list(nprocs, options): env_devices = os.getenv("XPU_VISIBLE_DEVICES", None) if env_devices is None or env_devices == "": env_devices_list = [ - str(x) for x in six.moves.range(core.get_xpu_device_count()) + str(x) for x in range(core.get_xpu_device_count()) ] else: env_devices_list = env_devices.split(',') @@ -240,7 +239,7 @@ def _get_subprocess_env_list(nprocs, options): env_devices = os.getenv("MLU_VISIBLE_DEVICES", None) if env_devices is None or env_devices == "": env_devices_list = [ - str(x) for x in six.moves.range(core.get_mlu_device_count()) + str(x) for x in range(core.get_mlu_device_count()) ] else: env_devices_list = env_devices.split(',') diff --git a/python/paddle/distributed/utils/launch_utils.py b/python/paddle/distributed/utils/launch_utils.py index 223414a8f8bd6..a542523e60536 100644 --- a/python/paddle/distributed/utils/launch_utils.py +++ b/python/paddle/distributed/utils/launch_utils.py @@ -21,7 +21,6 @@ from contextlib import closing import socket from distutils.util import strtobool -import six from paddle.distributed.fleet.launch_utils import get_backend_by_compile_flag from ..utils.log_utils import get_logger @@ -542,6 +541,6 @@ def watch_local_trainers(procs, nranks): def _print_arguments(args): print("----------- Configuration Arguments -----------") - for arg, value in sorted(six.iteritems(vars(args))): + for arg, value in sorted(vars(args).items()): print("%s: %s" % (arg, value)) print("------------------------------------------------") diff --git a/python/paddle/fluid/backward.py b/python/paddle/fluid/backward.py index c1d82f0be31e7..8da8faeefb119 100755 --- a/python/paddle/fluid/backward.py +++ b/python/paddle/fluid/backward.py @@ -19,7 +19,6 @@ from . import core import collections import copy -import six import logging from .. import compat as cpt from . import unique_name @@ -337,20 +336,18 @@ def _create_op_desc_(op_type, inputs, outputs, attrs): """ op_desc = core.OpDesc() op_desc.set_type(op_type) - for para, args in six.iteritems(inputs): + for para, args in inputs.items(): op_desc.set_input( para, list( - map( - lambda arg: arg.decode() - if isinstance(arg, six.binary_type) else arg, args))) - for para, args in six.iteritems(outputs): + map(lambda arg: arg.decode() + if isinstance(arg, bytes) else arg, args))) + for para, args in outputs.items(): op_desc.set_output( para, list( - map( - lambda arg: arg.decode() - if isinstance(arg, six.binary_type) else arg, args))) + map(lambda arg: arg.decode() + if isinstance(arg, bytes) else arg, args))) op_role_attr_name = core.op_proto_and_checker_maker.kOpRoleAttrName() op_device_attr_name = core.op_proto_and_checker_maker.kOpDeviceAttrName() @@ -360,7 +357,7 @@ def _create_op_desc_(op_type, inputs, outputs, attrs): op_role_attr_name] = core.op_proto_and_checker_maker.OpRole.Backward if op_device_attr_name not in attrs: attrs[op_device_attr_name] = "" - for name, val in six.iteritems(attrs): + for name, val in attrs.items(): if isinstance(val, framework.Block): op_desc.set_block_attr(name, val.desc) else: @@ -604,7 +601,7 @@ def _addup_repetitive_outputs_(op_descs, # record the latest device var_device[var_name] = op_device - for var_name, inputs in six.iteritems(renamed_vars): + for var_name, inputs in renamed_vars.items(): if len(renamed_vars[var_name]) > 1: if len(renamed_vars[var_name]) > _MAX_ADD_NUM_: _accumulate_gradients_by_sum_op_(var_name, renamed_vars, @@ -823,7 +820,7 @@ def _create_op_node(op_desc): def serialize_op_decs(op_desc): protostr = op_desc.serialize_to_string() - proto = framework_pb2.OpDesc.FromString(six.binary_type(protostr)) + proto = framework_pb2.OpDesc.FromString(bytes(protostr)) return proto.__str__() @@ -1375,9 +1372,9 @@ def _find_parent_op_(sub_block): return None program = sub_block.program - for block_id in six.moves.range(program.num_blocks): + for block_id in range(program.num_blocks): block_desc = program.block(block_id).desc - for op_idx in six.moves.range(block_desc.op_size()): + for op_idx in range(block_desc.op_size()): op = block_desc.op(op_idx) if op.has_attr("sub_block") and op._block_attr_id( "sub_block") == sub_block_id: @@ -1510,7 +1507,7 @@ def _rename_grad_(block, start_op_idx, grad_to_var, target_grad_map): op_desc._rename_output(name, new_name) var_map[name] = new_name - for g, ng in six.iteritems(var_map): + for g, ng in var_map.items(): if g in grad_to_var: grad_to_var[ng] = grad_to_var[g] grad_to_var.pop(g) @@ -1548,7 +1545,7 @@ def _get_no_grad_set_name(no_grad_set): for i, no_grad_var in enumerate(no_grad_set): if isinstance(no_grad_var, framework.Variable): no_grad_set_name.add(no_grad_var.name) - elif isinstance(no_grad_var, six.string_types): + elif isinstance(no_grad_var, str): no_grad_set_name.add(no_grad_var) else: raise TypeError( @@ -1825,11 +1822,11 @@ def append_backward(loss, parameters = [] for i, param in enumerate(parameter_list): check_type(param, 'parameter_list[%s]' % i, - (framework.Variable, six.string_types), + (framework.Variable, str), 'fluid.backward.append_backward') if isinstance(param, framework.Variable): parameters.append(param.name) - elif isinstance(param, six.string_types): + elif isinstance(param, str): parameters.append(param) else: params = program.global_block().all_parameters() diff --git a/python/paddle/fluid/clip.py b/python/paddle/fluid/clip.py index e9e3645852603..fd5c457946884 100644 --- a/python/paddle/fluid/clip.py +++ b/python/paddle/fluid/clip.py @@ -13,7 +13,6 @@ # limitations under the License. import copy -import six import warnings import functools @@ -829,7 +828,7 @@ def network(): if param_list is None: param_list = program.block(0).all_parameters() - if all(isinstance(elem, six.string_types) for elem in param_list): + if all(isinstance(elem, str) for elem in param_list): param_list = [program.block(0).var(elem) for elem in param_list] if not all(isinstance(elem, framework.Parameter) for elem in param_list): raise TypeError( diff --git a/python/paddle/fluid/compiler.py b/python/paddle/fluid/compiler.py index 82a58713f28fc..7ac8e4c30ab69 100644 --- a/python/paddle/fluid/compiler.py +++ b/python/paddle/fluid/compiler.py @@ -14,7 +14,6 @@ import multiprocessing import os -import six import sys import warnings from . import framework @@ -430,11 +429,11 @@ def _compile_data_parallel(self, places, use_device, scope=None): self._persistable_vars = list(set(self._persistable_vars)) self._persistable_vars.sort() - return core.ParallelExecutor( - places, self._persistable_vars, - self._loss_name if self._loss_name else six.u(''), self._scope, - self._local_scopes, self._exec_strategy, self._build_strategy, - self._graph) + return core.ParallelExecutor(places, self._persistable_vars, + self._loss_name if self._loss_name else '', + self._scope, self._local_scopes, + self._exec_strategy, self._build_strategy, + self._graph) def _compile_inference(self): return core.create_paddle_predictor(self._infer_config) diff --git a/python/paddle/fluid/contrib/decoder/beam_search_decoder.py b/python/paddle/fluid/contrib/decoder/beam_search_decoder.py index a64d69bb5a3bb..10bc30d13d1a7 100644 --- a/python/paddle/fluid/contrib/decoder/beam_search_decoder.py +++ b/python/paddle/fluid/contrib/decoder/beam_search_decoder.py @@ -22,7 +22,6 @@ from ...wrapped_decorator import signature_safe_contextmanager import numpy as np -import six from ... import layers from ...framework import Variable @@ -197,7 +196,7 @@ def __init__(self, inputs, states, out_state, name=None): self._helper = LayerHelper('state_cell', name=name) self._cur_states = {} self._state_names = [] - for state_name, state in six.iteritems(states): + for state_name, state in states.items(): if not isinstance(state, InitState): raise ValueError('state must be an InitState object.') self._cur_states[state_name] = state @@ -352,7 +351,7 @@ def compute_state(self, inputs): if self._in_decoder and not self._switched_decoder: self._switch_decoder() - for input_name, input_value in six.iteritems(inputs): + for input_name, input_value in inputs.items(): if input_name not in self._inputs: raise ValueError('Unknown input %s. ' 'Please make sure %s in input ' @@ -367,7 +366,7 @@ def update_states(self): if self._in_decoder and not self._switched_decoder: self._switched_decoder() - for state_name, decoder_state in six.iteritems(self._states_holder): + for state_name, decoder_state in self._states_holder.items(): if id(self._cur_decoder_obj) not in decoder_state: raise ValueError('Unknown decoder object, please make sure ' 'switch_decoder been invoked.') @@ -687,7 +686,7 @@ def decode(self): feed_dict = {} update_dict = {} - for init_var_name, init_var in six.iteritems(self._input_var_dict): + for init_var_name, init_var in self._input_var_dict.items(): if init_var_name not in self.state_cell._inputs: raise ValueError('Variable ' + init_var_name + ' not found in StateCell!\n') @@ -735,8 +734,7 @@ def decode(self): self.state_cell.update_states() self.update_array(prev_ids, selected_ids) self.update_array(prev_scores, selected_scores) - for update_name, var_to_update in six.iteritems( - update_dict): + for update_name, var_to_update in update_dict.items(): self.update_array(var_to_update, feed_dict[update_name]) def read_array(self, init, is_ids=False, is_scores=False): diff --git a/python/paddle/fluid/contrib/layers/nn.py b/python/paddle/fluid/contrib/layers/nn.py index 69533c3198879..e09bdcb0d8fbd 100644 --- a/python/paddle/fluid/contrib/layers/nn.py +++ b/python/paddle/fluid/contrib/layers/nn.py @@ -16,7 +16,6 @@ """ import os -import six import warnings import inspect diff --git a/python/paddle/fluid/contrib/memory_usage_calc.py b/python/paddle/fluid/contrib/memory_usage_calc.py index b81e5eba882d2..607f8b45da1f1 100644 --- a/python/paddle/fluid/contrib/memory_usage_calc.py +++ b/python/paddle/fluid/contrib/memory_usage_calc.py @@ -20,8 +20,6 @@ This API is still under active development and may change drastically. """ -import six - from .. import core from ..framework import Program, Variable diff --git a/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_config.py b/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_config.py index 341e2f3802550..fd97f8cc9076c 100644 --- a/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_config.py +++ b/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_config.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import abc import copy diff --git a/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_quantizer.py b/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_quantizer.py index 0988f24a1837f..9b751a93a0fc6 100644 --- a/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_quantizer.py +++ b/python/paddle/fluid/contrib/slim/quantization/imperative/ptq_quantizer.py @@ -98,8 +98,7 @@ def combine_abs_max_and_hist(tensor, origin_max, origin_hist, bins, return new_max, new_hist -@six.add_metaclass(abc.ABCMeta) -class BaseQuantizer(object): +class BaseQuantizer(metaclass=abc.ABCMeta): """ Base quantizer for activation and weight. """ @@ -173,8 +172,7 @@ def cal_thresholds(self): self.thresholds = self.abs_max_vals -@six.add_metaclass(abc.ABCMeta) -class BaseHistQuantizer(BaseQuantizer): +class BaseHistQuantizer(BaseQuantizer, metaclass=abc.ABCMeta): """ """ diff --git a/python/paddle/fluid/contrib/slim/tests/quant2_int8_image_classification_comparison.py b/python/paddle/fluid/contrib/slim/tests/quant2_int8_image_classification_comparison.py index 52ebf463cdd2d..c3d7f1a254eea 100644 --- a/python/paddle/fluid/contrib/slim/tests/quant2_int8_image_classification_comparison.py +++ b/python/paddle/fluid/contrib/slim/tests/quant2_int8_image_classification_comparison.py @@ -18,7 +18,6 @@ import argparse import logging import struct -import six import numpy as np import time import paddle diff --git a/python/paddle/fluid/contrib/slim/tests/quant_int8_image_classification_comparison.py b/python/paddle/fluid/contrib/slim/tests/quant_int8_image_classification_comparison.py index 41ddfa513a0cc..ec88664c2edce 100644 --- a/python/paddle/fluid/contrib/slim/tests/quant_int8_image_classification_comparison.py +++ b/python/paddle/fluid/contrib/slim/tests/quant_int8_image_classification_comparison.py @@ -18,7 +18,6 @@ import argparse import logging import struct -import six import numpy as np import time import paddle diff --git a/python/paddle/fluid/contrib/slim/tests/test_graph.py b/python/paddle/fluid/contrib/slim/tests/test_graph.py index 03b1834bb46df..dd08eb1cbde63 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_graph.py +++ b/python/paddle/fluid/contrib/slim/tests/test_graph.py @@ -13,7 +13,6 @@ # limitations under the license. import os -import six import numpy as np import unittest import paddle diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantization_mkldnn_pass.py b/python/paddle/fluid/contrib/slim/tests/test_quantization_mkldnn_pass.py index f6c6c4f20afff..da3b0139e024a 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_quantization_mkldnn_pass.py +++ b/python/paddle/fluid/contrib/slim/tests/test_quantization_mkldnn_pass.py @@ -17,7 +17,6 @@ import random import numpy as np import paddle.fluid as fluid -import six import paddle from paddle.fluid.framework import IrGraph from paddle.fluid.contrib.slim.quantization import QuantizationFreezePass diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py b/python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py index 9d61e67092e38..4310c259ca5f4 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py +++ b/python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py @@ -17,7 +17,6 @@ import random import numpy as np import paddle.fluid as fluid -import six import paddle from paddle.fluid.framework import IrGraph from paddle.fluid.contrib.slim.quantization import QuantizationTransformPass @@ -38,7 +37,7 @@ def linear_fc(num): data = fluid.layers.data(name='image', shape=[1, 32, 32], dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = data - for _ in six.moves.xrange(num): + for _ in range(num): hidden = fluid.layers.fc(hidden, size=128, act='relu') loss = fluid.layers.cross_entropy(input=hidden, label=label) loss = paddle.mean(loss) @@ -72,7 +71,7 @@ def conv_bn_layer(input, dtype='int64', append_batch_size=False) hidden = data - for _ in six.moves.xrange(num): + for _ in range(num): conv = conv_bn_layer(hidden, 16, 3, 1, 1, act=None, bias_attr=True) short = conv_bn_layer(hidden, 16, 1, 1, 0, act=None) hidden = fluid.layers.elementwise_add(x=conv, y=short, act='relu') @@ -579,7 +578,7 @@ def conv_bn_layer(input, dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = data1 - for _ in six.moves.xrange(num): + for _ in range(num): conv = conv_bn_layer(hidden, 16, 3, 1, 1, act=None, bias_attr=True) short = conv_bn_layer(hidden, 16, 1, 1, 0, act=None) hidden = fluid.layers.elementwise_add(x=conv, y=short, act='relu') diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py index 2e78d4ea8cba3..a8466ad7371c3 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py +++ b/python/paddle/fluid/contrib/slim/tests/test_quantization_scale_pass.py @@ -16,7 +16,6 @@ import unittest import random import numpy as np -import six import tempfile import paddle.fluid as fluid import paddle diff --git a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py index d2a5383024338..3893177cbf033 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py +++ b/python/paddle/fluid/contrib/slim/tests/test_quantize_transpiler_v2.py @@ -16,7 +16,6 @@ import unittest import random import numpy as np -import six import paddle.fluid as fluid import paddle from paddle.fluid.framework import IrGraph diff --git a/python/paddle/fluid/contrib/slim/tests/test_user_defined_quantization.py b/python/paddle/fluid/contrib/slim/tests/test_user_defined_quantization.py index 9ee4f3681588d..361440f0238c7 100644 --- a/python/paddle/fluid/contrib/slim/tests/test_user_defined_quantization.py +++ b/python/paddle/fluid/contrib/slim/tests/test_user_defined_quantization.py @@ -17,7 +17,6 @@ import json import random import numpy as np -import six import tempfile import paddle.fluid as fluid import paddle diff --git a/python/paddle/fluid/contrib/tests/test_quantize_transpiler.py b/python/paddle/fluid/contrib/tests/test_quantize_transpiler.py index a7472f3bce5ac..7e73167445f69 100644 --- a/python/paddle/fluid/contrib/tests/test_quantize_transpiler.py +++ b/python/paddle/fluid/contrib/tests/test_quantize_transpiler.py @@ -13,7 +13,6 @@ # limitations under the license. import numpy as np -import six import unittest import paddle @@ -29,7 +28,7 @@ def linear_fc(num): data = fluid.layers.data(name='image', shape=[1, 32, 32], dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = data - for _ in six.moves.xrange(num): + for _ in range(num): hidden = fluid.layers.fc(hidden, size=128, act='relu') loss = fluid.layers.cross_entropy(input=hidden, label=label) loss = paddle.mean(loss) @@ -57,7 +56,7 @@ def conv_bn_layer(input, data = fluid.layers.data(name='image', shape=[1, 32, 32], dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = data - for _ in six.moves.xrange(num): + for _ in range(num): conv = conv_bn_layer(hidden, 16, 3, 1, 1, act=None, bias_attr=True) short = conv_bn_layer(hidden, 16, 1, 1, 0, act=None) hidden = fluid.layers.elementwise_add(x=conv, y=short, act='relu') diff --git a/python/paddle/fluid/contrib/tests/test_weight_decay_extend.py b/python/paddle/fluid/contrib/tests/test_weight_decay_extend.py index c3eb81631bb42..ce30b1fa5734a 100644 --- a/python/paddle/fluid/contrib/tests/test_weight_decay_extend.py +++ b/python/paddle/fluid/contrib/tests/test_weight_decay_extend.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import unittest from functools import partial import numpy as np @@ -32,7 +31,7 @@ def fake_imdb_reader(word_dict_size, class_dim=2): def __reader__(): - for _ in six.moves.range(sample_num): + for _ in range(sample_num): length = np.random.random_integers(low=lower_seq_len, high=upper_seq_len, size=[1])[0] diff --git a/python/paddle/fluid/data.py b/python/paddle/fluid/data.py index 34fc5eec4e679..99e38b9470b76 100644 --- a/python/paddle/fluid/data.py +++ b/python/paddle/fluid/data.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six from paddle.fluid import core from paddle.fluid.layer_helper import LayerHelper @@ -107,11 +106,11 @@ def data(name, shape, dtype='float32', lod_level=0): """ helper = LayerHelper('data', **locals()) - check_type(name, 'name', (six.binary_type, six.text_type), 'data') + check_type(name, 'name', (bytes, str), 'data') check_type(shape, 'shape', (list, tuple), 'data') shape = list(shape) - for i in six.moves.range(len(shape)): + for i in range(len(shape)): if shape[i] is None: shape[i] = -1 diff --git a/python/paddle/fluid/data_feeder.py b/python/paddle/fluid/data_feeder.py index 37c4a6b139d91..a6bf7c6d4406d 100644 --- a/python/paddle/fluid/data_feeder.py +++ b/python/paddle/fluid/data_feeder.py @@ -15,8 +15,6 @@ from . import core import numpy as np import os -import six -from six.moves import zip, range, xrange import multiprocessing import warnings @@ -188,7 +186,7 @@ def __init__(self, place, lod_level, shape, dtype): def _reset(self): self.data = [] - self.lod = [[] for _ in six.moves.range(self.lod_level)] + self.lod = [[] for _ in range(self.lod_level)] def feed(self, data): self._feed_impl_(data, self.lod, self.lod_level) @@ -249,8 +247,7 @@ def _done(self): def __call__(self): idx = 0 for each_sample in self.generator(): - for each_slot, each_converter in six.moves.zip( - each_sample, self.converters): + for each_slot, each_converter in zip(each_sample, self.converters): each_converter.data.append(each_slot) idx += 1 @@ -333,7 +330,7 @@ def __init__(self, feed_list, place, program=None): if program is None: program = default_main_program() for each_var in feed_list: - if isinstance(each_var, six.string_types): + if isinstance(each_var, str): each_var = program.block(0).var(each_var) if not isinstance(each_var, Variable): raise TypeError("Feed list should contain a list of variable") @@ -383,9 +380,8 @@ def reader(limit=5): """ converter = [] - for lod_level, shape, dtype in six.moves.zip(self.feed_lod_level, - self.feed_shapes, - self.feed_dtypes): + for lod_level, shape, dtype in zip(self.feed_lod_level, + self.feed_shapes, self.feed_dtypes): converter.append( DataToLoDTensorConverter(place=self.place, lod_level=lod_level, @@ -396,12 +392,10 @@ def reader(limit=5): assert len(each_sample) == len(converter), ( "The number of fields in data (%d) does not match " + "len(feed_list) (%d)") % (len(each_sample), len(converter)) - for each_converter, each_slot in six.moves.zip( - converter, each_sample): + for each_converter, each_slot in zip(converter, each_sample): each_converter.feed(each_slot) ret_dict = {} - for each_name, each_converter in six.moves.zip(self.feed_names, - converter): + for each_name, each_converter in zip(self.feed_names, converter): ret_dict[each_name] = each_converter.done() return ret_dict @@ -461,13 +455,13 @@ def _reader(): """ if isinstance(self.place, core.CUDAPlace): places = [ - core.CUDAPlace(i) for i in six.moves.xrange( - self._get_number_of_places_(num_places)) + core.CUDAPlace(i) + for i in range(self._get_number_of_places_(num_places)) ] else: places = [ - core.CPUPlace() for _ in six.moves.xrange( - self._get_number_of_places_(num_places)) + core.CPUPlace() + for _ in range(self._get_number_of_places_(num_places)) ] if len(iterable) != len(places): @@ -477,7 +471,7 @@ def _reader(): "must be same.") place = self.place - for p, batch in six.moves.zip(places, iterable): + for p, batch in zip(places, iterable): self.place = p yield self.feed(batch) self.place = place diff --git a/python/paddle/fluid/debugger.py b/python/paddle/fluid/debugger.py index 281b43b2bdba1..0c2d61db2d295 100644 --- a/python/paddle/fluid/debugger.py +++ b/python/paddle/fluid/debugger.py @@ -13,7 +13,6 @@ # limitations under the License. import sys -import six import random import os import re @@ -235,7 +234,7 @@ def draw_block_graphviz(block, highlights=None, path="./temp.dot"): graph = GraphPreviewGenerator("some graph") # collect parameters and args protostr = block.desc.serialize_to_string() - desc = framework_pb2.BlockDesc.FromString(six.binary_type(protostr)) + desc = framework_pb2.BlockDesc.FromString(bytes(protostr)) def need_highlight(name): if highlights is None: return False diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py b/python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py index 7a1d3a5234d54..3f13618283916 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/convert_call_func.py @@ -23,6 +23,7 @@ import numpy import six +import builtins from paddle.fluid.dygraph.container import Sequential from paddle.fluid.dygraph.dygraph_to_static.convert_operators import convert_len, convert_zip @@ -73,7 +74,7 @@ def name_judge(): if isinstance(func, types.BuiltinFunctionType) and name_judge(): return True - elif func in six.moves.builtins.__dict__.values() and name_judge(): + elif func in builtins.__dict__.values() and name_judge(): return True else: return False diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/error.py b/python/paddle/fluid/dygraph/dygraph_to_static/error.py index 3ff66bd2ee31b..d05a8ce4d8421 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/error.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/error.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import six import sys import traceback import linecache @@ -380,14 +379,11 @@ def raise_new_exception(self): raise new_exception = self.create_exception() - if six.PY3: - # NOTE(liym27): - # 1. Why `raise new_exception from None`? - # In Python 3, by default, an new exception is raised with trace information of the caught exception. - # This only raises new_exception and hides unwanted implementation details from tracebacks of the - # caught exception. - # 2. Use exec to bypass syntax error checking in Python 2. - - six.exec_("raise new_exception from None") - else: - raise new_exception + # NOTE(liym27): + # Why `raise new_exception from None`? + # + # In Python 3, by default, an new exception is raised with trace information of the caught exception. + # This only raises new_exception and hides unwanted implementation details from tracebacks of the + # caught exception. + + raise new_exception from None diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/function_spec.py b/python/paddle/fluid/dygraph/dygraph_to_static/function_spec.py index ebc0aacf6647c..730c02fbc5e91 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/function_spec.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/function_spec.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import inspect import numpy as np import collections @@ -83,7 +82,7 @@ def unified_args_and_kwargs(self, args, kwargs): args = list(args) - for i in six.moves.range(len(args), len(self._arg_names)): + for i in range(len(args), len(self._arg_names)): arg_name = self._arg_names[i] if arg_name in kwargs: args.append(kwargs[arg_name]) @@ -315,7 +314,7 @@ def check_type_and_len(input, spec, check_length=False): elif isinstance(input_spec, dict): input_with_spec = {} check_type_and_len(inputs, input_spec, True) - for name, input in six.iteritems(inputs): + for name, input in inputs.items(): if name in input_spec: input_with_spec[name] = convert_to_input_spec( input, input_spec[name]) @@ -380,7 +379,7 @@ def _replace_spec_name(name, input_spec): return processed_specs elif isinstance(input_spec, dict): processed_specs = {} - for key, spec in six.iteritems(input_spec): + for key, spec in input_spec.items(): processed_specs[key] = _replace_spec_name(key, spec) return processed_specs else: diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py b/python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py index c3cdaf7744dc2..5d51b0f48c274 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import copy import textwrap from collections import defaultdict @@ -270,7 +269,7 @@ def _is_call_func_name_node(self, node): return False def _update_name_ids(self, new_name_ids): - for name_id, ctxs in six.iteritems(new_name_ids): + for name_id, ctxs in new_name_ids.items(): self.name_ids[name_id] = ctxs + self.name_ids[name_id] diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/logging_utils.py b/python/paddle/fluid/dygraph/dygraph_to_static/logging_utils.py index 3ae10997c8e7f..f0a4672794c3c 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/logging_utils.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/logging_utils.py @@ -15,7 +15,6 @@ import os import threading -import six from paddle.fluid import log_helper from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code @@ -117,7 +116,7 @@ def need_to_echo_code_to_stdout(self, code_to_stdout): self._need_to_echo_code_to_stdout = code_to_stdout def check_level(self, level): - if isinstance(level, (six.integer_types, type(None))): + if isinstance(level, (int, type(None))): rv = level else: raise TypeError("Level is not an integer: {}".format(level)) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py b/python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py index 2e545a91a9909..ebc8b351f785a 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/partial_program.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six import paddle from paddle.fluid import framework, backward, core, program_guard @@ -873,7 +872,7 @@ def _check_params_all_inited(self, main_program): param_and_buffer_names_set.add(var.name) for block in main_program.blocks: - for name, var in six.iteritems(block.vars): + for name, var in block.vars.items(): if isinstance(var, framework.Parameter): if name not in param_and_buffer_names_set: raise ValueError( diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py b/python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py index b15ad003be530..ad327a7f2e75b 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py @@ -15,7 +15,6 @@ import collections from paddle.utils import gast import inspect -import six import textwrap import threading import weakref @@ -983,7 +982,7 @@ def __len__(self): return len(self._caches) def concrete_programs(self): - return [cp for key, (cp, _) in six.iteritems(self._caches)] + return [cp for key, (cp, _) in self._caches.items()] def synchronized(func): diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/utils.py b/python/paddle/fluid/dygraph/dygraph_to_static/utils.py index 849ff338ae287..f96feaee9d739 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/utils.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/utils.py @@ -19,9 +19,9 @@ import collections from paddle.utils import gast import inspect -import os, sys +import os +import sys import shutil -import six import tempfile import textwrap import numpy as np @@ -135,7 +135,7 @@ def data_layer_not_check(name, shape, dtype='float32', lod_level=0): """ helper = LayerHelper('data', **locals()) shape = list(shape) - for i in six.moves.range(len(shape)): + for i in range(len(shape)): if shape[i] is None: shape[i] = -1 @@ -488,7 +488,7 @@ def generate_name_node(name_ids, ctx=gast.Load(), gen_tuple_if_single=False): This function is used at several gast.Return statements. """ - if isinstance(name_ids, six.string_types): + if isinstance(name_ids, str): name_ids = [name_ids] if not isinstance(name_ids, (list, tuple, set)): raise TypeError( @@ -640,7 +640,7 @@ def recover_globals_attribute(src_obj, dst_obj): src_globals = getattr(src_obj, attr_name, {}) dst_globals = getattr(dst_obj, attr_name, {}) - for k, v in six.iteritems(src_globals): + for k, v in src_globals.items(): # ignore builtin attribute. if not (k.startswith('__') and k.endswith('__')): dst_globals[k] = v @@ -889,7 +889,7 @@ def _is_node_with_tensor(self, node, name_id): # Look up the node_var_type_map by name_id. if self.node_var_type_map: - if name_id and isinstance(name_id, six.string_types): + if name_id and isinstance(name_id, str): var_type = self.node_var_type_map.get(name_id, None) if var_type and var_type & NodeVarType.TENSOR_TYPES: return True diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py b/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py index 3e4321e0a3358..8afe558ecfc2c 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import paddle import textwrap from paddle.utils import gast @@ -59,7 +58,7 @@ def to_static_variable(x): return paddle.full(shape=[1], dtype='bool', fill_value=x) if isinstance(x, float): return paddle.full(shape=[1], dtype='float64', fill_value=x) - if isinstance(x, six.integer_types): + if isinstance(x, int): return paddle.full(shape=[1], dtype='int64', fill_value=x) if isinstance(x, UndefinedVar) or x is None: """ diff --git a/python/paddle/fluid/dygraph/io.py b/python/paddle/fluid/dygraph/io.py index ea617e253f4f0..9ddb46798cfb1 100644 --- a/python/paddle/fluid/dygraph/io.py +++ b/python/paddle/fluid/dygraph/io.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import six import pickle import numpy as np @@ -69,17 +68,17 @@ def _is_persistable(var_desc): def _is_parameter(persistable_var_desc, program_desc): # 1. firstly, param should be input of op input_ops = [] # op can be repeated - for block_idx in six.moves.range(program_desc.num_blocks()): + for block_idx in range(program_desc.num_blocks()): block = program_desc.block(block_idx) - for op_idx in six.moves.range(block.op_size()): + for op_idx in range(block.op_size()): op = block.op(op_idx) # NOTE: parameter is the input of a certain op if persistable_var_desc.name() in op.input_arg_names(): input_ops.append(op) # 2. secondly, param should not be output of op or be same op's output - for block_idx in six.moves.range(program_desc.num_blocks()): + for block_idx in range(program_desc.num_blocks()): block = program_desc.block(block_idx) - for op_idx in six.moves.range(block.op_size()): + for op_idx in range(block.op_size()): op = block.op(op_idx) if persistable_var_desc.name() in op.output_arg_names(): # such as batch_norm_op @@ -92,7 +91,7 @@ def _is_parameter(persistable_var_desc, program_desc): def _get_persistable_vars(program_desc): persistable_vars = [] - for i in six.moves.range(program_desc.num_blocks()): + for i in range(program_desc.num_blocks()): block = program_desc.block(i) persistable_vars.extend(list(filter(_is_persistable, block.all_vars()))) return persistable_vars @@ -111,7 +110,7 @@ def _get_persistable_var_names(program_desc): def _get_all_var_names(program_desc): all_var_names = set() - for i in six.moves.range(program_desc.num_blocks()): + for i in range(program_desc.num_blocks()): block = program_desc.block(i) for var in block.all_vars(): all_var_names.add(var.name()) @@ -142,10 +141,10 @@ def _append_loaded_suffix_to_var(program_desc): new_name = _append_loaded_suffix(var_desc.name()) suffix_varname_dict[new_name] = old_name var_desc.set_name(new_name) - for block_idx in six.moves.range(program_desc.num_blocks()): + for block_idx in range(program_desc.num_blocks()): block = program_desc.block(block_idx) block._rename_var(old_name.encode(), new_name.encode()) - for op_idx in six.moves.range(block.op_size()): + for op_idx in range(block.op_size()): op = block.op(op_idx) op._rename_input(old_name, new_name) op._rename_output(old_name, new_name) @@ -191,7 +190,7 @@ def _rename_var_program_desc(program_desc, include=None, exclude=None): dict_rename_var_new_old = dict() old_names = [] # Store all old names - for b_idx in six.moves.range(program_desc.num_blocks()): + for b_idx in range(program_desc.num_blocks()): cur_block = program_desc.block(b_idx) for var in cur_block.all_vars(): old_names.append(var.name()) @@ -199,7 +198,7 @@ def _rename_var_program_desc(program_desc, include=None, exclude=None): # Create dict_rename_var_new_old and dict_rename_var_old_new for non double # grad variables has_double_grad = False - for b_idx in six.moves.range(program_desc.num_blocks()): + for b_idx in range(program_desc.num_blocks()): cur_block = program_desc.block(b_idx) for var_idx, var in enumerate(cur_block.all_vars()): name_old = var.name() @@ -232,7 +231,7 @@ def _rename_var_program_desc(program_desc, include=None, exclude=None): if has_double_grad: double_grad_rename_dict = {} for name_old in dict_rename_var_old_new: - for b_idx in six.moves.range(program_desc.num_blocks()): + for b_idx in range(program_desc.num_blocks()): cur_block = program_desc.block(b_idx) for var_idx, var in enumerate(cur_block.all_vars()): var_name = var.name() @@ -247,9 +246,9 @@ def _rename_var_program_desc(program_desc, include=None, exclude=None): double_grad_rename_dict[var_name]] = var_name # Rename on program desc - for b_idx in six.moves.range(program_desc.num_blocks()): + for b_idx in range(program_desc.num_blocks()): cur_block = program_desc.block(b_idx) - for op_idx in six.moves.range(cur_block.op_size()): + for op_idx in range(cur_block.op_size()): op = cur_block.op(op_idx) for input_arg_name in op.input_arg_names(): if input_arg_name in dict_rename_var_old_new: @@ -283,8 +282,7 @@ def _build_program_by_desc(program_desc): prog = framework.Program() prog.desc = program_desc prog.blocks = [ - framework.Block(prog, i) - for i in six.moves.range(prog.desc.num_blocks()) + framework.Block(prog, i) for i in range(prog.desc.num_blocks()) ] prog._sync_with_cpp() return prog @@ -292,9 +290,9 @@ def _build_program_by_desc(program_desc): def _change_is_test_status(program_desc, is_test): # change all `is_test` attributes - for i in six.moves.range(program_desc.num_blocks()): + for i in range(program_desc.num_blocks()): block = program_desc.block(i) - for j in six.moves.range(block.op_size()): + for j in range(block.op_size()): op = block.op(j) if op.has_attr('is_test'): op._set_attr('is_test', is_test) @@ -407,7 +405,7 @@ def _preprocess(self, program_desc): # remove feed, fetch and scale-1 op, remove op_callstack attr ops_to_remove = [] root_block = program_desc.block(0) - for i in six.moves.range(root_block.op_size()): + for i in range(root_block.op_size()): op = root_block.op(i) if op.type() == 'feed': ops_to_remove.append(i) @@ -511,7 +509,7 @@ def _get_train_forward_program(self, infer_program_desc): program = _build_program_by_desc(program_desc_copy) # 3. Add the outputs which is only used for training and not saved in # inference program. - for block_idx in six.moves.range(program.num_blocks): + for block_idx in range(program.num_blocks): block = program.block(block_idx) for op in block.ops: if op.type == "batch_norm": diff --git a/python/paddle/fluid/dygraph/jit.py b/python/paddle/fluid/dygraph/jit.py index 8e342d58b60f4..c659af4a7832f 100644 --- a/python/paddle/fluid/dygraph/jit.py +++ b/python/paddle/fluid/dygraph/jit.py @@ -22,7 +22,6 @@ import threading from typing import Text, Tuple, Any, List -import six import paddle from paddle.fluid import core, dygraph from paddle.fluid.compiler import BuildStrategy, CompiledProgram, ExecutionStrategy @@ -338,7 +337,7 @@ def model_filename(self): def model_filename(self, filename): if filename is None: return - if not isinstance(filename, six.string_types): + if not isinstance(filename, str): raise TypeError( "The config `model_filename` should be str, but received input's type is %s." % type(filename)) @@ -354,7 +353,7 @@ def params_filename(self): def params_filename(self, filename): if filename is None: return - if not isinstance(filename, six.string_types): + if not isinstance(filename, str): raise TypeError( "The config `params_filename` should be str, but received input's type is %s." % type(filename)) @@ -985,7 +984,7 @@ def fun(inputs): # we only record the state_dict variable's structured name state_names_dict = dict() state_var_dict = dict() - for structured_name, var in six.iteritems(dygraph_state_dict): + for structured_name, var in dygraph_state_dict.items(): state_names_dict[var.name] = structured_name state_var_dict[var.name] = var diff --git a/python/paddle/fluid/dygraph/layer_hooks.py b/python/paddle/fluid/dygraph/layer_hooks.py index 68c3d463e5deb..a231e7cf8745a 100644 --- a/python/paddle/fluid/dygraph/layer_hooks.py +++ b/python/paddle/fluid/dygraph/layer_hooks.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import warnings from paddle.fluid.framework import default_main_program, _non_static_mode @@ -64,7 +63,7 @@ def set_op_customized_attrs_post_hook(layer, inputs, outputs): layer._op_recorder.ops = ops for op in ops: - for attr_name, val in six.iteritems(layer._customized_attrs): + for attr_name, val in layer._customized_attrs.items(): op._set_attr(attr_name, val) # remove pre-hook and post-hook diff --git a/python/paddle/fluid/dygraph/layer_object_helper.py b/python/paddle/fluid/dygraph/layer_object_helper.py index b0d4f390eed67..bdd34abd5a865 100644 --- a/python/paddle/fluid/dygraph/layer_object_helper.py +++ b/python/paddle/fluid/dygraph/layer_object_helper.py @@ -13,11 +13,10 @@ # limitations under the License. import copy -import six from ..framework import Parameter, _non_static_mode, _global_flags from ..param_attr import ParamAttr from .. import core -from six.moves import zip + from ..layer_helper_base import LayerHelperBase from ..dygraph_utils import _append_activation_in_dygraph @@ -78,7 +77,7 @@ def _multiple_param_attr(self, length, param_attr_in=None): self.name)) elif len(param_attr) == 1 and length != 1: tmp = [None] * length - for i in six.moves.range(length): + for i in range(length): tmp[i] = copy.deepcopy(param_attr[0]) param_attr = tmp return param_attr @@ -150,7 +149,7 @@ def append_activation(self, input_var, act=None, use_cudnn=None): act = act if act is None: return input_var - if isinstance(act, six.string_types): + if isinstance(act, str): act = {'type': act} else: raise TypeError( diff --git a/python/paddle/fluid/dygraph/layers.py b/python/paddle/fluid/dygraph/layers.py index 9b3ebdd7b9a61..29f2e186bd2e7 100644 --- a/python/paddle/fluid/dygraph/layers.py +++ b/python/paddle/fluid/dygraph/layers.py @@ -16,7 +16,6 @@ import contextlib import sys import numpy as np -import six import re import copy import weakref @@ -441,7 +440,7 @@ def forward(self, input): """ temp_attr = copy.deepcopy(attr) - if isinstance(temp_attr, six.string_types) and temp_attr == "": + if isinstance(temp_attr, str) and temp_attr == "": temp_attr = None return self._helper.create_parameter(temp_attr, shape, dtype, is_bias, default_initializer) @@ -770,7 +769,7 @@ def register_buffer(self, name, tensor, persistable=True): if '_buffers' not in self.__dict__: raise ValueError( "super(YourLayer, self).__init__() should be called first") - elif not isinstance(name, six.string_types): + elif not isinstance(name, str): raise TypeError( "The name of buffer should be a string, but received {}.". format(type(name).__name__)) @@ -1038,7 +1037,7 @@ def forward(self, input): if '_parameters' not in self.__dict__: raise RuntimeError( "super(YourLayer, self).__init__() should be called firstly.") - elif not isinstance(name, six.string_types): + elif not isinstance(name, str): raise TypeError( "The name of parameter should be a string, but received {}.". format(type(name).__name__)) diff --git a/python/paddle/fluid/dygraph/nn.py b/python/paddle/fluid/dygraph/nn.py index e21642b1c468c..27ac082da79f5 100644 --- a/python/paddle/fluid/dygraph/nn.py +++ b/python/paddle/fluid/dygraph/nn.py @@ -13,7 +13,6 @@ # limitations under the License. import paddle -from six.moves import reduce from .. import core from ..layers import utils from ..layers import nn as F diff --git a/python/paddle/fluid/dygraph/parallel.py b/python/paddle/fluid/dygraph/parallel.py index 7e4c527205ba1..bd0a4c9e5d221 100644 --- a/python/paddle/fluid/dygraph/parallel.py +++ b/python/paddle/fluid/dygraph/parallel.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import six import numpy as np import warnings from collections import OrderedDict diff --git a/python/paddle/fluid/dygraph/tracer.py b/python/paddle/fluid/dygraph/tracer.py index 74cbf4ee88af0..1553efad41a25 100644 --- a/python/paddle/fluid/dygraph/tracer.py +++ b/python/paddle/fluid/dygraph/tracer.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six - from collections import defaultdict from paddle.fluid import core from paddle.fluid import framework diff --git a/python/paddle/fluid/executor.py b/python/paddle/fluid/executor.py index d04fab724a325..489ed0b476a56 100755 --- a/python/paddle/fluid/executor.py +++ b/python/paddle/fluid/executor.py @@ -384,8 +384,8 @@ def _add_feed_fetch_ops(program, fetch_op): for i, var in enumerate(fetch_list): assert isinstance(var, Variable) or isinstance( - var, six.string_types), ("Wrong type for fetch_list[%s]: %s" % - (i, type(var))) + var, str), ("Wrong type for fetch_list[%s]: %s" % + (i, type(var))) global_block.append_op(type=fetch_op, inputs={'X': [var]}, outputs={'Out': [fetch_var]}, @@ -429,7 +429,7 @@ def _fetch_var(name, scope=None, return_numpy=True): Returns: LodTensor|numpy.ndarray """ - assert isinstance(name, six.string_types) + assert isinstance(name, str) if scope is None: scope = global_scope() assert isinstance(scope, core._Scope) @@ -452,7 +452,7 @@ def _to_str(var): return var.desc.name() elif isinstance(var, str): return var - elif isinstance(var, six.string_types): + elif isinstance(var, str): return str(var) elif isinstance(var, Operator): return str(id(var)) @@ -987,7 +987,7 @@ def _feed_data(self, program, feed, feed_var_name, scope): def _fetch_data(self, fetch_list, fetch_var_name, scope): outs = [ core.get_fetch_variable(scope, fetch_var_name, i) - for i in six.moves.range(len(fetch_list)) + for i in range(len(fetch_list)) ] return outs @@ -1017,7 +1017,7 @@ def _get_targets(_optimize_ops, _fetch_list, item): raise TypeError( "The operator in fetch_list is not an optimize_op") elif isinstance(item, Variable) or isinstance( - item, str) or isinstance(item, six.string_types): + item, str) or isinstance(item, str): _fetch_list.append(item) else: raise TypeError( @@ -1808,8 +1808,7 @@ def _run_inference(self, exe, feed): return exe.run(feed) def _check_fetch_list(self, fetch_list): - is_fetch_var = lambda var: isinstance(var, - (Variable, str, six.string_types)) + is_fetch_var = lambda var: isinstance(var, (Variable, str)) is_tuple_list = lambda var: isinstance(var, (tuple, list)) if fetch_list is None: return [] @@ -2404,9 +2403,8 @@ def _add_fetch_ops(cls, fetch_op): for i, var in enumerate(fetch_list): assert isinstance(var, Variable) or isinstance( - var, - six.string_types), ("Wrong type for fetch_list[%s]: %s" % - (i, type(var))) + var, str), ("Wrong type for fetch_list[%s]: %s" % + (i, type(var))) global_block.append_op(type=fetch_op, inputs={'X': [var]}, outputs={'Out': [fetch_var]}, diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index 85d525ab5f75c..99abb76d21388 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -20,7 +20,6 @@ import os import re import traceback -import six import copy from types import MethodType, FunctionType @@ -448,7 +447,7 @@ def require_version(min_version, max_version=None): zero_version = ['0', '0', '0', '0'] def version_cmp(ver_a, ver_b): - for i in six.moves.range(len(ver_a)): + for i in range(len(ver_a)): if int(ver_a[i]) > int(ver_b[i]): return 1 elif int(ver_a[i]) < int(ver_b[i]): @@ -688,7 +687,7 @@ def _cuda_ids(): if gpus_env: device_ids = [int(s) for s in gpus_env.split(",")] else: - device_ids = six.moves.range(core.get_cuda_device_count()) + device_ids = range(core.get_cuda_device_count()) return device_ids @@ -697,7 +696,7 @@ def _xpu_ids(): if xpus_env: device_ids = [int(s) for s in xpus_env.split(",")] else: - device_ids = six.moves.range(core.get_xpu_device_count()) + device_ids = range(core.get_xpu_device_count()) return device_ids @@ -706,7 +705,7 @@ def _npu_ids(): if npus_env: device_ids = [int(s) for s in npus_env.split(",")] else: - device_ids = six.moves.range(core.get_npu_device_count()) + device_ids = range(core.get_npu_device_count()) return device_ids @@ -715,7 +714,7 @@ def _mlu_ids(): if mlus_env: device_ids = [int(s) for s in mlus_env.split(",")] else: - device_ids = six.moves.range(core.get_mlu_device_count()) + device_ids = range(core.get_mlu_device_count()) return device_ids @@ -1322,8 +1321,7 @@ def __instancecheck__(cls, instance): return issubclass(t, Parameter) -@six.add_metaclass(VariableMetaClass) -class Variable(object): +class Variable(metaclass=VariableMetaClass): """ **Notes**: **The constructor of Variable should not be invoked directly.** @@ -1763,7 +1761,7 @@ def to_string(self, throw_on_error, with_details=False): assert isinstance(throw_on_error, bool) and isinstance( with_details, bool) protostr = self.desc.serialize_to_string() - proto = framework_pb2.VarDesc.FromString(six.binary_type(protostr)) + proto = framework_pb2.VarDesc.FromString(bytes(protostr)) res_str = _debug_string_(proto, throw_on_error) if with_details: additional_attr = ("error_clip", ) @@ -2579,7 +2577,7 @@ def get_all_op_protos(): protostrs = core.get_all_op_protos() ret_values = [] for pbstr in protostrs: - op_proto = framework_pb2.OpProto.FromString(six.binary_type(pbstr)) + op_proto = framework_pb2.OpProto.FromString(bytes(pbstr)) ret_values.append(op_proto) return ret_values @@ -2812,9 +2810,9 @@ def find_name(var_list, name): % (in_proto.name, len(in_args))) in_arg_names = [] for index, arg in enumerate(in_args): - if isinstance(arg, six.string_types): + if isinstance(arg, str): in_arg_names.append(arg) - elif isinstance(arg, six.binary_type): + elif isinstance(arg, bytes): in_arg_names.append(arg.decode()) elif isinstance(arg, (Variable, core.VarBase)): in_arg_names.append(arg.name) @@ -2850,13 +2848,13 @@ def find_name(var_list, name): % (out_proto.name, len(out_args))) out_arg_names = [] for arg in out_args: - if isinstance(arg, six.string_types): + if isinstance(arg, str): out_arg_names.append(arg) else: out_arg_names.append(arg.name) # TODO(minqiyang): could we remove variable's op in static mode? if not _non_static_mode(): - if isinstance(arg, six.string_types): + if isinstance(arg, str): block.var(arg).op = self else: arg.op = self @@ -2911,7 +2909,7 @@ def to_string(self, throw_on_error): """ protostr = self.desc.serialize_to_string() - proto = framework_pb2.OpDesc.FromString(six.binary_type(protostr)) + proto = framework_pb2.OpDesc.FromString(bytes(protostr)) return _debug_string_(proto, throw_on_error) def _to_readable_code(self, skip_op_callstack=True): @@ -3528,8 +3526,7 @@ def to_string(self, throw_on_error, with_details=False): res_str += "\n}" else: protostr = self.desc.serialize_to_string() - proto = framework_pb2.BlockDesc.FromString( - six.binary_type(protostr)) + proto = framework_pb2.BlockDesc.FromString(bytes(protostr)) res_str = _debug_string_(proto, throw_on_error) return res_str @@ -3581,7 +3578,7 @@ def var(self, name): Returns: Variable: the Variable with the giving name. """ - if not isinstance(name, six.string_types): + if not isinstance(name, str): raise TypeError( "var require string as parameter, but get %s instead." % (type(name))) @@ -3650,7 +3647,7 @@ def all_parameters(self): return list(self.iter_parameters()) def iter_parameters(self): - return (item[1] for item in six.iteritems(self.vars) + return (item[1] for item in self.vars.items() if isinstance(item[1], Parameter)) def create_var(self, *args, **kwargs): @@ -4736,14 +4733,14 @@ def create_op_node(self, op_type, attrs, inputs, outputs): """ op_desc = core.OpDesc() op_desc.set_type(op_type) - for attr, value in six.iteritems(attrs): + for attr, value in attrs.items(): self._update_desc_attr(op_desc, attr, value) - for input_name, var_nodes in six.iteritems(inputs): + for input_name, var_nodes in inputs.items(): if not isinstance(var_nodes, list): var_nodes = [var_nodes] op_desc.set_input(input_name, [var_node.name() for var_node in var_nodes]) - for output_name, var_nodes in six.iteritems(outputs): + for output_name, var_nodes in outputs.items(): if not isinstance(var_nodes, list): var_nodes = [var_nodes] op_desc.set_output(output_name, @@ -4889,7 +4886,7 @@ def build_adjacency_list(self): """ adj_list = core.build_adjacency_list(self.graph) wrapped_adj_list = dict() - for k, v in six.iteritems(adj_list): + for k, v in adj_list.items(): wrapped_adj_list[IrNode(k)] = {IrNode(n) for n in v} return wrapped_adj_list @@ -5461,8 +5458,7 @@ def to_string(self, throw_on_error, with_details=False): res_str += block.to_string(throw_on_error, with_details) else: protostr = self.desc.serialize_to_string() - proto = framework_pb2.ProgramDesc.FromString( - six.binary_type(protostr)) + proto = framework_pb2.ProgramDesc.FromString(bytes(protostr)) res_str = _debug_string_(proto, throw_on_error) return res_str @@ -5545,7 +5541,7 @@ def print_prog(prog): 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)) @@ -5553,7 +5549,6 @@ def print_prog(prog): 1. To clone a test program, the sample code is: .. code-block:: python - import six import paddle import paddle.static as static import paddle.utils as utils @@ -5562,13 +5557,13 @@ def print_prog(prog): 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)) @@ -5606,7 +5601,6 @@ def print_prog(prog): 2. The clone method can be avoid if you create program for training and program for testing individually. .. code-block:: python - import six import paddle import paddle.static as static import paddle.utils as utils @@ -5615,13 +5609,13 @@ def print_prog(prog): 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)) @@ -5663,7 +5657,7 @@ def network(): self.desc) forward_prog.blocks = [ Block(forward_prog, i) - for i in six.moves.range(forward_prog.desc.num_blocks()) + for i in range(forward_prog.desc.num_blocks()) ] forward_prog._sync_with_cpp() p = forward_prog._inference_optimize(prune_read_op=False) @@ -5672,9 +5666,7 @@ def network(): p.current_block_idx = self.current_block_idx p._seed = self._seed p.desc = core.ProgramDesc(self.desc) - p.blocks = [ - Block(p, i) for i in six.moves.range(self.desc.num_blocks()) - ] + p.blocks = [Block(p, i) for i in range(self.desc.num_blocks())] p._current_role = self._current_role p.__op_role_var = self.__op_role_var @@ -5737,7 +5729,7 @@ def _prune_with_input(self, feeded_var_names, targets): targets = [targets] for var in feeded_var_names: - if not isinstance(var, six.string_types): + if not isinstance(var, str): raise ValueError( "All feeded_var_names of Program._prune_with_input() can only be " "str, but received %s." % type(var)) @@ -5763,7 +5755,7 @@ def _prune_with_input(self, feeded_var_names, targets): if not isinstance(t, Operator): if isinstance(t, Variable): name = t.name - elif isinstance(t, six.string_types): + elif isinstance(t, str): name = str(t) else: raise ValueError( @@ -5803,9 +5795,7 @@ def _prune_with_input(self, feeded_var_names, targets): res = Program() res.desc, pruned_origin_block_id_map = core.prune( self.desc, set(feeded_var_names), targets_idx) - res.blocks = [ - Block(res, i) for i in six.moves.range(res.desc.num_blocks()) - ] + res.blocks = [Block(res, i) for i in range(res.desc.num_blocks())] res._sync_with_cpp() res._copy_param_info_from(self) @@ -5854,18 +5844,16 @@ def _inference_optimize(self, prune_read_op=True): root_block._remove_var(var.name().encode()) # change all `is_test` attributes to True - for i in six.moves.range(res.desc.num_blocks()): + for i in range(res.desc.num_blocks()): block = res.desc.block(i) - for j in six.moves.range(block.op_size()): + for j in range(block.op_size()): op = block.op(j) if op.has_attr('is_test'): op._set_attr('is_test', True) if op.type() == "batch_norm": # Remove the output ReserveSpace of batch_norm if exists. op.remove_output("ReserveSpace") - res.blocks = [ - Block(res, i) for i in six.moves.range(res.desc.num_blocks()) - ] + res.blocks = [Block(res, i) for i in range(res.desc.num_blocks())] res._sync_with_cpp() return res @@ -5884,16 +5872,14 @@ def _remove_training_info(self, clip_extra=True): res = Program() res.desc = core.ProgramDesc(self.desc) - res.blocks = [ - Block(res, i) for i in six.moves.range(res.desc.num_blocks()) - ] + res.blocks = [Block(res, i) for i in range(res.desc.num_blocks())] res._sync_with_cpp() # Note: The op_role and op_role_var cann't be deleted currently, # and we will try to remove them in the future. common_clipped_attrs_list = ['op_callstack', 'with_quant_attr'] - for i in six.moves.range(res.desc.num_blocks()): + for i in range(res.desc.num_blocks()): block = res.desc.block(i) for var in block.all_vars(): var.clear_is_parameter() @@ -6016,7 +6002,7 @@ def parse_from_string(binary_str): """ p = Program() p.desc = core.ProgramDesc(binary_str) - p.blocks = [Block(p, i) for i in six.moves.range(p.desc.num_blocks())] + p.blocks = [Block(p, i) for i in range(p.desc.num_blocks())] p._sync_with_cpp() return p @@ -6033,7 +6019,7 @@ def _construct_from_desc(desc): """ p = Program() p.desc = desc - p.blocks = [Block(p, i) for i in six.moves.range(p.desc.num_blocks())] + p.blocks = [Block(p, i) for i in range(p.desc.num_blocks())] p._sync_with_cpp() return p @@ -6304,7 +6290,7 @@ def _copy_data_info_from(self, other, pruned_origin_block_id_map=None): if not pruned_origin_block_id_map: pruned_origin_block_id_map = { i: i - for i in six.moves.range(self.desc.num_blocks()) + for i in range(self.desc.num_blocks()) } # NOTE(zhiqiu): All vars in cloned program exist in original program. @@ -6556,8 +6542,7 @@ def set_state_dict(self, state_dict, scope=None): .format(name))) -@six.add_metaclass(ParameterMetaClass) -class Parameter(Variable): +class Parameter(Variable, metaclass=ParameterMetaClass): """ Parameter is derived from Variable. A parameter is a persistable Variable, and will be updated by optimizers after each iteration. diff --git a/python/paddle/fluid/graphviz.py b/python/paddle/fluid/graphviz.py index c8e5916568fa3..9579bff409efe 100644 --- a/python/paddle/fluid/graphviz.py +++ b/python/paddle/fluid/graphviz.py @@ -14,14 +14,13 @@ import os import random -import six import functools import subprocess import logging def crepr(v): - if isinstance(v, six.string_types): + if isinstance(v, str): return '"%s"' % v return str(v) @@ -104,7 +103,7 @@ def show(self, dot_path): stderr=subprocess.PIPE) def _rank_repr(self): - ranks = sorted(six.iteritems(self.rank_groups), + ranks = sorted(self.rank_groups.items(), key=functools.cmp_to_key( lambda a, b: a[1].priority > b[1].priority)) repr = [] @@ -149,7 +148,7 @@ def __str__(self): name=self.name, label=self.label, extra=',' + ','.join("%s=%s" % (key, crepr(value)) - for key, value in six.iteritems(self.attrs)) + for key, value in self.attrs.items()) if self.attrs else "") return reprs @@ -174,7 +173,7 @@ def __str__(self): target=self.target.name, extra="" if not self.attrs else "[" + ','.join("{}={}".format(attr[0], crepr(attr[1])) - for attr in six.iteritems(self.attrs)) + "]") + for attr in self.attrs.items()) + "]") return repr diff --git a/python/paddle/fluid/incubate/checkpoint/auto_checkpoint.py b/python/paddle/fluid/incubate/checkpoint/auto_checkpoint.py index b5dd3222b8ff5..e0d8062877ca6 100644 --- a/python/paddle/fluid/incubate/checkpoint/auto_checkpoint.py +++ b/python/paddle/fluid/incubate/checkpoint/auto_checkpoint.py @@ -17,7 +17,6 @@ import hashlib import json import os -import six import time import collections from threading import Thread, current_thread @@ -405,7 +404,7 @@ def _serialize(self, pop_keys=["restored_from", "checkpoint_epoch_no"]): # registerd exes d["exe_status"] = {} e = d["exe_status"] - for k, t in six.iteritems(self._exe_status): + for k, t in self._exe_status.items(): e[t._key] = t._serialize() return json.dumps(d) @@ -427,7 +426,7 @@ def deserialize(self, path): # exes status e = d["exe_status"] - for k, v in six.iteritems(e): + for k, v in e.items(): t = ExeTrainStatus() t._deserialize(v) self._exe_status[k] = t @@ -480,7 +479,7 @@ def _save_checkpoint(self): return e = self._exe_status - for k, t in six.iteritems(self._exe_status): + for k, t in self._exe_status.items(): m = PaddleModel(t._exe, t._program) p = self._checker.get_exe_checkpoint_path(t._hash_key) t._epoch_no = self.get() diff --git a/python/paddle/fluid/incubate/fleet/collective/__init__.py b/python/paddle/fluid/incubate/fleet/collective/__init__.py index da4fe609ca3e6..8887a75f1d348 100644 --- a/python/paddle/fluid/incubate/fleet/collective/__init__.py +++ b/python/paddle/fluid/incubate/fleet/collective/__init__.py @@ -32,7 +32,6 @@ import os import sys -import six import json import re import shutil @@ -285,7 +284,7 @@ def apply_gradients(self, params_grads): return self._optimizer.apply_gradients(params_grads) def _check_condition(self, name, **kwargs): - for k, v in six.iteritems(kwargs): + for k, v in kwargs.items(): if v is True: assert False, "you can't use %s and %s together" % (name, k) diff --git a/python/paddle/fluid/incubate/fleet/parameter_server/ir/pserver_pass.py b/python/paddle/fluid/incubate/fleet/parameter_server/ir/pserver_pass.py index 1e5d9b3242c38..65d186c855ced 100644 --- a/python/paddle/fluid/incubate/fleet/parameter_server/ir/pserver_pass.py +++ b/python/paddle/fluid/incubate/fleet/parameter_server/ir/pserver_pass.py @@ -13,7 +13,6 @@ # limitations under the License. import collections -import six from paddle.fluid import core from paddle.fluid.framework import Block @@ -95,7 +94,7 @@ def _get_pserver_grad_param_var(var, var_dict): """ grad_block = None - for _, g in six.iteritems(var_dict): + for _, g in var_dict.items(): if _orig_varname(g.name) == _orig_varname(var.name): # skip per trainer vars if g.name.find(".trainer_") == -1: @@ -113,7 +112,7 @@ def _get_pserver_grad_param_var(var, var_dict): program = optimize_block.program # Append the ops for parameters that do not need to be optimized / updated inputs = _get_input_map_from_op(origin_program.global_block().vars, opt_op) - for key, varlist in six.iteritems(inputs): + for key, varlist in inputs.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): @@ -134,7 +133,7 @@ def _get_pserver_grad_param_var(var, var_dict): outputs = _get_output_map_from_op(origin_program.global_block().vars, opt_op) - for key, varlist in six.iteritems(outputs): + for key, varlist in outputs.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): @@ -913,7 +912,7 @@ def _get_splited_name_and_shape(varname): pserver_vars = p_main_program.global_block().vars created_var_map = collections.OrderedDict() - for _, var in six.iteritems(pserver_vars): + for _, var in pserver_vars.items(): tmpvar = program.global_block()._clone_variable(var) created_var_map[var.name] = tmpvar diff --git a/python/paddle/fluid/incubate/fleet/parameter_server/ir/public.py b/python/paddle/fluid/incubate/fleet/parameter_server/ir/public.py index 6564bb3be2bbd..1778ace9c39b5 100755 --- a/python/paddle/fluid/incubate/fleet/parameter_server/ir/public.py +++ b/python/paddle/fluid/incubate/fleet/parameter_server/ir/public.py @@ -779,7 +779,7 @@ def _create_vars_from_blocklist(self, block_list): block_map[varname] = [] block_map[varname].append((int(offset), int(size))) - for varname, split in six.iteritems(block_map): + for varname, split in block_map.items(): orig_var = self.merged_variable_map[varname] if len(split) == 1: @@ -829,7 +829,7 @@ def _create_vars_from_blocklist(self, block_list): def _dispatcher(self): ps_dispatcher = RoundRobin(self.get_ps_endpoints()) ps_dispatcher.reset() - grad_var_mapping_items = list(six.iteritems(self.grad_var_mapping)) + grad_var_mapping_items = list(self.grad_var_mapping.items()) sparse_gradnames = [grad.name for _, grad in self.origin_sparse_pairs] diff --git a/python/paddle/fluid/incubate/fleet/parameter_server/ir/trainer_pass.py b/python/paddle/fluid/incubate/fleet/parameter_server/ir/trainer_pass.py index c54fe06720d68..acd337720ca91 100644 --- a/python/paddle/fluid/incubate/fleet/parameter_server/ir/trainer_pass.py +++ b/python/paddle/fluid/incubate/fleet/parameter_server/ir/trainer_pass.py @@ -14,7 +14,6 @@ # limitations under the License. import os -import six import collections import warnings import math @@ -1834,7 +1833,7 @@ def block_append_op(program, origin_program, block, op): merge_ordereddict = origin_program.global_block().vars.copy() merge_ordereddict.update(block.vars) inputs = _get_input_map_from_op(merge_ordereddict, op) - for key, varlist in six.iteritems(inputs): + for key, varlist in inputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: @@ -1847,7 +1846,7 @@ def block_append_op(program, origin_program, block, op): block._clone_variable(var, force_persistable=False) outputs = _get_output_map_from_op(origin_program.global_block().vars, op) - for key, varlist in six.iteritems(outputs): + for key, varlist in outputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: @@ -1898,7 +1897,7 @@ def add_vars_by_var_list(var_name_list, origin_program, program, block): def get_varlist_from_op_map(var_map): var_list = [] - for key, varlist in six.iteritems(var_map): + for key, varlist in var_map.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): diff --git a/python/paddle/fluid/incubate/fleet/utils/hdfs.py b/python/paddle/fluid/incubate/fleet/utils/hdfs.py index 3f45842f1ada5..41aff381959e2 100644 --- a/python/paddle/fluid/incubate/fleet/utils/hdfs.py +++ b/python/paddle/fluid/incubate/fleet/utils/hdfs.py @@ -24,7 +24,6 @@ import errno import time import logging -import six #from . import fs from paddle.distributed.fleet.utils.fs import FS, LocalFS, FSFileExistsError, FSFileNotExistsError, ExecuteError, FSTimeOut, FSShellCmdAborted from paddle.fluid import core @@ -91,7 +90,7 @@ def __init__( self.pre_commands.append(dfs) if configs: - for k, v in six.iteritems(configs): + for k, v in configs.items(): config_command = '-D%s=%s' % (k, v) self.pre_commands.append(config_command) diff --git a/python/paddle/fluid/io.py b/python/paddle/fluid/io.py index 6123df295fd2d..1af1d0a606d8e 100644 --- a/python/paddle/fluid/io.py +++ b/python/paddle/fluid/io.py @@ -15,7 +15,6 @@ import os import errno import warnings -import six import logging import pickle import contextlib @@ -1310,14 +1309,14 @@ def save_inference_model(dirname, # "./infer_model". """ - if isinstance(feeded_var_names, six.string_types): + if isinstance(feeded_var_names, str): feeded_var_names = [feeded_var_names] elif export_for_deployment: if len(feeded_var_names) > 0: # TODO(paddle-dev): polish these code blocks - if not (bool(feeded_var_names) and all( - isinstance(name, six.string_types) - for name in feeded_var_names)): + if not (bool(feeded_var_names) + and all(isinstance(name, str) + for name in feeded_var_names)): raise ValueError("'feed_var_names' should be a list of str.") if isinstance(target_vars, Variable): diff --git a/python/paddle/fluid/layer_helper.py b/python/paddle/fluid/layer_helper.py index 3ef128b145236..fc63bbea4e5aa 100644 --- a/python/paddle/fluid/layer_helper.py +++ b/python/paddle/fluid/layer_helper.py @@ -13,14 +13,13 @@ # limitations under the License. import copy -import six from .framework import Parameter, dtype_is_floating, _non_static_mode, OpProtoHolder, _global_flags from . import unique_name from paddle.fluid.initializer import Constant, Xavier from .param_attr import ParamAttr from . import core -from six.moves import zip + from .layer_helper_base import LayerHelperBase from .dygraph_utils import _append_activation_in_dygraph @@ -76,7 +75,7 @@ def multiple_param_attr(self, length): raise ValueError("parameter number mismatch") elif len(param_attr) == 1 and length != 1: tmp = [None] * length - for i in six.moves.range(length): + for i in range(length): tmp[i] = copy.deepcopy(param_attr[0]) param_attr = tmp return param_attr @@ -143,7 +142,7 @@ def append_activation(self, input_var): act = self.kwargs.get('act', None) if act is None: return input_var - if isinstance(act, six.string_types): + if isinstance(act, str): act = {'type': act} else: raise TypeError(str(act) + " should be unicode or str") diff --git a/python/paddle/fluid/layers/control_flow.py b/python/paddle/fluid/layers/control_flow.py index 0f0ae4b08232b..b800e67fe70f6 100755 --- a/python/paddle/fluid/layers/control_flow.py +++ b/python/paddle/fluid/layers/control_flow.py @@ -23,7 +23,6 @@ from .utils import assert_same_structure, map_structure, hold_mutable_vars, copy_mutable_vars, padding_to_same_structure, is_sequence, pack_sequence_as, flatten, to_sequence import numpy import warnings -import six from functools import reduce, partial from ..data_feeder import convert_dtype, check_variable_and_dtype, check_type, check_dtype from ... import compat as cpt @@ -143,7 +142,7 @@ def select_input_with_buildin_type(inputs, mask, name): raise RuntimeError( f"Exceptions throwed while doing select_input on {name}:\n{e}") - elif (isinstance(false_var, (support_ret_buildin_type)) + elif (isinstance(false_var, support_ret_buildin_type) and isinstance(false_var, type(true_var))): if false_var == true_var: return false_var @@ -962,7 +961,7 @@ def _complete_op(self): boot_memories = [] pre_memories = [] memories = [] - for _, mem in six.iteritems(self.memories): + for _, mem in self.memories.items(): boot_memories.append(mem.init) pre_memories.append(mem.pre_mem.name) assert mem.mem is not None, "%s should be updated in every step." % ( @@ -1205,7 +1204,7 @@ def _complete(self): }) -support_ret_buildin_type = (bool, float, six.integer_types) +support_ret_buildin_type = (bool, float, int) def assign_skip_lod_tensor_array(input, output): diff --git a/python/paddle/fluid/layers/detection.py b/python/paddle/fluid/layers/detection.py index 696673fc65d93..80754898e72ca 100644 --- a/python/paddle/fluid/layers/detection.py +++ b/python/paddle/fluid/layers/detection.py @@ -29,7 +29,6 @@ from ... import compat as cpt from ..data_feeder import check_variable_and_dtype, check_type, check_dtype import math -import six import numpy as np from functools import reduce from ..data_feeder import convert_dtype, check_variable_and_dtype, check_type, check_dtype @@ -2199,7 +2198,7 @@ def multi_box_head(inputs, 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 @@ -2338,7 +2337,7 @@ def _is_list_or_tuple_and_equal(data, length, err_info): 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/python/paddle/fluid/layers/io.py b/python/paddle/fluid/layers/io.py index c526bd655d931..5c62dc6d61d66 100644 --- a/python/paddle/fluid/layers/io.py +++ b/python/paddle/fluid/layers/io.py @@ -110,11 +110,11 @@ def data(name, """ helper = LayerHelper('data', **locals()) - check_type(name, 'name', (six.binary_type, six.text_type), 'data') + check_type(name, 'name', (bytes, str), 'data') check_type(shape, 'shape', (list, tuple), 'data') shape = list(shape) - for i in six.moves.range(len(shape)): + for i in range(len(shape)): if shape[i] is None: shape[i] = -1 append_batch_size = False diff --git a/python/paddle/fluid/layers/layer_function_generator.py b/python/paddle/fluid/layers/layer_function_generator.py index 325c3880616e7..3beb3bae352c1 100755 --- a/python/paddle/fluid/layers/layer_function_generator.py +++ b/python/paddle/fluid/layers/layer_function_generator.py @@ -17,7 +17,7 @@ import warnings import string -from six.moves import cStringIO +from io import StringIO from ..proto import framework_pb2 from ..framework import OpProtoHolder, Variable, core, convert_np_dtype_to_dtype_, _non_static_mode, in_dygraph_mode, _in_legacy_dygraph from ..layer_helper import LayerHelper @@ -80,7 +80,7 @@ def _generate_doc_string_(op_proto, if not isinstance(op_proto, framework_pb2.OpProto): raise TypeError("OpProto should be `framework_pb2.OpProto`") - buf = cStringIO() + buf = StringIO() buf.write(escape_math(op_proto.comment)) buf.write('\nArgs:\n') for each_input in op_proto.inputs: diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py index b7814bc19c475..89f784368229c 100755 --- a/python/paddle/fluid/layers/nn.py +++ b/python/paddle/fluid/layers/nn.py @@ -20,7 +20,6 @@ import warnings import numpy as np -import six import paddle from ..layer_helper import LayerHelper @@ -6336,7 +6335,7 @@ def one_hot(input, depth, allow_out_of_range=False): helper = LayerHelper("one_hot", **locals()) check_variable_and_dtype(input, 'input', ['int32', 'int64'], 'one_hot') - check_type(depth, 'depth', (six.integer_types, Variable), 'one_hot') + check_type(depth, 'depth', (int, Variable), 'one_hot') one_hot_out = helper.create_variable_for_type_inference(dtype='float32') if not isinstance(depth, Variable): diff --git a/python/paddle/fluid/layers/rnn.py b/python/paddle/fluid/layers/rnn.py index 1c375e37a4f35..087cffcfe3b32 100644 --- a/python/paddle/fluid/layers/rnn.py +++ b/python/paddle/fluid/layers/rnn.py @@ -151,8 +151,7 @@ def _is_shape_sequence(seq): # TODO: Add check for the illegal if isinstance(seq, dict): return True - return (isinstance(seq, Sequence) - and not isinstance(seq, six.string_types)) + return (isinstance(seq, Sequence) and not isinstance(seq, str)) class Shape(object): diff --git a/python/paddle/fluid/layers/utils.py b/python/paddle/fluid/layers/utils.py index cfb2615cc58ad..28d00161b26eb 100644 --- a/python/paddle/fluid/layers/utils.py +++ b/python/paddle/fluid/layers/utils.py @@ -82,7 +82,7 @@ def is_sequence(seq): """ if isinstance(seq, dict): return True - return (isinstance(seq, Sequence) and not isinstance(seq, six.string_types)) + return (isinstance(seq, Sequence) and not isinstance(seq, str)) def _hash_with_id(*args): @@ -99,7 +99,7 @@ def _sorted(dict_): Returns a sorted list of the dict keys, with error if keys not sortable. """ try: - return sorted(six.iterkeys(dict_)) + return sorted(dict_.keys()) except TypeError: raise TypeError("nest only supports dicts with sortable keys.") @@ -159,11 +159,10 @@ def _sequence_like(instance, args): # ordered and plain dicts (e.g., flattening a dict but using a # corresponding `OrderedDict` to pack it back). result = dict(zip(_sorted(instance), args)) - return type(instance)( - (key, result[key]) for key in six.iterkeys(instance)) + return type(instance)((key, result[key]) for key in instance.keys()) elif (isinstance(instance, tuple) and hasattr(instance, "_fields") and isinstance(instance._fields, Sequence) - and all(isinstance(f, six.string_types) for f in instance._fields)): + and all(isinstance(f, str) for f in instance._fields)): # This is a namedtuple return type(instance)(*args) else: @@ -256,8 +255,8 @@ def _recursive_assert_same_structure(nest1, nest2, check_types): "structure has type %s, while second structure has type %s." % (type_nest1, type_nest2)) if isinstance(nest1, dict): - keys1 = set(six.iterkeys(nest1)) - keys2 = set(six.iterkeys(nest2)) + keys1 = set(nest1.keys()) + keys2 = set(nest2.keys()) if keys1 != keys2: raise ValueError( "The two dictionaries don't have the same set of keys. First " @@ -382,7 +381,7 @@ def _convert_to_tensor_list(old_list, dtype="int32"): ele.stop_gradient = True new_list_tensor.append(ele) else: - assert isinstance(ele, six.integer_types) + assert isinstance(ele, int) temp_out = fill_constant([1], dtype, ele, force_cpu=True) new_list_tensor.append(temp_out) return new_list_tensor @@ -414,7 +413,7 @@ def check_shape(shape): raise ValueError( "All elements in ``shape`` must be positive when it's a list or tuple" ) - if not isinstance(ele, six.integer_types): + if not isinstance(ele, int): raise TypeError( "All elements in ``shape`` must be integers when it's a list or tuple" ) diff --git a/python/paddle/fluid/metrics.py b/python/paddle/fluid/metrics.py index 85b794c237a09..f14692f79ebb7 100644 --- a/python/paddle/fluid/metrics.py +++ b/python/paddle/fluid/metrics.py @@ -17,8 +17,6 @@ import numpy as np import copy -import warnings -import six from .layer_helper import LayerHelper from .initializer import Constant @@ -118,10 +116,9 @@ def reset(self): """ states = { attr: value - for attr, value in six.iteritems(self.__dict__) - if not attr.startswith("_") + for attr, value in self.__dict__.items() if not attr.startswith("_") } - for attr, value in six.iteritems(states): + for attr, value in states.items(): if isinstance(value, int): setattr(self, attr, 0) elif isinstance(value, float): @@ -147,8 +144,7 @@ def get_config(self): """ states = { attr: value - for attr, value in six.iteritems(self.__dict__) - if not attr.startswith("_") + for attr, value in self.__dict__.items() if not attr.startswith("_") } config = {} config.update({"name": self._name, "states": copy.deepcopy(states)}) diff --git a/python/paddle/fluid/nets.py b/python/paddle/fluid/nets.py index 649bf2658d431..a61487ee71d4c 100644 --- a/python/paddle/fluid/nets.py +++ b/python/paddle/fluid/nets.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six from . import layers from .data_feeder import check_variable_and_dtype, convert_dtype from ..utils import deprecated @@ -227,7 +226,7 @@ def __extend_list__(obj): conv_with_batchnorm = __extend_list__(conv_with_batchnorm) conv_batchnorm_drop_rate = __extend_list__(conv_batchnorm_drop_rate) - for i in six.moves.range(len(conv_num_filter)): + for i in range(len(conv_num_filter)): local_conv_act = conv_act if conv_with_batchnorm[i]: local_conv_act = None diff --git a/python/paddle/fluid/op.py b/python/paddle/fluid/op.py index d29be87d84c20..bdcdad1218e41 100644 --- a/python/paddle/fluid/op.py +++ b/python/paddle/fluid/op.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six import paddle.fluid.core as core import paddle.fluid.proto.framework_pb2 as framework_pb2 @@ -27,13 +26,13 @@ def get_all_op_protos(): protostrs = core.get_all_op_protos() ret_values = [] for pbstr in protostrs: - op_proto = framework_pb2.OpProto.FromString(six.binary_type(pbstr)) + op_proto = framework_pb2.OpProto.FromString(bytes(pbstr)) ret_values.append(op_proto) return ret_values def is_str(s): - return isinstance(s, six.string_types) + return isinstance(s, str) class OpDescCreationMethod(object): diff --git a/python/paddle/fluid/optimizer.py b/python/paddle/fluid/optimizer.py index 4de37354230fb..4471eb9dcbc75 100755 --- a/python/paddle/fluid/optimizer.py +++ b/python/paddle/fluid/optimizer.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six import os import logging from collections import defaultdict @@ -6227,8 +6226,7 @@ def _set_checkpoints(self, checkpoints): ), "_checkpoints should be a list of Variable or a list of String" for ckpt in checkpoints: assert ( - isinstance(ckpt, six.string_types) - or isinstance(ckpt, Variable) + isinstance(ckpt, str) or isinstance(ckpt, Variable) ), "_checkpoints should be a list of Variable or a list of String" self._checkpoints = checkpoints diff --git a/python/paddle/fluid/param_attr.py b/python/paddle/fluid/param_attr.py index fcc546bf39f7d..b43625759e37a 100644 --- a/python/paddle/fluid/param_attr.py +++ b/python/paddle/fluid/param_attr.py @@ -12,10 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six -import warnings -import sys - from .initializer import Initializer, Xavier, Constant from .regularizer import WeightDecayRegularizer from paddle.fluid.data_feeder import check_type @@ -172,7 +168,7 @@ def _to_attr(arg): return [ParamAttr._to_attr(a) for a in arg] elif isinstance(arg, ParamAttr): return arg - elif isinstance(arg, six.string_types): + elif isinstance(arg, str): return ParamAttr(name=arg) elif isinstance(arg, Initializer): return ParamAttr(initializer=arg) diff --git a/python/paddle/fluid/profiler.py b/python/paddle/fluid/profiler.py index c5153931043ec..827c8b42a5b52 100644 --- a/python/paddle/fluid/profiler.py +++ b/python/paddle/fluid/profiler.py @@ -15,7 +15,6 @@ from . import core from .wrapped_decorator import signature_safe_contextmanager import os -import six import sys from paddle.utils.deprecated import deprecated diff --git a/python/paddle/fluid/tests/unittests/benchmark.py b/python/paddle/fluid/tests/unittests/benchmark.py index 9e6278dd32f88..3a27fca61efee 100644 --- a/python/paddle/fluid/tests/unittests/benchmark.py +++ b/python/paddle/fluid/tests/unittests/benchmark.py @@ -14,7 +14,6 @@ import numpy as np import time -import six from paddle.fluid.op import Operator from op_test import OpTest @@ -38,8 +37,7 @@ def _assert_cpu_gpu_same(self, cpu_outs, gpu_outs, fetch_list, atol): expect_t = np.array(item_cpu_out) actual = item_gpu_out actual_t = np.array(item_gpu_out) - var_name = variable if isinstance( - variable, six.string_types) else variable.name + var_name = variable if isinstance(variable, str) else variable.name np.testing.assert_allclose(actual_t, expect_t, rtol=1e-05, @@ -49,7 +47,7 @@ def _assert_cpu_gpu_same(self, cpu_outs, gpu_outs, fetch_list, atol): def _get_input_names(self): inputs = [] - for name, value in six.iteritems(self.inputs): + for name, value in self.inputs.items(): if isinstance(value, list): inputs.extend([sub_name for sub_name, _ in value]) inputs.append(name) @@ -57,7 +55,7 @@ def _get_input_names(self): def _get_output_names(self): outputs = [] - for var_name, var in six.iteritems(self.outputs): + for var_name, var in self.outputs.items(): if isinstance(var, list): for sub_var_name, sub_var in var: outputs.append(sub_var_name) diff --git a/python/paddle/fluid/tests/unittests/collective/fleet/parallel_dygraph_transformer.py b/python/paddle/fluid/tests/unittests/collective/fleet/parallel_dygraph_transformer.py index 2d636c86dd7d2..afe7799632d3a 100644 --- a/python/paddle/fluid/tests/unittests/collective/fleet/parallel_dygraph_transformer.py +++ b/python/paddle/fluid/tests/unittests/collective/fleet/parallel_dygraph_transformer.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six import paddle import paddle.fluid as fluid @@ -824,7 +823,7 @@ def fake_data_reader(): def __reader__(): iteration = TrainTaskConfig.batch_size * batch_num - for _ in six.moves.range(iteration): + for _ in range(iteration): # random data np.random.seed = 90 src_word_np = np.arange(1, seq_len + 1).reshape([seq_len diff --git a/python/paddle/fluid/tests/unittests/dist_save_load.py b/python/paddle/fluid/tests/unittests/dist_save_load.py index b88e43ebad037..8d0083aaffea9 100644 --- a/python/paddle/fluid/tests/unittests/dist_save_load.py +++ b/python/paddle/fluid/tests/unittests/dist_save_load.py @@ -17,7 +17,6 @@ import numpy as np import pickle -import six import paddle import paddle.fluid as fluid @@ -149,7 +148,7 @@ def get_data(): if save_mode == "LOCAL": if need_save: - for _ in six.moves.xrange(RUN_STEP): + for _ in range(RUN_STEP): loss, = exe.run(fetch_list=[avg_cost.name], feed=feeder.feed(get_data())) if need_save and model_dir: @@ -163,14 +162,14 @@ def get_data(): skip_steps = int(os.getenv("SKIP_STEPS")) loss = None if need_save: - for idx in six.moves.xrange(8): + for idx in range(8): loss, = exe.run(fetch_list=[avg_cost.name], feed=feeder.feed(get_data())) if need_save and model_dir and idx == skip_steps and args.trainer_id == 0: io.save_persistables(startup_exe, model_dir, trainer_prog) else: - for idx in six.moves.xrange(8): + for idx in range(8): data = get_data() if idx <= skip_steps: continue diff --git a/python/paddle/fluid/tests/unittests/dist_text_classification.py b/python/paddle/fluid/tests/unittests/dist_text_classification.py index 9b29d6b138b69..c8315161f0fd9 100644 --- a/python/paddle/fluid/tests/unittests/dist_text_classification.py +++ b/python/paddle/fluid/tests/unittests/dist_text_classification.py @@ -15,7 +15,6 @@ import paddle import paddle.fluid as fluid import os -import six import tarfile import string import re @@ -154,9 +153,8 @@ def tokenize(pattern): while tf != None: if bool(pattern.match(tf.name)): # newline and punctuations removal and ad-hoc tokenization. - yield tarf.extractfile(tf).read().rstrip( - six.b("\n\r")).translate(None, six.b( - string.punctuation)).lower().split() + yield tarf.extractfile(tf).read().rstrip(b'\n\r').translate( + None, string.punctuation.encode('latin-1')).lower().split() tf = tarf.next() diff --git a/python/paddle/fluid/tests/unittests/dist_transformer.py b/python/paddle/fluid/tests/unittests/dist_transformer.py index 8b52f1f7341d4..23bcd1957e0f4 100644 --- a/python/paddle/fluid/tests/unittests/dist_transformer.py +++ b/python/paddle/fluid/tests/unittests/dist_transformer.py @@ -15,7 +15,7 @@ import numpy as np import time import os -import six +import functools import time from functools import partial from os.path import expanduser @@ -306,7 +306,7 @@ def pad_batch_data(insts, """ return_list = [] max_len = max(len(inst) for inst in insts) - num_token = six.moves.reduce(lambda x, y: x + y, + num_token = functools.reduce(lambda x, y: x + y, [len(inst) for inst in insts]) if return_num_token else 0 # Any token included in dict can be used to pad, since the paddings' loss @@ -547,7 +547,7 @@ def train_loop(exe, train_progm, dev_count, sum_cost, avg_cost, lr_scheduler, np.log(TrainTaskConfig.label_smooth_eps / (ModelHyperParams.trg_vocab_size - 1) + 1e-20)) init = False - for pass_id in six.moves.xrange(TrainTaskConfig.pass_num): + for pass_id in range(TrainTaskConfig.pass_num): pass_start_time = time.time() for batch_id, data in enumerate(train_data()): if batch_id >= RUN_STEP: diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py index 7192b8231f8cd..f6b71eb726542 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_dict.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import numpy as np import unittest @@ -106,7 +105,7 @@ def forward(self, input, max_len=4): # Test to call function defined outside of class. def update_cache(cache): - for k, val in six.iteritems(cache): + for k, val in cache.items(): cache[k] = fluid.layers.softmax(val) return cache diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_op_attr.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_op_attr.py index e6a3a74b0605e..9bdc6cfcb2c85 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_op_attr.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_op_attr.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import paddle import unittest @@ -105,8 +104,7 @@ def check_op_attrs(self, main_program): ops = cur_block.ops for op in ops: if op.type not in self.infos: continue - for attr_name, expect_vals in six.iteritems( - self.infos[op.type]): + for attr_name, expect_vals in self.infos[op.type].items(): op_vals = op.desc.attr(attr_name) if not isinstance(expect_vals, list): expect_vals = [expect_vals] diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/transformer_util.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/transformer_util.py index bf06fb12bdd10..3b4d1438c5f00 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/transformer_util.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/transformer_util.py @@ -14,7 +14,6 @@ import pickle import warnings -import six from functools import partial import numpy as np @@ -271,11 +270,10 @@ def load(program, model_path, executor=None, var_list=None): "An UnicodeDecodeError is catched, which might be caused by loading " "a python2 saved model. Encoding of pickle.load would be set and " "load again automatically.") - if six.PY3: - load_bak = pickle.load - pickle.load = partial(load_bak, encoding="latin1") - fluid.load(program, model_path, executor, var_list) - pickle.load = load_bak + load_bak = pickle.load + pickle.load = partial(load_bak, encoding="latin1") + fluid.load(program, model_path, executor, var_list) + pickle.load = load_bak def load_dygraph(model_path, keep_name_table=False): @@ -291,10 +289,9 @@ def load_dygraph(model_path, keep_name_table=False): "An UnicodeDecodeError is catched, which might be caused by loading " "a python2 saved model. Encoding of pickle.load would be set and " "load again automatically.") - if six.PY3: - load_bak = pickle.load - pickle.load = partial(load_bak, encoding="latin1") - para_dict, opti_dict = fluid.load_dygraph( - model_path, keep_name_table=keep_name_table) - pickle.load = load_bak - return para_dict, opti_dict + load_bak = pickle.load + pickle.load = partial(load_bak, encoding="latin1") + para_dict, opti_dict = fluid.load_dygraph( + model_path, keep_name_table=keep_name_table) + pickle.load = load_bak + return para_dict, opti_dict diff --git a/python/paddle/fluid/tests/unittests/fake_reader.py b/python/paddle/fluid/tests/unittests/fake_reader.py index f97884218eb36..b1e90d8b1879e 100644 --- a/python/paddle/fluid/tests/unittests/fake_reader.py +++ b/python/paddle/fluid/tests/unittests/fake_reader.py @@ -13,7 +13,6 @@ # limitations under the License. import numpy as np -import six def fake_imdb_reader(word_dict_size, @@ -23,7 +22,7 @@ def fake_imdb_reader(word_dict_size, class_dim=2): def __reader__(): - for _ in six.moves.range(sample_num): + for _ in range(sample_num): length = np.random.random_integers(low=lower_seq_len, high=upper_seq_len, size=[1])[0] diff --git a/python/paddle/fluid/tests/unittests/feed_data_reader.py b/python/paddle/fluid/tests/unittests/feed_data_reader.py index 9ea7e88f66eb0..6d7e73ac3c09a 100644 --- a/python/paddle/fluid/tests/unittests/feed_data_reader.py +++ b/python/paddle/fluid/tests/unittests/feed_data_reader.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import paddle.fluid as fluid from paddle.fluid.framework import Variable @@ -44,13 +43,13 @@ def _feed_executor(self): next_data = next(self._iter) feed_data = dict() assert len(self._feed_list) == len(next_data) - for key, value in six.moves.zip(self._feed_list, next_data): + for key, value in zip(self._feed_list, next_data): feed_data[key] = value return feed_data def _feed_parallel_executor(self, device_num): feed_data = [] - for _ in six.moves.range(device_num): + for _ in range(device_num): feed_data.append(self._feed_executor()) return feed_data diff --git a/python/paddle/fluid/tests/unittests/gradient_checker.py b/python/paddle/fluid/tests/unittests/gradient_checker.py index b947ff3bc4af3..d928abe2ca99c 100644 --- a/python/paddle/fluid/tests/unittests/gradient_checker.py +++ b/python/paddle/fluid/tests/unittests/gradient_checker.py @@ -13,7 +13,6 @@ # limitations under the License. """This is the lib for gradient checker unittest.""" -import six import numpy as np from itertools import product import paddle @@ -139,7 +138,7 @@ def run(): np_type = dtype_to_np_dtype(x.dtype) jacobian = [make_jacobian(x, _product(yi.shape), np_type) for yi in y] - for i in six.moves.xrange(x_size): + for i in range(x_size): orig = _get_item(x_t, i, np_type) x_pos = orig + delta _set_item(x_t, i, x_pos, np_type) @@ -151,7 +150,7 @@ def run(): _set_item(x_t, i, orig, np_type) - for j in six.moves.xrange(len(y)): + for j in range(len(y)): jacobian[j][i, :] = (y_pos[j] - y_neg[j]) / delta / 2. return jacobian @@ -204,12 +203,12 @@ def _compute_analytical_jacobian(program, x, y, place, scope): filted = [(i, dxi) for i, dxi in enumerate(dx) if dxi is not None] filted_idx, filted_dx = zip(*filted) - for i in six.moves.xrange(y_size): + for i in range(y_size): _set_item(dy_t, i, 1, np_type) dx_res = exe.run(program, scope=scope, fetch_list=filted_dx) - for j in six.moves.xrange(len(filted_dx)): + for j in range(len(filted_dx)): dx_idx = filted_idx[j] if dx_res[j] is not None: jacobian[dx_idx][:, i] = dx_res[j].flatten() @@ -551,7 +550,7 @@ def get_static_double_grad(x, program = fluid.default_main_program() scope = fluid.executor.global_scope() y_grads = [] - for i in six.moves.xrange(len(y)): + for i in range(len(y)): yi = y[i] dyi_name = _append_grad_suffix_(yi.name) np_type = dtype_to_np_dtype(yi.dtype) @@ -768,7 +767,7 @@ def fail_test(msg): "please check the python api unit test used." raise RuntimeError(msg) - for i in six.moves.xrange(len(static_double_grad)): + for i in range(len(static_double_grad)): if not np.allclose(static_double_grad[i], eager_double_grad[i], rtol, atol): msg = 'Check eager double result fail. Mismatch between static_graph double grad ' \ @@ -802,7 +801,7 @@ def get_static_triple_grad(x, program = fluid.default_main_program() scope = fluid.executor.global_scope() y_grads = [] - for i in six.moves.xrange(len(y)): + for i in range(len(y)): yi = y[i] dyi_name = _append_grad_suffix_(yi.name) np_type = dtype_to_np_dtype(yi.dtype) @@ -937,7 +936,7 @@ def fail_test(msg): "please check the python api unit test used." raise RuntimeError(msg) - for i in six.moves.xrange(len(static_triple_grad)): + for i in range(len(static_triple_grad)): if not np.allclose(static_triple_grad[i], eager_triple_grad[i], rtol, atol): msg = 'Check eager double result fail. Mismatch between static_graph double grad ' \ diff --git a/python/paddle/fluid/tests/unittests/ir/pass_test.py b/python/paddle/fluid/tests/unittests/ir/pass_test.py index 37b9dcf54613f..0336dcb2da548 100644 --- a/python/paddle/fluid/tests/unittests/ir/pass_test.py +++ b/python/paddle/fluid/tests/unittests/ir/pass_test.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import random import unittest import warnings @@ -104,8 +103,7 @@ def _apply_ir_passes(self): for p in pass_builder.all_passes(): p.apply(graph) opt_program.blocks = [ - Block(opt_program, i) - for i in six.moves.range(opt_program.desc.num_blocks()) + Block(opt_program, i) for i in range(opt_program.desc.num_blocks()) ] opt_program._sync_with_cpp() return opt_program @@ -147,7 +145,7 @@ def check_output_with_place(self, place, startup_on_cpu=False, atol=1e-5): len(self.fetch_list) == len(outs_opt), "Checking the number of fetchs failed. Expected: {}, Received: {}". format(len(self.fetch_list), len(outs_opt))) - for i in six.moves.xrange(len(self.fetch_list)): + for i in range(len(self.fetch_list)): is_allclose = np.allclose(outs_opt[i], outs[i], atol=atol) if not is_allclose: a = outs_opt[i] @@ -207,7 +205,7 @@ def check_program(self, program=None): self.main_program.num_blocks, program.num_blocks)) is_different = False - for i in six.moves.xrange(program.num_blocks): + for i in range(program.num_blocks): if len(self.main_program.block(i).ops) != len(program.block(i).ops): # The number of ops in the block i of the origin program and # the optimized program is different. diff --git a/python/paddle/fluid/tests/unittests/ir/test_ir_subgraph_python_interface.py b/python/paddle/fluid/tests/unittests/ir/test_ir_subgraph_python_interface.py index 07be10deaa892..56f2e5e0a2450 100644 --- a/python/paddle/fluid/tests/unittests/ir/test_ir_subgraph_python_interface.py +++ b/python/paddle/fluid/tests/unittests/ir/test_ir_subgraph_python_interface.py @@ -15,7 +15,6 @@ import unittest import paddle import paddle.fluid as fluid -import six from paddle.fluid.framework import IrGraph from paddle.fluid.tests.unittests.op_test import OpTestTool @@ -37,7 +36,7 @@ def linear_fc(num): dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = data - for _ in six.moves.xrange(num): + for _ in range(num): hidden = fluid.layers.fc(hidden, size=128, act='relu') loss = fluid.layers.cross_entropy(input=hidden, label=label) loss = paddle.mean(loss) diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py index 9c550fc25f9cd..f7d6763bddc60 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_activation_bf16_mkldnn_op.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import abc import unittest import numpy as np @@ -24,8 +23,7 @@ @OpTestTool.skip_if_not_cpu_bf16() -@six.add_metaclass(abc.ABCMeta) -class MKLDNNBF16ActivationOp(object): +class MKLDNNBF16ActivationOp(metaclass=abc.ABCMeta): @abc.abstractmethod def config(self): diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py b/python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py index 3f80d95a86633..c9c681ae38b0e 100755 --- a/python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py b/python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py index e70355958c0ec..727f3011ff14c 100755 --- a/python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py @@ -19,7 +19,6 @@ import signal import time from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_api.py b/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_api.py index aff6689a21aec..7ea3a2f00c53e 100644 --- a/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_api.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_api.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_op.py b/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_op.py index 4692a87872db6..19da310741d6e 100644 --- a/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_op.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_allreduce_op.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_api.py b/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_api.py index 9e8af8cb5b253..c14456704dfc8 100644 --- a/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_api.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_api.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_op.py b/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_op.py index 2656618a093e9..3dd50f09a8f5e 100755 --- a/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_op.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_broadcast_op.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_reduce_api.py b/python/paddle/fluid/tests/unittests/mlu/collective_reduce_api.py index d2e43a6eef4f9..4f257d07fa331 100644 --- a/python/paddle/fluid/tests/unittests/mlu/collective_reduce_api.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_reduce_api.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/collective_reduce_op.py b/python/paddle/fluid/tests/unittests/mlu/collective_reduce_op.py index 98b9117efad59..733440cb0de47 100644 --- a/python/paddle/fluid/tests/unittests/mlu/collective_reduce_op.py +++ b/python/paddle/fluid/tests/unittests/mlu/collective_reduce_op.py @@ -20,7 +20,6 @@ import time import socket from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/parallel_dygraph_sync_batch_norm.py b/python/paddle/fluid/tests/unittests/mlu/parallel_dygraph_sync_batch_norm.py index 4c6ba625ca80c..b562f9ce4acaf 100644 --- a/python/paddle/fluid/tests/unittests/mlu/parallel_dygraph_sync_batch_norm.py +++ b/python/paddle/fluid/tests/unittests/mlu/parallel_dygraph_sync_batch_norm.py @@ -16,7 +16,6 @@ import contextlib import unittest import numpy as np -import six import pickle import paddle diff --git a/python/paddle/fluid/tests/unittests/mlu/sync_batch_norm_op_mlu.py b/python/paddle/fluid/tests/unittests/mlu/sync_batch_norm_op_mlu.py index fbec31a16fa7a..eb410f14f540a 100644 --- a/python/paddle/fluid/tests/unittests/mlu/sync_batch_norm_op_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/sync_batch_norm_op_mlu.py @@ -21,7 +21,6 @@ import signal import time from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_base_mlu.py b/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_base_mlu.py index 720ee9f47d87f..0d73e5af5c5b8 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_base_mlu.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_base_mlu.py @@ -17,7 +17,6 @@ import time import argparse import os -import six import sys sys.path.append("..") @@ -29,7 +28,6 @@ import paddle.fluid as fluid import paddle.fluid.unique_name as nameGen from paddle.fluid import core -from six import string_types import paddle from op_test import OpTest, _set_use_system_allocator @@ -56,7 +54,7 @@ def get_model(self, "get model should be implemented by child class.") def wait_server_ready(self, endpoints): - assert not isinstance(endpoints, string_types) + assert not isinstance(endpoints, str) while True: all_ok = True not_ready_endpoints = [] @@ -159,7 +157,7 @@ def _compare(self, args, place, layout, only_forward): sys.stderr.write("len(sync_bn_fetches): " + str(len(sync_bn_fetches)) + "\n") - for i in six.moves.xrange(0, len(sync_bn_fetches)): + for i in range(0, len(sync_bn_fetches)): sys.stderr.write("i: " + str(i) + "\n") sys.stderr.write("fetch_names[i]): " + fetch_names[i] + "\n") diff --git a/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_op_mlu_extra.py b/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_op_mlu_extra.py index 9879fb8b57573..6488f757c50f8 100644 --- a/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_op_mlu_extra.py +++ b/python/paddle/fluid/tests/unittests/mlu/test_sync_batch_norm_op_mlu_extra.py @@ -20,7 +20,6 @@ import numpy as np import os import sys -import six import paddle import paddle.fluid.core as core import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/npu/collective_identity_op_npu.py b/python/paddle/fluid/tests/unittests/npu/collective_identity_op_npu.py index f02a548c0bffa..e4ed24a73f5ea 100644 --- a/python/paddle/fluid/tests/unittests/npu/collective_identity_op_npu.py +++ b/python/paddle/fluid/tests/unittests/npu/collective_identity_op_npu.py @@ -19,7 +19,6 @@ import signal import time from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/npu/sync_batch_norm_op_npu.py b/python/paddle/fluid/tests/unittests/npu/sync_batch_norm_op_npu.py index a0972604c2984..84f93bc88a18c 100644 --- a/python/paddle/fluid/tests/unittests/npu/sync_batch_norm_op_npu.py +++ b/python/paddle/fluid/tests/unittests/npu/sync_batch_norm_op_npu.py @@ -21,7 +21,6 @@ import signal import time from contextlib import closing -from six import string_types import math import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/npu/test_collective_base_npu.py b/python/paddle/fluid/tests/unittests/npu/test_collective_base_npu.py index a3dc093e4641f..fbbb64aaf078b 100644 --- a/python/paddle/fluid/tests/unittests/npu/test_collective_base_npu.py +++ b/python/paddle/fluid/tests/unittests/npu/test_collective_base_npu.py @@ -26,7 +26,6 @@ import paddle.fluid as fluid import paddle.fluid.unique_name as nameGen from paddle.fluid import core -from six import string_types class TestCollectiveRunnerBase(object): @@ -36,7 +35,7 @@ def get_model(self, train_prog, startup_prog): "get model should be implemented by child class.") def wait_server_ready(self, endpoints): - assert not isinstance(endpoints, string_types) + assert not isinstance(endpoints, str) while True: all_ok = True not_ready_endpoints = [] diff --git a/python/paddle/fluid/tests/unittests/npu/test_run_program_op_npu.py b/python/paddle/fluid/tests/unittests/npu/test_run_program_op_npu.py index 5401228d2835c..52b95c7d9dcff 100644 --- a/python/paddle/fluid/tests/unittests/npu/test_run_program_op_npu.py +++ b/python/paddle/fluid/tests/unittests/npu/test_run_program_op_npu.py @@ -15,7 +15,6 @@ import contextlib import unittest import numpy as np -import six import sys sys.path.append("..") @@ -111,7 +110,7 @@ def check_output_with_place(self, place): actual_outs = self.calc_dygraph_output(place) # Step 2. compare output - for expect_v, actual_v in six.moves.zip(self.expect_outs, actual_outs): + for expect_v, actual_v in zip(self.expect_outs, actual_outs): np.testing.assert_allclose(expect_v, actual_v.numpy(), rtol=1e-05, @@ -122,8 +121,7 @@ def check_grad_with_place(self, place): actual_grads = self.calc_dygraph_grad(place) # Step 2. compare grads - for expect_v, actual_v in six.moves.zip(self.expect_grads, - actual_grads): + for expect_v, actual_v in zip(self.expect_grads, actual_grads): np.testing.assert_array_almost_equal(expect_v, actual_v) np.testing.assert_allclose(expect_v, actual_v, @@ -238,7 +236,7 @@ def calc_dygraph_grad(self, place): def _get_grad_vartype(self, name): assert self.program_desc is not None grad_name = name + core.grad_var_suffix() - for i in six.moves.range(self.program_desc.num_blocks()): + for i in range(self.program_desc.num_blocks()): block = self.program_desc.block(i) var_desc = block.find_var_recursive(grad_name.encode()) return var_desc.type() if var_desc is not None else None diff --git a/python/paddle/fluid/tests/unittests/npu/test_sync_batch_norm_base_npu.py b/python/paddle/fluid/tests/unittests/npu/test_sync_batch_norm_base_npu.py index 6d0d49186d417..30aa594114307 100644 --- a/python/paddle/fluid/tests/unittests/npu/test_sync_batch_norm_base_npu.py +++ b/python/paddle/fluid/tests/unittests/npu/test_sync_batch_norm_base_npu.py @@ -17,7 +17,6 @@ import time import argparse import os -import six import sys sys.path.append("..") @@ -29,7 +28,6 @@ import paddle.fluid as fluid import paddle.fluid.unique_name as nameGen from paddle.fluid import core -from six import string_types import paddle from paddle.fluid.tests.unittests.op_test import OpTest, _set_use_system_allocator @@ -56,7 +54,7 @@ def get_model(self, "get model should be implemented by child class.") def wait_server_ready(self, endpoints): - assert not isinstance(endpoints, string_types) + assert not isinstance(endpoints, str) while True: all_ok = True not_ready_endpoints = [] @@ -163,7 +161,7 @@ def _compare(self, args, place, layout, only_forward): sys.stderr.write("len(sync_bn_fetches): " + str(len(sync_bn_fetches)) + "\n") - for i in six.moves.xrange(0, len(sync_bn_fetches)): + for i in range(0, len(sync_bn_fetches)): sys.stderr.write("i: " + str(i) + "\n") sys.stderr.write("fetch_names[i]): " + fetch_names[i] + "\n") diff --git a/python/paddle/fluid/tests/unittests/op_test.py b/python/paddle/fluid/tests/unittests/op_test.py index 2113e120b21d7..01a4d78890115 100644 --- a/python/paddle/fluid/tests/unittests/op_test.py +++ b/python/paddle/fluid/tests/unittests/op_test.py @@ -18,7 +18,7 @@ import warnings import numpy as np import random -import six +import functools import struct from collections import defaultdict from copy import copy @@ -113,7 +113,7 @@ def randomize_probability(batch_size, class_num, dtype='float32'): prob = np.random.uniform(0.1, 1.0, size=(batch_size, class_num)).astype(dtype) prob_sum = prob.sum(axis=1) - for i in six.moves.xrange(len(prob)): + for i in range(len(prob)): prob[i] /= prob_sum[i] return prob @@ -130,7 +130,7 @@ def get_numeric_gradient(place, set_input(scope, op, inputs, place) def product(dim): - return six.moves.reduce(lambda a, b: a * b, dim, 1) + return functools.reduce(lambda a, b: a * b, dim, 1) tensor_to_check = scope.find_var(input_to_check).get_tensor() tensor_size = product(tensor_to_check.shape()) @@ -214,7 +214,7 @@ def __set_elem__(tensor, i, e): # we only compute gradient of one element each time. # we use a for loop to compute the gradient of every element. - for i in six.moves.xrange(tensor_size): + for i in range(tensor_size): if in_place: set_input(scope, op, inputs, place) @@ -438,7 +438,7 @@ def infer_dtype(numpy_dict, dtype_set): # case 3: inputs = {"X": [("x0", x0), ("x1", x1), ("x2", x2)]} # case 4: inputs = {'X': [("x1", (x1, [x1_lod1])), ("x2", (x2, [x2_.lod2]))]} # TODO(juncaipeng) infer dtype from inputs maybe obtain wrong type. - for _, var_value in six.iteritems(numpy_dict): + for _, var_value in numpy_dict.items(): if is_np_data(var_value): # case 1 dtype_set.add(var_value.dtype) elif isinstance(var_value, (list, tuple)): # case 2, 3, 4 @@ -549,7 +549,7 @@ def _append_ops(self, block): def _get_io_vars(self, block, numpy_inputs): inputs = {} - for name, value in six.iteritems(numpy_inputs): + for name, value in numpy_inputs.items(): if isinstance(value, list): var_list = [ block.var(sub_name) for sub_name, sub_value in value @@ -980,7 +980,7 @@ def _calc_output(self, # if the fetch_list is customized by user, we use it directly. # if not, fill the fetch_list by the user configured outputs in test. if len(fetch_list) == 0: - for var_name, var in six.iteritems(outputs): + for var_name, var in outputs.items(): if no_check_set is not None and var_name in no_check_set: continue if isinstance(var, list): @@ -1578,8 +1578,8 @@ def _compare_list(self, name, actual, expect): str(place) + " in dygraph mode") def _compare_numpy(self, name, actual_np, expect_np): - if six.moves.reduce(lambda x, y: x * y, actual_np.shape, - 1) == 0 and six.moves.reduce( + if functools.reduce(lambda x, y: x * y, actual_np.shape, + 1) == 0 and functools.reduce( lambda x, y: x * y, expect_np.shape, 1) == 0: pass @@ -1825,7 +1825,7 @@ def check_output_with_place_customized(self, checker, place): def _assert_is_close(self, numeric_grads, analytic_grads, names, max_relative_error, msg_prefix): - for a, b, name in six.moves.zip(numeric_grads, analytic_grads, names): + for a, b, name in zip(numeric_grads, analytic_grads, names): # It asserts np.abs(a - b) / np.abs(a) < max_relative_error, in which # max_relative_error is 1e-7. According to the value of np.abs(a), we # change np.abs(a) to achieve dynamic threshold. For example, if @@ -1973,7 +1973,7 @@ def check_grad_with_place(self, for input_to_check in inputs_to_check: set_input(self.scope, self.op, self.inputs, place) tensor_to_check = self.scope.find_var(input_to_check).get_tensor() - tensor_size = six.moves.reduce(lambda a, b: a * b, + tensor_size = functools.reduce(lambda a, b: a * b, tensor_to_check.shape(), 1) tensor_ndim = len(tensor_to_check.shape()) # for 0D Tensor, it's additional case for OP, so not raise error diff --git a/python/paddle/fluid/tests/unittests/ps/ps_dnn_trainer.py b/python/paddle/fluid/tests/unittests/ps/ps_dnn_trainer.py index d54f86b386338..bc9a057448e74 100755 --- a/python/paddle/fluid/tests/unittests/ps/ps_dnn_trainer.py +++ b/python/paddle/fluid/tests/unittests/ps/ps_dnn_trainer.py @@ -17,7 +17,8 @@ import paddle.distributed.fleet as fleet import argparse import sys -import yaml, six, copy +import yaml +import copy import paddle import os import ast @@ -66,20 +67,12 @@ def parse_yaml(self, config): use_full_loader = False if os.path.isfile(config): - if six.PY2: - with open(config, 'r') as rb: - if use_full_loader: - _config = yaml.load(rb.read(), Loader=yaml.FullLoader) - else: - _config = yaml.load(rb.read()) - return _config - else: - with open(config, 'r', encoding="utf-8") as rb: - if use_full_loader: - _config = yaml.load(rb.read(), Loader=yaml.FullLoader) - else: - _config = yaml.load(rb.read()) - return _config + with open(config, 'r', encoding="utf-8") as rb: + if use_full_loader: + _config = yaml.load(rb.read(), Loader=yaml.FullLoader) + else: + _config = yaml.load(rb.read()) + return _config else: raise ValueError("config {} can not be supported".format(config)) diff --git a/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py index ab60fbfde33b5..7345274caeb77 100644 --- a/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py +++ b/python/paddle/fluid/tests/unittests/sequence/test_sequence_unpad_op.py @@ -13,7 +13,6 @@ # limitations under the License. import unittest -import six import numpy as np import sys @@ -36,7 +35,7 @@ def compute(self): out_lod = [self.length] out = x[0, 0:self.length[0]] - for i in six.moves.xrange(1, x.shape[0]): + for i in range(1, x.shape[0]): out = np.append(out, x[i, 0:self.length[i]], axis=0) out_shape = (sum(self.length), ) diff --git a/python/paddle/fluid/tests/unittests/test_argsort_op.py b/python/paddle/fluid/tests/unittests/test_argsort_op.py index 7e6ff230ca95d..d9106e26627be 100644 --- a/python/paddle/fluid/tests/unittests/test_argsort_op.py +++ b/python/paddle/fluid/tests/unittests/test_argsort_op.py @@ -16,7 +16,6 @@ import paddle import paddle.fluid as fluid import numpy as np -import six import paddle.fluid.core as core from paddle.fluid.framework import Program, grad_var_name @@ -170,7 +169,7 @@ def get_numerical_gradient(self, delta=1e-7): def assert_is_close(self, numeric_grads, analytic_grads, names, max_relative_error, msg_prefix): - for a, b, name in six.moves.zip(numeric_grads, analytic_grads, names): + for a, b, name in zip(numeric_grads, analytic_grads, names): abs_a = np.abs(a) abs_a[abs_a < 1e-3] = 1 diff --git a/python/paddle/fluid/tests/unittests/test_check_import_scipy.py b/python/paddle/fluid/tests/unittests/test_check_import_scipy.py index c5e12e84c11ca..1707ff232a1a4 100644 --- a/python/paddle/fluid/tests/unittests/test_check_import_scipy.py +++ b/python/paddle/fluid/tests/unittests/test_check_import_scipy.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import six.moves.builtins as builtins +import builtins from paddle.check_import_scipy import check_import_scipy import unittest diff --git a/python/paddle/fluid/tests/unittests/test_cross_entropy2_op.py b/python/paddle/fluid/tests/unittests/test_cross_entropy2_op.py index f332800bdd4c5..13fbd933899b8 100644 --- a/python/paddle/fluid/tests/unittests/test_cross_entropy2_op.py +++ b/python/paddle/fluid/tests/unittests/test_cross_entropy2_op.py @@ -15,7 +15,6 @@ from op_test import OpTest import unittest import numpy as np -import six class CrossEntropy2OpTestBase(OpTest): @@ -26,7 +25,7 @@ def initParameters(self): def calc_output(self, logits, label, ignore_index): ret = np.zeros(shape=label.shape, dtype=logits.dtype) match_x = np.zeros(shape=label.shape, dtype=logits.dtype) - for idx in six.moves.range(label.shape[0]): + for idx in range(label.shape[0]): if label[idx] == ignore_index: continue match_x[idx] = logits[idx][label[idx]] diff --git a/python/paddle/fluid/tests/unittests/test_dataloader_keep_order.py b/python/paddle/fluid/tests/unittests/test_dataloader_keep_order.py index 6f18c87623318..5d07586c7e62c 100644 --- a/python/paddle/fluid/tests/unittests/test_dataloader_keep_order.py +++ b/python/paddle/fluid/tests/unittests/test_dataloader_keep_order.py @@ -16,14 +16,13 @@ import unittest import numpy as np import os -import six def create_reader(shape, batch_number): def __impl__(): idx = 0 - for _ in six.moves.range(batch_number): + for _ in range(batch_number): yield np.ones(shape).astype('float32') * idx, idx += 1 @@ -69,7 +68,7 @@ def assertInputData(self, batch_id, input_data, dev_cnt): self.assertEqual(list(input_data.shape), [self.shape[0] * dev_cnt] + self.shape[1:]) start_val = dev_cnt * batch_id - for idx in six.moves.range(dev_cnt): + for idx in range(dev_cnt): data_part = input_data[idx * self.shape[0]:(idx + 1) * self.shape[0], :] self.assertTrue((data_part == start_val).all()) @@ -116,7 +115,7 @@ def run_main_with_place(self, places, use_compiled_program=True): if loader.iterable: early_break = False - for epoch_id in six.moves.range(self.epoch_num): + for epoch_id in range(self.epoch_num): early_break = False batch_id = 0 for data in loader(): @@ -135,7 +134,7 @@ def run_main_with_place(self, places, use_compiled_program=True): if early_break: loader._reset() else: - for epoch_id in six.moves.range(self.epoch_num): + for epoch_id in range(self.epoch_num): batch_id = 0 loader.start() try: diff --git a/python/paddle/fluid/tests/unittests/test_dataloader_unkeep_order.py b/python/paddle/fluid/tests/unittests/test_dataloader_unkeep_order.py index 94cc701b598eb..236ffe19b6e2b 100644 --- a/python/paddle/fluid/tests/unittests/test_dataloader_unkeep_order.py +++ b/python/paddle/fluid/tests/unittests/test_dataloader_unkeep_order.py @@ -16,7 +16,6 @@ import unittest import numpy as np import os -import six from paddle.fluid.reader import keep_data_loader_order keep_data_loader_order(False) @@ -26,7 +25,7 @@ def create_reader(shape, batch_number): def __impl__(): idx = 0 - for _ in six.moves.range(batch_number): + for _ in range(batch_number): yield np.ones(shape).astype('float32') * idx, idx += 1 @@ -86,7 +85,7 @@ def assertInputData(self, self.assertEqual(list(input_data.shape), [self.shape[0] * dev_cnt] + self.shape[1:]) start_val = dev_cnt * batch_id - for idx in six.moves.range(dev_cnt): + for idx in range(dev_cnt): data_part = input_data[idx * self.shape[0]:(idx + 1) * self.shape[0], :] num = data_part.flatten()[0] @@ -138,7 +137,7 @@ def run_main_with_place(self, places, use_compiled_program=True): if loader.iterable: early_break = False - for epoch_id in six.moves.range(self.epoch_num): + for epoch_id in range(self.epoch_num): early_break = False self.clear_visited() batch_id = 0 @@ -164,7 +163,7 @@ def run_main_with_place(self, places, use_compiled_program=True): if early_break: loader._reset() else: - for epoch_id in six.moves.range(self.epoch_num): + for epoch_id in range(self.epoch_num): batch_id = 0 self.clear_visited() loader.start() diff --git a/python/paddle/fluid/tests/unittests/test_dataset_dataloader.py b/python/paddle/fluid/tests/unittests/test_dataset_dataloader.py index 8c9be45707f29..ec61ee3a83812 100644 --- a/python/paddle/fluid/tests/unittests/test_dataset_dataloader.py +++ b/python/paddle/fluid/tests/unittests/test_dataset_dataloader.py @@ -15,7 +15,6 @@ import paddle import paddle.fluid as fluid import numpy as np -import six import os import unittest import tempfile @@ -60,7 +59,7 @@ def fake_reader(batch_size=BATCH_SIZE, batch_num=BATCH_NUM): def __reader__(): iteration = BATCH_SIZE * BATCH_NUM iteration = int(iteration + BATCH_SIZE / 2) - for _ in six.moves.range(iteration): + for _ in range(iteration): image = np.random.random(size=IMAGE_SHAPE).astype('float32') label = np.random.random_integers(size=LABEL_SHAPE, low=0, high=9).astype('int64') @@ -121,7 +120,7 @@ def check_batch_number(self, place, randomize_batch_num=False): else: random_delta_batch_size = np.zeros(shape=[file_num]) - for i in six.moves.range(file_num): + for i in range(file_num): filename = os.path.join(self.temp_dir.name, 'dataset_test_{}.txt'.format(i)) filelist.append(filename) @@ -143,7 +142,7 @@ def check_batch_number(self, place, randomize_batch_num=False): exe.run(startup_prog) - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): has_complete_batch = False for batch_id, data in enumerate(dataloader): self.assertEquals(len(places), len(data)) diff --git a/python/paddle/fluid/tests/unittests/test_decoupled_py_reader.py b/python/paddle/fluid/tests/unittests/test_decoupled_py_reader.py index ba89f623b2cef..9b5ed11d9b9bf 100644 --- a/python/paddle/fluid/tests/unittests/test_decoupled_py_reader.py +++ b/python/paddle/fluid/tests/unittests/test_decoupled_py_reader.py @@ -16,7 +16,6 @@ import paddle.fluid as fluid import numpy as np import time -import six import unittest EPOCH_NUM = 5 @@ -98,7 +97,7 @@ def run_main(self, use_legacy_py_reader, with_data_parallel, places, loss_list = [] start_t = time.time() if not py_reader.iterable: - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 py_reader.start() while True: @@ -113,7 +112,7 @@ def run_main(self, use_legacy_py_reader, with_data_parallel, places, break step_list.append(step) else: - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for d in py_reader(): assert len(d) == len(places) diff --git a/python/paddle/fluid/tests/unittests/test_decoupled_py_reader_data_check.py b/python/paddle/fluid/tests/unittests/test_decoupled_py_reader_data_check.py index 2f7a6dd5a4236..0d27198127683 100644 --- a/python/paddle/fluid/tests/unittests/test_decoupled_py_reader_data_check.py +++ b/python/paddle/fluid/tests/unittests/test_decoupled_py_reader_data_check.py @@ -16,7 +16,6 @@ import paddle import numpy as np import unittest -import six class TestClass(unittest.TestCase): @@ -32,7 +31,7 @@ def test_reader_data(self): batch_num = 10 def fake_reader(): - for _ in six.moves.range(batch_size * batch_num): + for _ in range(batch_size * batch_num): img = np.random.random(size=img_shape).astype('float32') label = np.random.random_integers( low=0, high=9, size=label_shape).astype('int64') @@ -80,7 +79,7 @@ def fake_reader(): ).set_sample_list_generator(batch_reader, places=p) for break_beforehand in [True, False]: - for epoch_id in six.moves.range(10): + for epoch_id in range(10): gen = batch_reader() batch_id = 0 for d in py_reader(): diff --git a/python/paddle/fluid/tests/unittests/test_desc_clone.py b/python/paddle/fluid/tests/unittests/test_desc_clone.py index 161399e40fec9..2744487b5883b 100644 --- a/python/paddle/fluid/tests/unittests/test_desc_clone.py +++ b/python/paddle/fluid/tests/unittests/test_desc_clone.py @@ -16,7 +16,7 @@ import paddle.fluid as fluid from paddle.fluid import core import unittest -import six +import functools import collections SEED = 1 @@ -43,7 +43,7 @@ def cnn_model(data): # TODO(dzhwinter) : refine the initializer and random seed settting SIZE = 10 input_shape = conv_pool_2.shape - param_shape = [six.moves.reduce(lambda a, b: a * b, input_shape[1:], 1) + param_shape = [functools.reduce(lambda a, b: a * b, input_shape[1:], 1) ] + [SIZE] scale = (2.0 / (param_shape[0]**2 * SIZE))**0.5 @@ -92,7 +92,7 @@ def operator_equal(a, b): if a.__str__() != b.__str__(): raise ValueError("In operator_equal not equal\n") - for k, v in six.iteritems(a.__dict__): + for k, v in a.__dict__.items(): if isinstance(v, fluid.framework.Program) or \ isinstance(v, fluid.framework.Block): continue @@ -101,8 +101,8 @@ def operator_equal(a, b): continue elif isinstance(v, collections.OrderedDict): - v0 = sorted(list(six.iteritems(v)), key=lambda x: x[0]) - v1 = sorted(list(six.iteritems(b.__dict__[k])), key=lambda x: x[0]) + v0 = sorted(list(v.items()), key=lambda x: x[0]) + v1 = sorted(list(b.__dict__[k].items()), key=lambda x: x[0]) if v0 != v1: raise ValueError("In operator_equal not equal:{0}\n".format(k)) @@ -114,7 +114,7 @@ def operator_equal(a, b): def block_equal(a, b): - for k, v in six.iteritems(a.__dict__): + for k, v in a.__dict__.items(): if isinstance(v, core.ProgramDesc) or isinstance( v, fluid.framework.Program) or isinstance(v, core.BlockDesc): continue @@ -126,7 +126,7 @@ def block_equal(a, b): raise ValueError("In block_equal not equal:{0}\n".format(k)) elif isinstance(v, collections.OrderedDict): - for key, value in six.iteritems(v): + for key, value in v.items(): if str(value) != str(b.__dict__[k][key]): raise ValueError("In block_equal not equal:{0}\n".format(k)) @@ -137,7 +137,7 @@ def block_equal(a, b): def program_equal(a, b): - for k, v in six.iteritems(a.__dict__): + for k, v in a.__dict__.items(): if isinstance(v, core.ProgramDesc): continue diff --git a/python/paddle/fluid/tests/unittests/test_detection_map_op.py b/python/paddle/fluid/tests/unittests/test_detection_map_op.py index bd039161e172f..68afa3feed908 100644 --- a/python/paddle/fluid/tests/unittests/test_detection_map_op.py +++ b/python/paddle/fluid/tests/unittests/test_detection_map_op.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import collections import math from op_test import OpTest @@ -178,7 +177,7 @@ def get_accumulation(pos_list): true_pos[label].append([score, tp]) false_pos[label].append([score, fp]) - for (label, label_pos_num) in six.iteritems(label_count): + for (label, label_pos_num) in label_count.items(): if label_pos_num == 0: continue if label not in true_pos: count += 1 diff --git a/python/paddle/fluid/tests/unittests/test_dist_base.py b/python/paddle/fluid/tests/unittests/test_dist_base.py index 59b961fcb03f8..d528727076954 100755 --- a/python/paddle/fluid/tests/unittests/test_dist_base.py +++ b/python/paddle/fluid/tests/unittests/test_dist_base.py @@ -19,7 +19,6 @@ import os import sys import subprocess -import six import argparse import pickle import random @@ -146,7 +145,7 @@ def run_pipeline_trainer(self, args): main_program = fluid.default_main_program() lr_sheduler = self.get_lr_scheduler(main_program) - for i in six.moves.xrange(RUN_STEP): + for i in range(RUN_STEP): loss = exe.run(main_program, fetch_list=[avg_cost]) loss = loss[0] if loss else None out_losses.append(loss) @@ -219,7 +218,7 @@ def get_data(): print_to_err(type(self).__name__, "begin to train on trainer") out_losses = [] - for i in six.moves.xrange(RUN_STEP): + for i in range(RUN_STEP): loss, = exe.run(fluid.default_main_program(), fetch_list=[avg_cost.name], feed=feeder.feed(get_data())) @@ -304,7 +303,7 @@ def get_data(): print_to_err(type(self).__name__, "begin to train on trainer") out_losses = [] - for i in six.moves.xrange(RUN_STEP): + for i in range(RUN_STEP): loss, = exe.run(dist_prog, fetch_list=[avg_cost.name], feed=feeder.feed(get_data())) @@ -479,7 +478,7 @@ def get_data(): lr_scheduler = self.get_lr_scheduler(trainer_prog) print_to_err(type(self).__name__, "begin to train on trainer") out_losses = [] - for i in six.moves.xrange(RUN_STEP): + for i in range(RUN_STEP): loss, = exe.run(binary, fetch_list=[avg_cost.name], feed=feeder.feed(get_data())) diff --git a/python/paddle/fluid/tests/unittests/test_dist_transpiler.py b/python/paddle/fluid/tests/unittests/test_dist_transpiler.py index f2b9c793c8bd4..8fc636af2de05 100644 --- a/python/paddle/fluid/tests/unittests/test_dist_transpiler.py +++ b/python/paddle/fluid/tests/unittests/test_dist_transpiler.py @@ -14,7 +14,7 @@ import math -import six +import functools import unittest import numpy as np @@ -895,16 +895,16 @@ def transpiler_test_impl(self): self.assertTrue(vars_ps1) self.assertTrue(vars_ps2) - for idx in six.moves.xrange(len(vars_ps1)): + for idx in range(len(vars_ps1)): total_numel = 0 ps1_numel, ps2_numel = 0, 0 ps1_var = vars_ps1[idx] if not ps1_var.is_slice: - total_numel = six.moves.reduce(lambda x, y: x * y, + total_numel = functools.reduce(lambda x, y: x * y, vars_ps1[idx].origin.shape) - ps1_numel = six.moves.reduce(lambda x, y: x * y, + ps1_numel = functools.reduce(lambda x, y: x * y, vars_ps1[idx].slice.shape) else: ps2_var = None @@ -913,11 +913,11 @@ def transpiler_test_impl(self): ps2_var = var break - total_numel = six.moves.reduce(lambda x, y: x * y, + total_numel = functools.reduce(lambda x, y: x * y, ps1_var.origin.shape) - ps1_numel = six.moves.reduce(lambda x, y: x * y, + ps1_numel = functools.reduce(lambda x, y: x * y, ps1_var.slice.shape) - ps2_numel = six.moves.reduce(lambda x, y: x * y, + ps2_numel = functools.reduce(lambda x, y: x * y, ps2_var.slice.shape) self.assertEqual(total_numel, ps1_numel + ps2_numel) diff --git a/python/paddle/fluid/tests/unittests/test_dygraph_multi_forward.py b/python/paddle/fluid/tests/unittests/test_dygraph_multi_forward.py index d03cb971d308a..559424c7fb440 100644 --- a/python/paddle/fluid/tests/unittests/test_dygraph_multi_forward.py +++ b/python/paddle/fluid/tests/unittests/test_dygraph_multi_forward.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -202,7 +201,7 @@ def test_mnist_forward_float32(self): static_x_data.all(), rtol=1e-05) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) diff --git a/python/paddle/fluid/tests/unittests/test_eager_deletion_delete_vars.py b/python/paddle/fluid/tests/unittests/test_eager_deletion_delete_vars.py index ed7a3c0f0fe81..b6052d33c95cb 100644 --- a/python/paddle/fluid/tests/unittests/test_eager_deletion_delete_vars.py +++ b/python/paddle/fluid/tests/unittests/test_eager_deletion_delete_vars.py @@ -19,7 +19,6 @@ os.environ['CPU_NUM'] = '4' import paddle.fluid as fluid -import six import unittest import multiprocessing from functools import reduce @@ -54,7 +53,7 @@ def get_persistables_and_non_persistables(prog, fetch_list): num_block = prog.num_blocks persitables = set() non_persistables = set() - for bid in six.moves.range(num_block): + for bid in range(num_block): block = prog.block(bid) for _, var in block.vars.items(): if var.persistable or var.name in fetch_list: @@ -145,7 +144,7 @@ def executor_main(self): p.set_place(self.place) exe = fluid.core.Executor(p) - for _ in six.moves.range(10): + for _ in range(10): image_np, label_np = self.prepare_feed(image, label) fluid.global_scope().var(image.name).get_tensor().set( image_np, self.place) @@ -183,7 +182,7 @@ def pe_main(self): dev_cnt = fluid.core.get_cuda_device_count() if isinstance(self.place, fluid.CUDAPlace) \ else int(os.environ.get('CPU_NUM', multiprocessing.cpu_count())) - for idx in six.moves.range(10): + for idx in range(10): image_np, label_np = self.prepare_feed(image, label, dev_cnt) feed = {image.name: image_np, label.name: label_np} diff --git a/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py b/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py index 377d3bc28e206..6e1ed17a3b679 100644 --- a/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py +++ b/python/paddle/fluid/tests/unittests/test_eager_deletion_dynamic_rnn_base.py @@ -16,7 +16,6 @@ os.environ['CPU_NUM'] = '2' -import six import unittest import paddle @@ -72,7 +71,7 @@ def train(network, use_cuda, use_parallel_executor, batch_size=32, pass_num=2): else: fetch_list = [cost] - for pass_id in six.moves.xrange(pass_num): + for pass_id in range(pass_num): batch_id = 0 for data in reader(): exe.run(train_cp, diff --git a/python/paddle/fluid/tests/unittests/test_embedding_id_stop_gradient.py b/python/paddle/fluid/tests/unittests/test_embedding_id_stop_gradient.py index b42a85fbb91bd..db3af060d2645 100644 --- a/python/paddle/fluid/tests/unittests/test_embedding_id_stop_gradient.py +++ b/python/paddle/fluid/tests/unittests/test_embedding_id_stop_gradient.py @@ -15,7 +15,6 @@ import numpy as np import paddle import paddle.fluid as fluid -import six import unittest @@ -53,7 +52,7 @@ def run_program(self, place, stop_gradient=False): x_2 = fluid.data(name='x2', shape=[4, 1], dtype='int64') x = fluid.layers.concat([x_1, x_2], axis=-1) - for _ in six.moves.range(self.reshape_times): + for _ in range(self.reshape_times): x = fluid.layers.reshape(x, [-1, 1]) x.stop_gradient = stop_gradient @@ -70,7 +69,7 @@ def run_program(self, place, stop_gradient=False): x2_data = np.random.randint(0, 9, x_2.shape).astype('int64') fetch_val = None - for _ in six.moves.range(self.iteration): + for _ in range(self.iteration): fetch_val = exe.run(feed={ x_1.name: x1_data, x_2.name: x2_data diff --git a/python/paddle/fluid/tests/unittests/test_generate_mask_labels_op.py b/python/paddle/fluid/tests/unittests/test_generate_mask_labels_op.py index 3a2a6e9eb502c..18a13197044ac 100644 --- a/python/paddle/fluid/tests/unittests/test_generate_mask_labels_op.py +++ b/python/paddle/fluid/tests/unittests/test_generate_mask_labels_op.py @@ -15,7 +15,6 @@ import unittest import numpy as np import math -import six from op_test import OpTest ''' # Equivalent code @@ -78,7 +77,7 @@ def poly2mask(xy, k, h, w): x = np.zeros((k), np.int_) y = np.zeros((k), np.int_) m = 0 - for j in six.moves.xrange(1, k): + for j in range(1, k): if u[j] != u[j - 1]: xd = float(u[j] if (u[j] < u[j - 1]) else (u[j] - 1)) xd = (xd + .5) / scale - .5 diff --git a/python/paddle/fluid/tests/unittests/test_generator_dataloader.py b/python/paddle/fluid/tests/unittests/test_generator_dataloader.py index 7c1a80d229626..dbc8169bd1131 100644 --- a/python/paddle/fluid/tests/unittests/test_generator_dataloader.py +++ b/python/paddle/fluid/tests/unittests/test_generator_dataloader.py @@ -16,7 +16,6 @@ import paddle.fluid as fluid import numpy as np import time -import six import unittest from paddle.fluid.reader import DataLoaderBase @@ -100,7 +99,7 @@ def run_main(self, use_legacy_py_reader, with_data_parallel, places, loss_list = [] start_t = time.time() if not py_reader.iterable: - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 py_reader.start() while True: @@ -115,7 +114,7 @@ def run_main(self, use_legacy_py_reader, with_data_parallel, places, break step_list.append(step) else: - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for d in py_reader(): assert len(d) == len(places), "{} != {}".format( diff --git a/python/paddle/fluid/tests/unittests/test_imperative_gan.py b/python/paddle/fluid/tests/unittests/test_imperative_gan.py index b2a815c6d5f53..9edecc8998956 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_gan.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_gan.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -228,12 +227,12 @@ def func_test_gan_float32(self): self.assertEqual(dy_g_loss, static_g_loss) self.assertEqual(dy_d_loss, static_d_loss) - for k, v in six.iteritems(dy_params): + for k, v in dy_params.items(): np.testing.assert_allclose(v, static_params[k], rtol=1e-05) self.assertEqual(dy_g_loss2, static_g_loss) self.assertEqual(dy_d_loss2, static_d_loss) - for k, v in six.iteritems(dy_params2): + for k, v in dy_params2.items(): np.testing.assert_allclose(v, static_params[k], rtol=1e-05) def test_gan_float32(self): diff --git a/python/paddle/fluid/tests/unittests/test_imperative_lod_tensor_to_selected_rows.py b/python/paddle/fluid/tests/unittests/test_imperative_lod_tensor_to_selected_rows.py index ddd403b0f6032..a359d43d9c6aa 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_lod_tensor_to_selected_rows.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_lod_tensor_to_selected_rows.py @@ -21,7 +21,6 @@ from paddle.fluid.dygraph.base import to_variable from test_imperative_base import new_program_scope import numpy as np -import six from utils import DyGraphProgramDescTracerTestHelper from paddle.fluid.framework import _test_eager_guard @@ -197,9 +196,9 @@ def simple_net_float32(self, is_sparse, dtype): np.testing.assert_allclose(static_loss_value, dy_loss_value, rtol=0.001) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, dy_param_init[key]) - for key, value in six.iteritems(static_param_updated): + for key, value in static_param_updated.items(): np.testing.assert_array_equal(value, dy_param_updated[key]) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_mnist.py b/python/paddle/fluid/tests/unittests/test_imperative_mnist.py index b4178028521ad..22954d11e283b 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_mnist.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_mnist.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -258,14 +257,14 @@ def func_test_mnist_float32(self): static_x_data.all(), rtol=1e-05) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) np.testing.assert_allclose(static_out, dy_out, rtol=1e-05) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value[key], rtol=1e-05, diff --git a/python/paddle/fluid/tests/unittests/test_imperative_mnist_sorted_gradient.py b/python/paddle/fluid/tests/unittests/test_imperative_mnist_sorted_gradient.py index 80d63921d361b..214214f871020 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_mnist_sorted_gradient.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_mnist_sorted_gradient.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -141,14 +140,14 @@ def func_test_mnist_sort_gradient_float32(self): static_x_data.all(), rtol=1e-05) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value2[key], rtol=1e-05) np.testing.assert_allclose(static_out, dy_out2, rtol=1e-05) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value2[key], rtol=1e-05, diff --git a/python/paddle/fluid/tests/unittests/test_imperative_ocr_attention_model.py b/python/paddle/fluid/tests/unittests/test_imperative_ocr_attention_model.py index bb9c5a914b06f..eb582310df46b 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_ocr_attention_model.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_ocr_attention_model.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid from paddle.fluid import core @@ -571,10 +570,10 @@ def run_dygraph(): np.testing.assert_allclose(static_out, dy_out, rtol=1e-05, atol=1e-8) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_array_equal(value, dy_param_init_value[key]) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value[key], rtol=1e-05, @@ -583,10 +582,10 @@ def run_dygraph(): # check eager here np.testing.assert_allclose(static_out, eager_out, rtol=1e-05, atol=1e-8) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_array_equal(value, eager_param_init_value[key]) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, eager_param_value[key], rtol=1e-05, diff --git a/python/paddle/fluid/tests/unittests/test_imperative_optimizer.py b/python/paddle/fluid/tests/unittests/test_imperative_optimizer.py index 3c078ffbde5cb..ba1f73bcbcb42 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_optimizer.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_optimizer.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import itertools import paddle @@ -191,7 +190,7 @@ def _check_mlp(self, place=None): for i in range(1, len(out)): static_param_value[static_param_name_list[i - 1]] = out[i] - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) @@ -204,7 +203,7 @@ def _check_mlp(self, place=None): else: np.testing.assert_allclose(static_out, dy_out, rtol=1e-05) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): if core.is_compiled_with_rocm(): np.testing.assert_allclose(value, dy_param_value[key], diff --git a/python/paddle/fluid/tests/unittests/test_imperative_optimizer_v2.py b/python/paddle/fluid/tests/unittests/test_imperative_optimizer_v2.py index f8446d22ff766..3b0ba3572cc54 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_optimizer_v2.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_optimizer_v2.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import itertools import paddle @@ -207,7 +206,7 @@ def _check_mlp(self, place=None): for i in range(1, len(out)): static_param_value[static_param_name_list[i - 1]] = out[i] - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) @@ -220,7 +219,7 @@ def _check_mlp(self, place=None): else: np.testing.assert_allclose(static_out, dy_out, rtol=1e-05) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): if core.is_compiled_with_rocm(): np.testing.assert_allclose(value, dy_param_value[key], diff --git a/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn.py b/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn.py index 544a478797f42..0588016ce2765 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn.py @@ -23,7 +23,6 @@ from paddle.fluid.dygraph import TracedLayer from test_imperative_base import new_program_scope import numpy as np -import six from utils import DyGraphProgramDescTracerTestHelper, is_equal_program from paddle.fluid.framework import _test_eager_guard, _in_legacy_dygraph @@ -379,9 +378,9 @@ def ptb_rnn_cpu_float32(self, is_sparse): dy_last_cell_value) np.testing.assert_array_equal(static_last_hidden_value, dy_last_hidden_value) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, dy_param_init[key]) - for key, value in six.iteritems(static_param_updated): + for key, value in static_param_updated.items(): np.testing.assert_array_equal(value, dy_param_updated[key]) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn_sorted_gradient.py b/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn_sorted_gradient.py index 2422383bbded3..286049500c296 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn_sorted_gradient.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_ptb_rnn_sorted_gradient.py @@ -22,7 +22,6 @@ from test_imperative_base import new_program_scope from test_imperative_ptb_rnn import PtbModel import numpy as np -import six from paddle.fluid.framework import _test_eager_guard @@ -166,9 +165,9 @@ def ptb_rnn_sort_gradient_cpu_float32(self, is_sparse): dy_last_cell_value) np.testing.assert_array_equal(static_last_hidden_value, dy_last_hidden_value) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, dy_param_init[key]) - for key, value in six.iteritems(static_param_updated): + for key, value in static_param_updated.items(): np.testing.assert_array_equal(value, dy_param_updated[key]) def test_ptb_rnn_sort_gradient(self): diff --git a/python/paddle/fluid/tests/unittests/test_imperative_reinforcement.py b/python/paddle/fluid/tests/unittests/test_imperative_reinforcement.py index 2e72413673d92..a831737d75242 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_reinforcement.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_reinforcement.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -175,21 +174,21 @@ def run_dygraph(): # np.testing.assert_allclose(dy_x_data.all(), static_x_data.all(), rtol=1e-5) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): self.assertTrue(np.equal(value, dy_param_init_value[key]).all()) self.assertTrue(np.equal(static_out, dy_out).all()) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): self.assertTrue(np.equal(value, dy_param_value[key]).all()) # check eager - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): self.assertTrue(np.equal(value, eager_param_init_value[key]).all()) self.assertTrue(np.equal(static_out, eager_out).all()) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): self.assertTrue(np.equal(value, eager_param_value[key]).all()) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_resnet.py b/python/paddle/fluid/tests/unittests/test_imperative_resnet.py index 27a56884462e8..55a51347283a8 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_resnet.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_resnet.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -417,7 +416,7 @@ def func_test_resnet_float32(self): self.assertEqual(len(dy_param_init_value), len(static_param_init_value)) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) @@ -425,13 +424,13 @@ def func_test_resnet_float32(self): self.assertFalse(np.isnan(value.any())) self.assertEqual(len(dy_grad_value), len(static_grad_value)) - for key, value in six.iteritems(static_grad_value): + for key, value in static_grad_value.items(): np.testing.assert_allclose(value, dy_grad_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) self.assertEqual(len(dy_param_value), len(static_param_value)) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_resnet_sorted_gradient.py b/python/paddle/fluid/tests/unittests/test_imperative_resnet_sorted_gradient.py index 15eda5557e53f..e28f2c1408620 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_resnet_sorted_gradient.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_resnet_sorted_gradient.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -218,7 +217,7 @@ def func_test_resnet_sort_gradient_float32(self): self.assertEqual(len(dy_param_init_value), len(static_param_init_value)) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) @@ -226,13 +225,13 @@ def func_test_resnet_sort_gradient_float32(self): self.assertFalse(np.isnan(value.any())) self.assertEqual(len(dy_grad_value), len(static_grad_value)) - for key, value in six.iteritems(static_grad_value): + for key, value in static_grad_value.items(): np.testing.assert_allclose(value, dy_grad_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) self.assertEqual(len(dy_param_value), len(static_param_value)) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_se_resnext.py b/python/paddle/fluid/tests/unittests/test_imperative_se_resnext.py index dfae761553df5..c04f3adcadd53 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_se_resnext.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_se_resnext.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -469,7 +468,7 @@ def run_dygraph(): self.assertEqual(len(dy_param_init_value), len(static_param_init_value)) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, dy_param_init_value[key], rtol=1e-05) @@ -478,13 +477,13 @@ def run_dygraph(): self.assertEqual(len(dy_grad_value), len(static_grad_value)) - for key, value in six.iteritems(static_grad_value): + for key, value in static_grad_value.items(): np.testing.assert_allclose(value, dy_grad_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) self.assertEqual(len(dy_param_value), len(static_param_value)) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, dy_param_value[key], rtol=1e-05) self.assertTrue(np.isfinite(value.all())) self.assertFalse(np.isnan(value.any())) @@ -495,18 +494,18 @@ def run_dygraph(): self.assertEqual(len(eager_param_init_value), len(static_param_init_value)) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): np.testing.assert_allclose(value, eager_param_init_value[key], rtol=1e-05) self.assertEqual(len(eager_grad_value), len(static_grad_value)) - for key, value in six.iteritems(static_grad_value): + for key, value in static_grad_value.items(): np.testing.assert_allclose(value, eager_grad_value[key], rtol=1e-05) self.assertEqual(len(eager_param_value), len(static_param_value)) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): np.testing.assert_allclose(value, eager_param_value[key], rtol=1e-05) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_selected_rows_to_lod_tensor.py b/python/paddle/fluid/tests/unittests/test_imperative_selected_rows_to_lod_tensor.py index d3caa4aa31da9..35d863b774b02 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_selected_rows_to_lod_tensor.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_selected_rows_to_lod_tensor.py @@ -22,7 +22,6 @@ from paddle.fluid.dygraph.base import to_variable from test_imperative_base import new_program_scope import numpy as np -import six from paddle.fluid.framework import _test_eager_guard @@ -202,9 +201,9 @@ def simple_net_float(self, is_sparse, dtype): k - 1]] = out[k] np.testing.assert_array_equal(static_loss_value, dy_loss_value) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, dy_param_init[key]) - for key, value in six.iteritems(static_param_updated): + for key, value in static_param_updated.items(): np.testing.assert_array_equal(value, dy_param_updated[key]) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_static_runner_mnist.py b/python/paddle/fluid/tests/unittests/test_imperative_static_runner_mnist.py index ff076d836f868..cc204e6b3d42c 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_static_runner_mnist.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_static_runner_mnist.py @@ -15,7 +15,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -310,14 +309,14 @@ def test_mnist_train_no_params_filename(self): # Phase 3. compare np.testing.assert_array_equal(static_x_data, dy_x_data) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): key = dict_old_new_init[key] np.testing.assert_array_equal(value, dy_param_init_value[key]) # np.testing.assert_array_almost_equal(static_out, dy_out) np.testing.assert_allclose(static_out, dy_out, rtol=1e-05, atol=1e-4) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): key = dict_old_new_init[key] np.testing.assert_allclose(value, dy_param_value[key], @@ -340,14 +339,14 @@ def test_mnist_train_with_params_filename(self): # Phase 3. compare np.testing.assert_array_equal(static_x_data, dy_x_data) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): key = dict_old_new_init[key] np.testing.assert_array_equal(value, dy_param_init_value[key]) # np.testing.assert_array_almost_equal(static_out, dy_out) np.testing.assert_allclose(static_out, dy_out, rtol=1e-05, atol=1e-4) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): key = dict_old_new_init[key] np.testing.assert_allclose(value, dy_param_value[key], diff --git a/python/paddle/fluid/tests/unittests/test_imperative_static_runner_while.py b/python/paddle/fluid/tests/unittests/test_imperative_static_runner_while.py index f6ebc0b394a26..b12d8e6a3db48 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_static_runner_while.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_static_runner_while.py @@ -15,7 +15,6 @@ import unittest import numpy as np -import six import paddle import paddle.fluid as fluid @@ -225,13 +224,13 @@ def test_while_no_params_filename(self): with unique_name.guard(): dict_old_new_init = rename_var_with_generator( static_param_init_value.keys()) - for key, value in six.iteritems(static_param_init_value): + for key, value in static_param_init_value.items(): key = dict_old_new_init[key] np.testing.assert_array_equal(value, dy_param_init_value[key]) np.testing.assert_allclose(static_out, dy_out, rtol=1e-05) - for key, value in six.iteritems(static_param_value): + for key, value in static_param_value.items(): key += LOADED_VAR_SUFFIX np.testing.assert_allclose(value, dy_param_value[key], diff --git a/python/paddle/fluid/tests/unittests/test_imperative_trace_non_persistable_inputs.py b/python/paddle/fluid/tests/unittests/test_imperative_trace_non_persistable_inputs.py index db655e4b4e6d1..a346bb2298588 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_trace_non_persistable_inputs.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_trace_non_persistable_inputs.py @@ -15,7 +15,6 @@ import unittest import paddle.fluid as fluid import numpy as np -import six import os @@ -51,7 +50,7 @@ def test_main(self): layer._offset.name ]) - for _ in six.moves.range(10): + for _ in range(10): in_x = fluid.dygraph.to_variable( np.random.random( (batch_size, feature_size)).astype('float32')) diff --git a/python/paddle/fluid/tests/unittests/test_imperative_transformer_sorted_gradient.py b/python/paddle/fluid/tests/unittests/test_imperative_transformer_sorted_gradient.py index 090384bec805d..3ba02fe8dafcd 100644 --- a/python/paddle/fluid/tests/unittests/test_imperative_transformer_sorted_gradient.py +++ b/python/paddle/fluid/tests/unittests/test_imperative_transformer_sorted_gradient.py @@ -22,7 +22,6 @@ from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard from paddle.fluid import core import numpy as np -import six np.set_printoptions(suppress=True) @@ -1140,9 +1139,9 @@ def run_dygraph(): np.testing.assert_array_equal(static_token_num_value, dy_token_num_value) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, dy_param_init[key]) - for key, value in six.iteritems(static_param_updated): + for key, value in static_param_updated.items(): np.testing.assert_array_equal(value, dy_param_updated[key]) # compare eager result with imperative result @@ -1169,9 +1168,9 @@ def run_dygraph(): eager_token_num_value, rtol=1e-05) - for key, value in six.iteritems(static_param_init): + for key, value in static_param_init.items(): np.testing.assert_array_equal(value, eager_param_init[key]) - for key, value in six.iteritems(dy_param_updated): + for key, value in dy_param_updated.items(): np.testing.assert_allclose(value, eager_param_updated[key], rtol=1e-05) diff --git a/python/paddle/fluid/tests/unittests/test_infer_shape.py b/python/paddle/fluid/tests/unittests/test_infer_shape.py index 99ac16f469a01..f4c718bf80ad6 100644 --- a/python/paddle/fluid/tests/unittests/test_infer_shape.py +++ b/python/paddle/fluid/tests/unittests/test_infer_shape.py @@ -14,7 +14,6 @@ import unittest -import six import paddle.fluid.core as core @@ -29,14 +28,14 @@ def test_sum_op(self): shape = [10, 20] # prepare input/output - x1 = block.var(six.b("x1")) + x1 = block.var(b'x1') x1.set_type(core.VarDesc.VarType.LOD_TENSOR) x1.set_shape(shape) - x2 = block.var(six.b("x2")) + x2 = block.var(b'x2') x2.set_type(core.VarDesc.VarType.LOD_TENSOR) x2.set_shape(shape) - out = block.var(six.b("out")) + out = block.var(b'out') out.set_type(core.VarDesc.VarType.LOD_TENSOR) # prepare the operator @@ -59,14 +58,14 @@ def test_mul_op(self): y_shape = [20, 30] # prepare input/output - x1 = block.var(six.b("x")) + x1 = block.var(b'x') x1.set_type(core.VarDesc.VarType.LOD_TENSOR) x1.set_shape(x_shape) - x2 = block.var(six.b("y")) + x2 = block.var(b'y') x2.set_type(core.VarDesc.VarType.LOD_TENSOR) x2.set_shape(y_shape) - out = block.var(six.b("out")) + out = block.var(b'out') out.set_type(core.VarDesc.VarType.LOD_TENSOR) # prepare the operator @@ -92,11 +91,11 @@ def test_expand_op(self): expand_times = [3, 1] # prepare input/output - x1 = block.var(six.b("x")) + x1 = block.var(b'x') x1.set_type(core.VarDesc.VarType.LOD_TENSOR) x1.set_shape(shape) - out = block.var(six.b("out")) + out = block.var(b'out') out.set_type(core.VarDesc.VarType.LOD_TENSOR) # prepare the operator diff --git a/python/paddle/fluid/tests/unittests/test_inference_model_io.py b/python/paddle/fluid/tests/unittests/test_inference_model_io.py index c901dd472ec31..f63368dffc890 100644 --- a/python/paddle/fluid/tests/unittests/test_inference_model_io.py +++ b/python/paddle/fluid/tests/unittests/test_inference_model_io.py @@ -15,7 +15,7 @@ import unittest import os -import six +import importlib import tempfile import numpy as np import paddle.fluid.core as core @@ -68,7 +68,7 @@ def test_fit_line_inference_model(self): exe.run(init_program, feed={}, fetch_list=[]) - for i in six.moves.xrange(100): + for i in range(100): tensor_x = np.array([[1, 1], [1, 2], [3, 4], [5, 2]]).astype("float32") tensor_y = np.array([[-2], [-3], [-7], [-7]]).astype("float32") @@ -95,7 +95,7 @@ def test_fit_line_inference_model(self): }, fetch_list=[avg_cost])[0] - six.moves.reload_module(executor) # reload to build a new scope + importlib.reload(executor) # reload to build a new scope model_0 = InferModel(load_inference_model(MODEL_DIR, exe)) with open(os.path.join(UNI_MODEL_DIR, 'model'), "rb") as f: @@ -238,7 +238,7 @@ def test_save_and_load_inference_model(self): tensor_x = np.array([[1, 1], [1, 2], [5, 2]]).astype("float32") tensor_y = np.array([[-2], [-3], [-7]]).astype("float32") - for i in six.moves.xrange(3): + for i in range(3): exe.run(program, feed={ 'x': tensor_x, @@ -284,7 +284,7 @@ def test_save_and_load_inference_model(self): }, fetch_list=[avg_cost])[0] - six.moves.reload_module(executor) # reload to build a new scope + importlib.reload(executor) # reload to build a new scope self.assertRaises(ValueError, paddle.static.load_inference_model, None, exe) @@ -358,7 +358,7 @@ def test_serialize_program_and_persistables(self): tensor_x = np.array([[1, 1], [1, 2], [5, 2]]).astype("float32") tensor_y = np.array([[-2], [-3], [-7]]).astype("float32") - for i in six.moves.xrange(3): + for i in range(3): exe.run(program, feed={ 'x': tensor_x, @@ -401,7 +401,7 @@ def test_normalize_program(self): tensor_x = np.array([[1, 1], [1, 2], [5, 2]]).astype("float32") tensor_y = np.array([[-2], [-3], [-7]]).astype("float32") - for i in six.moves.xrange(3): + for i in range(3): exe.run(program, feed={ 'x': tensor_x, diff --git a/python/paddle/fluid/tests/unittests/test_ir_graph.py b/python/paddle/fluid/tests/unittests/test_ir_graph.py index c465e4bca2cd4..1951db0395fa9 100644 --- a/python/paddle/fluid/tests/unittests/test_ir_graph.py +++ b/python/paddle/fluid/tests/unittests/test_ir_graph.py @@ -13,7 +13,6 @@ # limitations under the License. import unittest -import six from paddle import fluid @@ -53,7 +52,7 @@ def test_create_var_node(self): prog = fluid.core.ProgramDesc() block = prog.block(0) shape = [10, 20] - x1 = block.var(six.b("x1")) + x1 = block.var(b'x1') x1.set_type(fluid.core.VarDesc.VarType.LOD_TENSOR) x1.set_shape(shape) graph = fluid.core.Graph(prog) @@ -120,14 +119,14 @@ def build_graph(): shape = [10, 20] # prepare input/output - x1 = block.var(six.b("x1")) + x1 = block.var(b'x1') x1.set_type(fluid.core.VarDesc.VarType.LOD_TENSOR) x1.set_shape(shape) - x2 = block.var(six.b("x2")) + x2 = block.var(b'x2') x2.set_type(fluid.core.VarDesc.VarType.LOD_TENSOR) x2.set_shape(shape) - out = block.var(six.b("out")) + out = block.var(b'out') out.set_type(fluid.core.VarDesc.VarType.LOD_TENSOR) sum_op_desc = block.append_op() diff --git a/python/paddle/fluid/tests/unittests/test_layers.py b/python/paddle/fluid/tests/unittests/test_layers.py index ae7e960bc9dd2..176a8385c3c97 100644 --- a/python/paddle/fluid/tests/unittests/test_layers.py +++ b/python/paddle/fluid/tests/unittests/test_layers.py @@ -18,7 +18,6 @@ import numpy as np from decorator_helper import prog_scope import inspect -from six.moves import filter import paddle import paddle.fluid as fluid diff --git a/python/paddle/fluid/tests/unittests/test_load_state_dict_from_old_format.py b/python/paddle/fluid/tests/unittests/test_load_state_dict_from_old_format.py index 7945046f9f149..4d47c94f2fabf 100644 --- a/python/paddle/fluid/tests/unittests/test_load_state_dict_from_old_format.py +++ b/python/paddle/fluid/tests/unittests/test_load_state_dict_from_old_format.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import six import unittest import numpy as np @@ -120,7 +119,7 @@ def train_and_save_model(self, only_params=False): return static_param_dict def check_load_state_dict(self, orig_dict, load_dict): - for var_name, value in six.iteritems(orig_dict): + for var_name, value in orig_dict.items(): np.testing.assert_array_equal(value, load_dict[var_name]) def test_load_default(self): diff --git a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_dynamic.py b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_dynamic.py index 32e5627736656..d0e592d488c1e 100644 --- a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_dynamic.py +++ b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_dynamic.py @@ -13,7 +13,6 @@ # limitations under the License. import sys -import six import time import unittest import numpy as np @@ -79,7 +78,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for image, label in dataloader(): out = fc_net(image) @@ -141,7 +140,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for image, label in dataloader(): out = fc_net(image) diff --git a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_dynamic.py b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_dynamic.py index 09a1f6520ab96..98c8a19d520f4 100644 --- a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_dynamic.py +++ b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_dynamic.py @@ -13,7 +13,6 @@ # limitations under the License. import sys -import six import time import unittest import numpy as np @@ -78,7 +77,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for image, label in dataloader(): out = fc_net(image) @@ -137,7 +136,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for image, label in dataloader(): out = fc_net(image) diff --git a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_static.py b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_static.py index b84530ccc41d7..4c78edf3adec5 100644 --- a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_static.py +++ b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_iterable_dataset_static.py @@ -13,7 +13,6 @@ # limitations under the License. import sys -import six import time import unittest import numpy as np @@ -125,7 +124,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for i in six.moves.range(EPOCH_NUM): + for i in range(EPOCH_NUM): step = 0 for d in dataloader: assert len(d) == len(places), "{} != {}".format( @@ -218,7 +217,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for i in six.moves.range(EPOCH_NUM): + for i in range(EPOCH_NUM): step = 0 for d in dataloader: assert len(d) == len(places), "{} != {}".format( diff --git a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_static.py b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_static.py index dc9444f2f5fe2..6a44c9f48430a 100644 --- a/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_static.py +++ b/python/paddle/fluid/tests/unittests/test_multiprocess_dataloader_static.py @@ -13,7 +13,6 @@ # limitations under the License. import sys -import six import time import unittest import numpy as np @@ -130,7 +129,7 @@ def run_main(self, num_workers, places, persistent_workers, use_pe=True): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for d in dataloader: assert len(d) == len(places), "{} != {}".format( @@ -280,7 +279,7 @@ def run_main(self, num_workers, places, persistent_workers): step_list = [] loss_list = [] start_t = time.time() - for _ in six.moves.range(EPOCH_NUM): + for _ in range(EPOCH_NUM): step = 0 for d in dataloader: assert len(d) == len(places), "{} != {}".format( diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor_dry_run.py b/python/paddle/fluid/tests/unittests/test_parallel_executor_dry_run.py index 9cac242a7ba7b..d2feddffc85da 100644 --- a/python/paddle/fluid/tests/unittests/test_parallel_executor_dry_run.py +++ b/python/paddle/fluid/tests/unittests/test_parallel_executor_dry_run.py @@ -17,7 +17,6 @@ from paddle.fluid import compiler import unittest import logging -import six import os os.environ['CPU_NUM'] = str(4) @@ -52,8 +51,8 @@ def main(self, train_cp = compiler.CompiledProgram( main_prog).with_data_parallel(loss_name=loss.name, exec_strategy=exe_strategy) - for _ in six.moves.xrange(iter): - for _ in six.moves.xrange(iter_per_pe): + for _ in range(iter): + for _ in range(iter_per_pe): exe.run(train_cp) @@ -71,7 +70,7 @@ def network_func(): img = fluid.layers.data(name='img', shape=[784], dtype='float32') label = fluid.layers.data(name='label', shape=[1], dtype='int64') hidden = img - for _ in six.moves.xrange(10): + for _ in range(10): hidden = fluid.layers.fc(input=img, size=200, act='tanh') prediction = fluid.layers.fc(input=hidden, size=10, act='softmax') loss = fluid.layers.cross_entropy(input=prediction, label=label) diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor_fetch_isolated_var.py b/python/paddle/fluid/tests/unittests/test_parallel_executor_fetch_isolated_var.py index 0a1b2a5d4591c..3d2146ab36baa 100644 --- a/python/paddle/fluid/tests/unittests/test_parallel_executor_fetch_isolated_var.py +++ b/python/paddle/fluid/tests/unittests/test_parallel_executor_fetch_isolated_var.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import paddle.fluid as fluid import paddle import os @@ -92,7 +91,7 @@ def run_impl(self, use_gpu, dev_cnt, is_training, use_experimental_executor, places=places) BATCH_SIZE = 8 * dev_cnt - for _ in six.moves.range(10): + for _ in range(10): x_np = np.random.random(size=[BATCH_SIZE, 10]).astype('float32') y_np = np.random.random(size=[BATCH_SIZE, 10]).astype('float32') diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py b/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py index 5500f6718041a..926201e6eaaf4 100644 --- a/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py +++ b/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py @@ -15,7 +15,6 @@ import paddle.fluid as fluid import numpy as np import unittest -import six class TestInferencePartialFeed(unittest.TestCase): @@ -57,7 +56,7 @@ def assert_merged_unmerged(merged, unmerged): np.testing.assert_array_equal(merged, unmerged) def feed_split_test(): - for place_num in six.moves.range(1, len(places) * 3): + for place_num in range(1, len(places) * 3): x_np = gen_random([place_num, self.size]) y_np = gen_random([place_num, self.size]) if not lr.persistable or place_num <= len(places): @@ -87,12 +86,12 @@ def feed_split_test(): self.assertTrue(np.all(expected_relu_lr_np == relu_lr_np)) def feed_list_test(): - for place_num in six.moves.range(1, len(places) + 1): + for place_num in range(1, len(places) + 1): x_np_list = [] y_np_list = [] lr_np_list = [] feed_list = [] - for _ in six.moves.range(place_num): + for _ in range(place_num): x_np = gen_random([1, self.size]) y_np = gen_random([1, self.size]) lr_np = gen_random([1]) @@ -131,7 +130,7 @@ def feed_list_test(): assert_result(y_np, relu_y_np) assert_result(lr_np, relu_lr_np) - for _ in six.moves.range(self.iterations): + for _ in range(self.iterations): if use_split: feed_split_test() else: @@ -160,7 +159,7 @@ def setUp(self): def create_reader(self): def __impl__(): - for _ in six.moves.range(self.batch_num): + for _ in range(self.batch_num): yield np.random.random([self.batch_size, 1]).astype('float32'), return __impl__ @@ -185,7 +184,7 @@ def run_network(self, iterable, use_cuda, drop_last): loader.set_batch_generator(self.create_reader(), places=places if iterable else None) - for _ in six.moves.range(self.epoch_num): + for _ in range(self.epoch_num): actual_batch_num = 0 if loader.iterable: for feed_data in loader(): diff --git a/python/paddle/fluid/tests/unittests/test_partial_concat_op.py b/python/paddle/fluid/tests/unittests/test_partial_concat_op.py index 33e9f414ba291..1e4c0076da6e7 100644 --- a/python/paddle/fluid/tests/unittests/test_partial_concat_op.py +++ b/python/paddle/fluid/tests/unittests/test_partial_concat_op.py @@ -16,7 +16,6 @@ import numpy as np from op_test import OpTest import random -import six def np_partial_concat(inputs, start, length): @@ -44,11 +43,9 @@ def setUp(self): self.op_type = "partial_concat" self.init_kernel_type() self.init_para() - self.var_names = [ - 'x' + str(num) for num in six.moves.range(self.var_num) - ] + self.var_names = ['x' + str(num) for num in range(self.var_num)] self.vars = [np.random.random((self.batch_size, self.column)).astype(self.dtype)\ - for num in six.moves.range(self.var_num) ] + for num in range(self.var_num) ] self.inputs = {'X': list(zip(self.var_names, self.vars))} self.attrs = {'start_index': self.start_index, 'length': self.length} y = np_partial_concat(self.vars[:], self.start_index, self.length) diff --git a/python/paddle/fluid/tests/unittests/test_partial_sum_op.py b/python/paddle/fluid/tests/unittests/test_partial_sum_op.py index f6ae90b086d21..5eb416cadc82d 100644 --- a/python/paddle/fluid/tests/unittests/test_partial_sum_op.py +++ b/python/paddle/fluid/tests/unittests/test_partial_sum_op.py @@ -16,7 +16,6 @@ import numpy as np from op_test import OpTest import random -import six class TestPartialSumOp(OpTest): @@ -29,15 +28,13 @@ def setUp(self): end_index = self.column else: end_index = self.start_index + self.length - self.var_names = [ - 'x' + str(num) for num in six.moves.range(self.var_num) - ] + self.var_names = ['x' + str(num) for num in range(self.var_num)] self.vars = [np.random.random((self.batch_size, self.column)).astype(self.dtype)\ - for num in six.moves.range(self.var_num) ] + for num in range(self.var_num) ] self.inputs = {'X': list(zip(self.var_names, self.vars))} self.attrs = {'start_index': self.start_index, 'length': self.length} y = self.vars[0][:, self.start_index:end_index] - for i in six.moves.range(1, self.var_num): + for i in range(1, self.var_num): y = y + self.vars[i][:, self.start_index:end_index] self.outputs = {'Out': y} diff --git a/python/paddle/fluid/tests/unittests/test_positive_negative_pair_op.py b/python/paddle/fluid/tests/unittests/test_positive_negative_pair_op.py index 221fb0e86e24e..dcbd5928fc4b1 100644 --- a/python/paddle/fluid/tests/unittests/test_positive_negative_pair_op.py +++ b/python/paddle/fluid/tests/unittests/test_positive_negative_pair_op.py @@ -15,7 +15,6 @@ import unittest import itertools import numpy as np -import six from op_test import OpTest @@ -33,7 +32,7 @@ def py_pnpair_op(score, label, query, column=-1, weight=None): # accumulate statistics pos, neg, neu = 0, 0, 0 - for _, ranks in six.iteritems(predictions): + for _, ranks in predictions.items(): for e1, e2 in itertools.combinations(ranks, 2): s1, s2, l1, l2, w1, w2 = e1[0], e2[0], e1[1], e2[1], e1[2], e2[2] w = (w1 + w2) * 0.5 diff --git a/python/paddle/fluid/tests/unittests/test_py_func_op.py b/python/paddle/fluid/tests/unittests/test_py_func_op.py index 0eaf4b453bdaa..91e41a28ee54f 100644 --- a/python/paddle/fluid/tests/unittests/test_py_func_op.py +++ b/python/paddle/fluid/tests/unittests/test_py_func_op.py @@ -17,7 +17,6 @@ from paddle.fluid import compiler import paddle import unittest -import six import numpy as np dev_cnt = 2 @@ -52,7 +51,7 @@ def cross_entropy(logits, labels): M = logits.shape[0] N = logits.shape[1] ret = np.ndarray([M, 1]).astype(logits.dtype) - for idx in six.moves.range(M): + for idx in range(M): ret[idx][0] = -np.log(logits[idx][labels[idx][0]]) return ret @@ -64,7 +63,7 @@ def cross_entropy_grad(logits, labels, bwd_dout): M = logits.shape[0] N = logits.shape[1] dlogits = np.zeros([M, N]).astype(logits.dtype) - for idx in six.moves.range(M): + for idx in range(M): dlogits[idx][labels[idx] [0]] = -bwd_dout[idx] / logits[idx][labels[idx][0]] return dlogits, None @@ -132,7 +131,7 @@ def simple_fc_net(img, label, use_py_func_op): def reader(): - for _ in six.moves.range(dev_cnt * 100): + for _ in range(dev_cnt * 100): yield np.random.random([784]), np.random.random_integers(size=[1], low=0, high=9) @@ -170,7 +169,7 @@ def test_main(use_cuda, use_py_func_op, use_parallel_executor): fetch_list = [loss] ret = [] - for epoch_id in six.moves.range(2): + for epoch_id in range(2): for d in r(): L, = exe.run(train_cp, feed=feeder.feed(d), @@ -193,7 +192,7 @@ def test_loss_diff(self): if L is not None: losses.append(L) - for idx in six.moves.range(len(losses) - 1): + for idx in range(len(losses) - 1): max_diff = np.max(np.abs(losses[idx] - losses[0])) self.assertAlmostEqual(max_diff, 0, delta=1e-3) diff --git a/python/paddle/fluid/tests/unittests/test_run_program_op.py b/python/paddle/fluid/tests/unittests/test_run_program_op.py index 89642bb66168b..51538266b5daf 100644 --- a/python/paddle/fluid/tests/unittests/test_run_program_op.py +++ b/python/paddle/fluid/tests/unittests/test_run_program_op.py @@ -15,7 +15,6 @@ import contextlib import unittest import numpy as np -import six import paddle from paddle import _legacy_C_ops @@ -57,8 +56,7 @@ def _build_program_by_desc(program_desc): prog = framework.Program() prog.desc = program_desc prog.blocks = [ - framework.Block(prog, i) - for i in six.moves.range(prog.desc.num_blocks()) + framework.Block(prog, i) for i in range(prog.desc.num_blocks()) ] prog._sync_with_cpp() return prog @@ -148,7 +146,7 @@ def check_output_with_place(self, place): actual_outs = self.calc_dygraph_output(place) # Step 2. compare output - for expect_v, actual_v in six.moves.zip(self.expect_outs, actual_outs): + for expect_v, actual_v in zip(self.expect_outs, actual_outs): np.testing.assert_allclose(expect_v, actual_v.numpy(), rtol=1e-05, @@ -159,8 +157,7 @@ def check_grad_with_place(self, place): actual_grads = self.calc_dygraph_grad(place) # Step 2. compare grads - for expect_v, actual_v in six.moves.zip(self.expect_grads, - actual_grads): + for expect_v, actual_v in zip(self.expect_grads, actual_grads): np.testing.assert_array_almost_equal(expect_v, actual_v) np.testing.assert_allclose(expect_v, actual_v, @@ -298,7 +295,7 @@ def calc_dygraph_grad(self, place): def _get_grad_vartype(self, name): assert self.program_desc is not None grad_name = name + core.grad_var_suffix() - for i in six.moves.range(self.program_desc.num_blocks()): + for i in range(self.program_desc.num_blocks()): block = self.program_desc.block(i) var_desc = block.find_var_recursive(grad_name.encode()) return var_desc.type() if var_desc is not None else None diff --git a/python/paddle/fluid/tests/unittests/test_sync_batch_norm_op.py b/python/paddle/fluid/tests/unittests/test_sync_batch_norm_op.py index 23afe938b8b35..055187d8aabc3 100644 --- a/python/paddle/fluid/tests/unittests/test_sync_batch_norm_op.py +++ b/python/paddle/fluid/tests/unittests/test_sync_batch_norm_op.py @@ -19,7 +19,6 @@ import unittest import numpy as np import os -import six import paddle import paddle.fluid.core as core import paddle.fluid as fluid @@ -161,7 +160,7 @@ def _compare(self, place, layout, only_forward): feed={'input': data}, fetch_list=fetch_names) - for i in six.moves.xrange(1, len(sync_bn_fetches)): + for i in range(1, len(sync_bn_fetches)): bn_val = bn_fetches[i] sync_bn_val = sync_bn_fetches[i] if sync_bn_val.shape != bn_val.shape: diff --git a/python/paddle/fluid/tests/unittests/test_tensor_fill_.py b/python/paddle/fluid/tests/unittests/test_tensor_fill_.py index a6055e7b40eb1..e52c761fd4ef5 100644 --- a/python/paddle/fluid/tests/unittests/test_tensor_fill_.py +++ b/python/paddle/fluid/tests/unittests/test_tensor_fill_.py @@ -15,7 +15,6 @@ import paddle.fluid as fluid import unittest import numpy as np -import six import paddle from paddle.fluid.framework import _test_eager_guard @@ -37,7 +36,7 @@ def func_test_tensor_fill_true(self): paddle.set_device('cpu') else: paddle.set_device('gpu') - np_arr = np.reshape(np.array(six.moves.range(np.prod(self.shape))), + np_arr = np.reshape(np.array(range(np.prod(self.shape))), self.shape) for dtype in typelist: var = 1. @@ -65,7 +64,7 @@ def func_test_tensor_fill_backward(self): paddle.set_device('cpu') else: paddle.set_device('gpu') - np_arr = np.reshape(np.array(six.moves.range(np.prod(self.shape))), + np_arr = np.reshape(np.array(range(np.prod(self.shape))), self.shape) for dtype in typelist: var = int(1) diff --git a/python/paddle/fluid/tests/unittests/test_tensor_to_list.py b/python/paddle/fluid/tests/unittests/test_tensor_to_list.py index 5b8e2b18d9e18..899be8c996cf2 100644 --- a/python/paddle/fluid/tests/unittests/test_tensor_to_list.py +++ b/python/paddle/fluid/tests/unittests/test_tensor_to_list.py @@ -15,7 +15,6 @@ import paddle.fluid as fluid import unittest import numpy as np -import six import paddle from paddle.fluid.framework import _test_eager_guard @@ -32,7 +31,7 @@ def func_tensor_tolist(self): places.append(fluid.CUDAPinnedPlace()) for p in places: - np_arr = np.reshape(np.array(six.moves.range(np.prod(self.shape))), + np_arr = np.reshape(np.array(range(np.prod(self.shape))), self.shape) expectlist = np_arr.tolist() diff --git a/python/paddle/fluid/tests/unittests/test_tensor_to_numpy.py b/python/paddle/fluid/tests/unittests/test_tensor_to_numpy.py index 635e08e3811cd..1bd2f104854e2 100644 --- a/python/paddle/fluid/tests/unittests/test_tensor_to_numpy.py +++ b/python/paddle/fluid/tests/unittests/test_tensor_to_numpy.py @@ -15,7 +15,6 @@ import paddle.fluid as fluid import unittest import numpy as np -import six class TensorToNumpyTest(unittest.TestCase): @@ -36,8 +35,8 @@ def test_main(self): for p in places: for dtype in dtypes: np_arr = np.reshape( - np.array(six.moves.range(np.prod( - self.shape))).astype(dtype), self.shape) + np.array(range(np.prod(self.shape))).astype(dtype), + self.shape) t = fluid.LoDTensor() t.set(np_arr, p) diff --git a/python/paddle/fluid/tests/unittests/test_tensor_zero_.py b/python/paddle/fluid/tests/unittests/test_tensor_zero_.py index 30825e637b92e..b8d55028ed24c 100644 --- a/python/paddle/fluid/tests/unittests/test_tensor_zero_.py +++ b/python/paddle/fluid/tests/unittests/test_tensor_zero_.py @@ -15,7 +15,6 @@ import paddle.fluid as fluid import unittest import numpy as np -import six import paddle from paddle.fluid.framework import _test_eager_guard @@ -33,7 +32,7 @@ def func_test_tensor_fill_true(self): places.append(fluid.CUDAPinnedPlace()) for p in places: - np_arr = np.reshape(np.array(six.moves.range(np.prod(self.shape))), + np_arr = np.reshape(np.array(range(np.prod(self.shape))), self.shape) for dtype in typelist: tensor = paddle.to_tensor(np_arr, place=p, dtype=dtype) diff --git a/python/paddle/fluid/tests/unittests/test_var_base.py b/python/paddle/fluid/tests/unittests/test_var_base.py index 40b26cdcaecb2..7804aec60c995 100644 --- a/python/paddle/fluid/tests/unittests/test_var_base.py +++ b/python/paddle/fluid/tests/unittests/test_var_base.py @@ -14,7 +14,6 @@ import unittest import numpy as np -import six import copy import paddle @@ -1321,7 +1320,7 @@ def _test(self, value): if _in_legacy_dygraph(): self.assertEqual(self.tensor_x.inplace_version, 1) - if isinstance(value, (six.integer_types, float)): + if isinstance(value, (int, float)): result = np.zeros((2, 3)).astype(self.dtype) + value else: @@ -1426,7 +1425,7 @@ def _test(self, value): self.tensor_x[index_1] = value self.assertEqual(self.tensor_x.inplace_version, 1) - if isinstance(value, (six.integer_types, float)): + if isinstance(value, (int, float)): result = np.zeros((2, 3)).astype(self.dtype) + value else: @@ -1497,7 +1496,7 @@ def _test(self, value): self.tensor_x[index] = value self.assertEqual(self.tensor_x.inplace_version, 1) - if isinstance(value, (six.integer_types, float)): + if isinstance(value, (int, float)): result = np.zeros((2, 3)).astype(self.dtype) + value else: diff --git a/python/paddle/fluid/tests/unittests/xpu/test_sequence_unpad_op_xpu.py b/python/paddle/fluid/tests/unittests/xpu/test_sequence_unpad_op_xpu.py index 50561fff4e664..10979e21c62f7 100644 --- a/python/paddle/fluid/tests/unittests/xpu/test_sequence_unpad_op_xpu.py +++ b/python/paddle/fluid/tests/unittests/xpu/test_sequence_unpad_op_xpu.py @@ -13,7 +13,6 @@ # limitations under the License. import unittest -import six import numpy as np import sys @@ -65,7 +64,7 @@ def compute(self): out_lod = [self.length] out = x[0, 0:self.length[0]] - for i in six.moves.xrange(1, x.shape[0]): + for i in range(1, x.shape[0]): out = np.append(out, x[i, 0:self.length[i]], axis=0) out_shape = (sum(self.length), ) diff --git a/python/paddle/fluid/transpiler/collective.py b/python/paddle/fluid/transpiler/collective.py index a57e1b11c2fbf..84912529cfbee 100644 --- a/python/paddle/fluid/transpiler/collective.py +++ b/python/paddle/fluid/transpiler/collective.py @@ -18,7 +18,6 @@ import os import collections -import six import logging import numpy as np diff --git a/python/paddle/fluid/transpiler/details/checkport.py b/python/paddle/fluid/transpiler/details/checkport.py index 1341bdaedf99e..71c9565a362c6 100644 --- a/python/paddle/fluid/transpiler/details/checkport.py +++ b/python/paddle/fluid/transpiler/details/checkport.py @@ -16,7 +16,6 @@ import time import socket from contextlib import closing -from six import string_types def wait_server_ready(endpoints): @@ -33,7 +32,7 @@ def wait_server_ready(endpoints): wait_server_ready(["127.0.0.1:8080", "127.0.0.1:8081"]) """ - assert not isinstance(endpoints, string_types) + assert not isinstance(endpoints, str) while True: all_ok = True not_ready_endpoints = [] diff --git a/python/paddle/fluid/transpiler/details/program_utils.py b/python/paddle/fluid/transpiler/details/program_utils.py index 4083d46dffac4..91027db52679b 100644 --- a/python/paddle/fluid/transpiler/details/program_utils.py +++ b/python/paddle/fluid/transpiler/details/program_utils.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six - from paddle.fluid import core import paddle diff --git a/python/paddle/fluid/transpiler/distribute_transpiler.py b/python/paddle/fluid/transpiler/distribute_transpiler.py index 32aa36297298d..670f54311225f 100644 --- a/python/paddle/fluid/transpiler/distribute_transpiler.py +++ b/python/paddle/fluid/transpiler/distribute_transpiler.py @@ -34,7 +34,6 @@ from functools import reduce import collections -import six import logging import numpy as np @@ -690,7 +689,7 @@ def transpile(self, # fc_w@GRAD_trainer_0, fc_w@GRAD_trainer_1 --> pserver1 # fc_b@GRAD_trainer_0, fc_b@GRAD_trainer_1 --> pserver2 # shuffle the map will avoid the uneven distribution above - grad_var_mapping_items = list(six.iteritems(self.grad_var_mapping)) + grad_var_mapping_items = list(self.grad_var_mapping.items()) if not self.config.slice_var_up: np.random.seed(self.origin_program.random_seed) @@ -872,7 +871,7 @@ def transpile(self, # step4: Concat the parameters splits together after recv. all_recv_outputs = [] - for param_varname, splited_var in six.iteritems(self.param_var_mapping): + for param_varname, splited_var in self.param_var_mapping.items(): eps = [] table_names = [] for var in splited_var: @@ -943,7 +942,7 @@ def transpile(self, RPC_OP_ROLE_ATTR_VALUE }) - for param_varname, splited_var in six.iteritems(self.param_var_mapping): + for param_varname, splited_var in self.param_var_mapping.items(): if len(splited_var) <= 1: continue orig_param = program.global_block().vars[param_varname] @@ -1106,7 +1105,7 @@ def _get_trainer_startup_program(self, recv_vars, eplist): # self._fake_init_sparsetable(sparse_table_names) # self._delete_trainer_optimizer(is_startup=True) - for varname, splited_var in six.iteritems(self.param_var_mapping): + for varname, splited_var in self.param_var_mapping.items(): if varname in sparse_table_names: continue # Get the eplist of recv vars @@ -1149,7 +1148,7 @@ def _get_trainer_startup_program(self, recv_vars, eplist): RPC_OP_ROLE_ATTR_NAME: RPC_OP_ROLE_ATTR_VALUE }) - for varname, splited_var in six.iteritems(self.param_var_mapping): + for varname, splited_var in self.param_var_mapping.items(): if varname in sparse_table_names: continue # add concat ops to merge split parameters received from parameter servers. @@ -1526,7 +1525,7 @@ def _get_splited_name_and_shape(varname): # 1. create vars in pserver program to startup program pserver_vars = pserver_program.global_block().vars created_var_map = collections.OrderedDict() - for _, var in six.iteritems(pserver_vars): + for _, var in pserver_vars.items(): tmpvar = s_prog.global_block()._clone_variable(var) created_var_map[var.name] = tmpvar @@ -2068,7 +2067,7 @@ def _create_vars_from_blocklist(self, block_map[varname] = [] block_map[varname].append((int(offset), int(size))) - for varname, split in six.iteritems(block_map): + for varname, split in block_map.items(): orig_var = program.global_block().var(varname) if len(split) == 1: if self.sync_mode and add_trainer_suffix: @@ -2427,7 +2426,7 @@ def _get_pserver_grad_param_var(self, var, var_dict): _generated_var_123 -> None """ grad_block = None - for _, g in six.iteritems(var_dict): + for _, g in var_dict.items(): if self._orig_varname(g.name) == self._orig_varname(var.name): # skip per trainer vars if g.name.find(".trainer_") == -1: @@ -2441,7 +2440,7 @@ def _get_pserver_grad_param_var(self, var, var_dict): def _clone_lr_op(self, program, block, op): inputs = self._get_input_map_from_op( self.origin_program.global_block().vars, op) - for key, varlist in six.iteritems(inputs): + for key, varlist in inputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: @@ -2450,7 +2449,7 @@ def _clone_lr_op(self, program, block, op): outputs = self._get_output_map_from_op( self.origin_program.global_block().vars, op) - for key, varlist in six.iteritems(outputs): + for key, varlist in outputs.items(): if not isinstance(varlist, list): varlist = [varlist] for var in varlist: @@ -2467,7 +2466,7 @@ def _append_pserver_non_opt_ops(self, optimize_block, opt_op): # Append the ops for parameters that do not need to be optimized/updated inputs = self._get_input_map_from_op( self.origin_program.global_block().vars, opt_op) - for key, varlist in six.iteritems(inputs): + for key, varlist in inputs.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): @@ -2488,7 +2487,7 @@ def _append_pserver_non_opt_ops(self, optimize_block, opt_op): outputs = self._get_output_map_from_op( self.origin_program.global_block().vars, opt_op) - for key, varlist in six.iteritems(outputs): + for key, varlist in outputs.items(): if not isinstance(varlist, list): varlist = [varlist] for i in range(len(varlist)): diff --git a/python/paddle/fluid/transpiler/geo_sgd_transpiler.py b/python/paddle/fluid/transpiler/geo_sgd_transpiler.py index 2818094f80a87..fe018f611a376 100644 --- a/python/paddle/fluid/transpiler/geo_sgd_transpiler.py +++ b/python/paddle/fluid/transpiler/geo_sgd_transpiler.py @@ -26,7 +26,6 @@ """ import sys import collections -import six import numpy as np from .ps_dispatcher import RoundRobin, PSDispatcher @@ -115,7 +114,7 @@ def transpile(self, # step 3. create send recv var (param after optimize) send_vars = [] ps_dispatcher.reset() - param_var_mapping_items = list(six.iteritems(self.param_var_mapping)) + param_var_mapping_items = list(self.param_var_mapping.items()) # send_vars is the parameter which split by communicator and send to pserver,not the origin parameter for _, splited_vars in param_var_mapping_items: for _, var in enumerate(splited_vars): diff --git a/python/paddle/fluid/unique_name.py b/python/paddle/fluid/unique_name.py index e56214895959b..39270ec2dfeca 100644 --- a/python/paddle/fluid/unique_name.py +++ b/python/paddle/fluid/unique_name.py @@ -14,8 +14,6 @@ import collections from .wrapped_decorator import signature_safe_contextmanager -import six -import sys __all__ = ['generate', 'switch', 'guard'] @@ -214,9 +212,9 @@ def guard(new_generator=None): name_2 = paddle.utils.unique_name.generate('fc') print(name_1, name_2) # Afc_0, Bfc_0 """ - if isinstance(new_generator, six.string_types): + if isinstance(new_generator, str): new_generator = UniqueNameGenerator(new_generator) - elif isinstance(new_generator, six.binary_type): + elif isinstance(new_generator, bytes): new_generator = UniqueNameGenerator(new_generator.decode()) old_generator, old_para_name_checker = switch(new_generator) diff --git a/python/paddle/hapi/model.py b/python/paddle/hapi/model.py index 5bd926fddf84a..788043477a259 100644 --- a/python/paddle/hapi/model.py +++ b/python/paddle/hapi/model.py @@ -16,7 +16,6 @@ import os import pickle import numpy as np -import six import warnings import time import socket @@ -108,7 +107,7 @@ def _all_gather(x, nranks, ring_id=0, use_calc_stream=True): def wait_server_ready(endpoints): - assert not isinstance(endpoints, six.string_types) + assert not isinstance(endpoints, str) while True: all_ok = True not_ready_endpoints = [] diff --git a/python/paddle/metric/metrics.py b/python/paddle/metric/metrics.py index a7d8da75fec52..1404c7531b4ee 100644 --- a/python/paddle/metric/metrics.py +++ b/python/paddle/metric/metrics.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import abc import numpy as np @@ -29,8 +28,7 @@ def _is_numpy_(var): return isinstance(var, (np.ndarray, np.generic)) -@six.add_metaclass(abc.ABCMeta) -class Metric(object): +class Metric(metaclass=abc.ABCMeta): r""" Base class for metric, encapsulates metric logic and APIs Usage: diff --git a/python/paddle/nn/layer/rnn.py b/python/paddle/nn/layer/rnn.py index cbd8b5e6493f8..2821277c8f84a 100644 --- a/python/paddle/nn/layer/rnn.py +++ b/python/paddle/nn/layer/rnn.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import math from functools import reduce @@ -188,8 +187,7 @@ def _is_shape_sequence(seq): # TODO: Add check for the illegal if isinstance(seq, dict): return True - return (isinstance(seq, Sequence) - and not isinstance(seq, six.string_types)) + return (isinstance(seq, Sequence) and not isinstance(seq, str)) class Shape(object): diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py index 0c41ae4909f04..f7ba974fc0fd9 100644 --- a/python/paddle/reader/decorator.py +++ b/python/paddle/reader/decorator.py @@ -19,10 +19,9 @@ import warnings import logging -from six.moves.queue import Queue -from six.moves import zip_longest -from six.moves import map -from six.moves import zip +from queue import Queue +from itertools import zip_longest + import itertools import random diff --git a/python/paddle/static/input.py b/python/paddle/static/input.py index 4098ae5dbf358..6cd5700764118 100644 --- a/python/paddle/static/input.py +++ b/python/paddle/static/input.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six - import paddle from paddle.fluid import core, Variable from paddle.fluid.layer_helper import LayerHelper @@ -90,11 +88,11 @@ def data(name, shape, dtype=None, lod_level=0): """ helper = LayerHelper('data', **locals()) - check_type(name, 'name', (six.binary_type, six.text_type), 'data') + check_type(name, 'name', (bytes, str), 'data') check_type(shape, 'shape', (list, tuple), 'data') shape = list(shape) - for i in six.moves.range(len(shape)): + for i in range(len(shape)): if shape[i] is None: shape[i] = -1 @@ -250,7 +248,7 @@ def batch(self, batch_size): "Length of batch_size: {} shall be 1, but received {}.". format(batch_size, len(batch_size))) batch_size = batch_size[1] - elif not isinstance(batch_size, six.integer_types): + elif not isinstance(batch_size, int): raise TypeError( "type(batch_size) shall be `int`, but received {}.".format( type(batch_size).__name__)) @@ -299,7 +297,7 @@ def _verify(self, shape): for i, ele in enumerate(shape): if ele is not None: - if not isinstance(ele, six.integer_types): + if not isinstance(ele, int): raise ValueError( "shape[{}] should be an `int`, but received `{}`:{}.". format(i, diff --git a/python/paddle/static/io.py b/python/paddle/static/io.py index 1f625f86353de..279fc60a669fe 100644 --- a/python/paddle/static/io.py +++ b/python/paddle/static/io.py @@ -17,7 +17,6 @@ import logging import os import warnings -import six import numpy as np import paddle @@ -69,7 +68,7 @@ def _normalize_path_prefix(path_prefix): """ convert path_prefix to absolute path. """ - if not isinstance(path_prefix, six.string_types): + if not isinstance(path_prefix, str): raise ValueError("'path_prefix' should be a string.") if path_prefix.endswith("/"): raise ValueError("'path_prefix' should not be a directory") diff --git a/python/paddle/tensor/layer_function_generator.py b/python/paddle/tensor/layer_function_generator.py index a9a7bb6db6add..e4b36ba5e1418 100644 --- a/python/paddle/tensor/layer_function_generator.py +++ b/python/paddle/tensor/layer_function_generator.py @@ -16,7 +16,7 @@ import warnings import string -from six.moves import cStringIO +from io import StringIO from ..static import Variable from ..fluid.proto import framework_pb2 from ..framework import OpProtoHolder, _non_static_mode, convert_np_dtype_to_dtype_, core, in_dygraph_mode @@ -76,7 +76,7 @@ def _generate_doc_string_(op_proto, if not isinstance(op_proto, framework_pb2.OpProto): raise TypeError("OpProto should be `framework_pb2.OpProto`") - buf = cStringIO() + buf = StringIO() buf.write(escape_math(op_proto.comment)) buf.write('\nArgs:\n') for each_input in op_proto.inputs: diff --git a/python/paddle/text/datasets/imdb.py b/python/paddle/text/datasets/imdb.py index a42fb3cd1b60b..80b650574b4dd 100644 --- a/python/paddle/text/datasets/imdb.py +++ b/python/paddle/text/datasets/imdb.py @@ -13,7 +13,6 @@ # limitations under the License. import re -import six import string import tarfile import numpy as np @@ -96,11 +95,11 @@ def _build_work_dict(self, cutoff): word_freq[word] += 1 # Not sure if we should prune less-frequent words here. - word_freq = [x for x in six.iteritems(word_freq) if x[1] > cutoff] + word_freq = [x for x in word_freq.items() if x[1] > cutoff] dictionary = sorted(word_freq, key=lambda x: (-x[1], x[0])) words, _ = list(zip(*dictionary)) - word_idx = dict(list(zip(words, six.moves.range(len(words))))) + word_idx = dict(list(zip(words, range(len(words))))) word_idx[''] = len(words) return word_idx @@ -112,10 +111,9 @@ def _tokenize(self, pattern): if bool(pattern.match(tf.name)): # newline and punctuations removal and ad-hoc tokenization. data.append( - tarf.extractfile(tf).read().rstrip( - six.b("\n\r")).translate( - None, - six.b(string.punctuation)).lower().split()) + tarf.extractfile(tf).read().rstrip(b'\n\r').translate( + None, string.punctuation.encode( + 'latin-1')).lower().split()) tf = tarf.next() return data diff --git a/python/paddle/text/datasets/imikolov.py b/python/paddle/text/datasets/imikolov.py index 905e95e4c1433..03d6560e9bce8 100644 --- a/python/paddle/text/datasets/imikolov.py +++ b/python/paddle/text/datasets/imikolov.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import tarfile import numpy as np import collections @@ -125,12 +124,12 @@ def _build_work_dict(self, cutoff): del word_freq[''] word_freq = [ - x for x in six.iteritems(word_freq) if x[1] > self.min_word_freq + x for x in word_freq.items() if x[1] > self.min_word_freq ] word_freq_sorted = sorted(word_freq, key=lambda x: (-x[1], x[0])) words, _ = list(zip(*word_freq_sorted)) - word_idx = dict(list(zip(words, six.moves.range(len(words))))) + word_idx = dict(list(zip(words, range(len(words))))) word_idx[''] = len(words) return word_idx @@ -148,7 +147,7 @@ def _load_anno(self): l = [''] + l.strip().split() + [''] if len(l) >= self.window_size: l = [self.word_idx.get(w, UNK) for w in l] - for i in six.moves.range(self.window_size, len(l) + 1): + for i in range(self.window_size, len(l) + 1): self.data.append(tuple(l[i - self.window_size:i])) elif self.data_type == 'SEQ': l = l.strip().split() diff --git a/python/paddle/text/datasets/uci_housing.py b/python/paddle/text/datasets/uci_housing.py index 0a3fac72b0bb6..0bf677e271a5c 100644 --- a/python/paddle/text/datasets/uci_housing.py +++ b/python/paddle/text/datasets/uci_housing.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import numpy as np import paddle @@ -94,7 +93,7 @@ def _load_data(self, feature_num=14, ratio=0.8): data = data.reshape(data.shape[0] // feature_num, feature_num) maximums, minimums, avgs = data.max(axis=0), data.min( axis=0), data.sum(axis=0) / data.shape[0] - for i in six.moves.range(feature_num - 1): + for i in range(feature_num - 1): data[:, i] = (data[:, i] - avgs[i]) / (maximums[i] - minimums[i]) offset = int(data.shape[0] * ratio) if self.mode == 'train': diff --git a/python/paddle/text/datasets/wmt14.py b/python/paddle/text/datasets/wmt14.py index 715e3794f09a3..33c92c875e8de 100644 --- a/python/paddle/text/datasets/wmt14.py +++ b/python/paddle/text/datasets/wmt14.py @@ -14,7 +14,6 @@ import tarfile import numpy as np -import six from paddle.io import Dataset from paddle.dataset.common import _check_exists_and_download @@ -192,6 +191,6 @@ def get_dict(self, reverse=False): """ src_dict, trg_dict = self.src_dict, self.trg_dict if reverse: - src_dict = {v: k for k, v in six.iteritems(src_dict)} - trg_dict = {v: k for k, v in six.iteritems(trg_dict)} + src_dict = {v: k for k, v in src_dict.items()} + trg_dict = {v: k for k, v in trg_dict.items()} return src_dict, trg_dict diff --git a/python/paddle/text/datasets/wmt16.py b/python/paddle/text/datasets/wmt16.py index 66aa78c7833b7..4538f4b8a6a2c 100644 --- a/python/paddle/text/datasets/wmt16.py +++ b/python/paddle/text/datasets/wmt16.py @@ -15,7 +15,6 @@ """ import os -import six import tarfile import numpy as np from collections import defaultdict @@ -171,8 +170,7 @@ def _build_dict(self, dict_path, dict_size, lang): fout.write( ("%s\n%s\n%s\n" % (START_MARK, END_MARK, UNK_MARK)).encode()) for idx, word in enumerate( - sorted(six.iteritems(word_dict), - key=lambda x: x[1], + sorted(word_dict.items(), key=lambda x: x[1], reverse=True)): if idx + 3 == dict_size: break fout.write(word[0].encode()) diff --git a/python/paddle/utils/cpp_extension/cpp_extension.py b/python/paddle/utils/cpp_extension/cpp_extension.py index 4ac8949d4753c..5ff1d1cc29207 100644 --- a/python/paddle/utils/cpp_extension/cpp_extension.py +++ b/python/paddle/utils/cpp_extension/cpp_extension.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import six import copy import re @@ -37,7 +36,7 @@ # Note(zhouwei): On windows, it will export function 'PyInit_[name]' by default, # The solution is: 1.User add function PyInit_[name] 2. set not to export # refer to https://stackoverflow.com/questions/34689210/error-exporting-symbol-when-building-python-c-extension-in-windows -if IS_WINDOWS and six.PY3: +if IS_WINDOWS: from distutils.command.build_ext import build_ext as _du_build_ext from unittest.mock import Mock _du_build_ext.get_export_symbols = Mock(return_value=None) @@ -594,7 +593,7 @@ def get_ext_filename(self, fullname): ext_name = super(BuildExtension, self).get_ext_filename(fullname) split_str = '.' name_items = ext_name.split(split_str) - if self.no_python_abi_suffix and six.PY3: + if self.no_python_abi_suffix: assert len( name_items ) > 2, "Expected len(name_items) > 2, but received {}".format( diff --git a/python/paddle/utils/image_util.py b/python/paddle/utils/image_util.py index 9c93d44eeecb0..a694d32c93b55 100644 --- a/python/paddle/utils/image_util.py +++ b/python/paddle/utils/image_util.py @@ -14,7 +14,7 @@ import numpy as np from PIL import Image -from six.moves import cStringIO as StringIO +from io import StringIO __all__ = [] diff --git a/python/paddle/vision/datasets/cifar.py b/python/paddle/vision/datasets/cifar.py index 97b4aa85eaa89..1e3eb6515c8ee 100644 --- a/python/paddle/vision/datasets/cifar.py +++ b/python/paddle/vision/datasets/cifar.py @@ -14,9 +14,8 @@ import tarfile import numpy as np -import six from PIL import Image -from six.moves import cPickle as pickle +import pickle import paddle from paddle.io import Dataset @@ -154,11 +153,10 @@ def _load_data(self): for name in names: batch = pickle.load(f.extractfile(name), encoding='bytes') - data = batch[six.b('data')] - labels = batch.get(six.b('labels'), - batch.get(six.b('fine_labels'), None)) + data = batch[b'data'] + labels = batch.get(b'labels', batch.get(b'fine_labels', None)) assert labels is not None - for sample, label in six.moves.zip(data, labels): + for sample, label in zip(data, labels): self.data.append((sample, label)) def __getitem__(self, idx): diff --git a/tools/CrossStackProfiler/ProfileFileReader.py b/tools/CrossStackProfiler/ProfileFileReader.py index f9425248be467..282c2f1f25431 100755 --- a/tools/CrossStackProfiler/ProfileFileReader.py +++ b/tools/CrossStackProfiler/ProfileFileReader.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six import json import multiprocessing from multiprocessing import Process @@ -200,7 +199,7 @@ def _allocate_pids(self, profile_dict, gpuId, initPid): initLineNum = initPid + 1 lineDelta = len(profile_dict.keys()) i = 0 - for k, profile_pb in six.iteritems(profile_dict): + for k, profile_pb in profile_dict.items(): lineNum = initLineNum for event in profile_pb.events: if event.type == profiler_pb2.Event.CPU: @@ -298,7 +297,7 @@ def _allocate_pids(self, profile_dict, gpuId, initPid): def _allocate_events(self, profile_dict, devices, gpuId): chrome_trace = ChromeTraceFormatter() - for k, profile_pb in six.iteritems(profile_dict): + for k, profile_pb in profile_dict.items(): rankId = int(k.split(".")[-1]) @@ -334,7 +333,7 @@ def _allocate_memory_event(self, profile_dict, mem_devices, gpuId): profiler_pb2.MemEvent.CUDAPlace: "GPU", profiler_pb2.MemEvent.CUDAPinnedPlace: "CUDAPinnedPlace" } - for k, profile_pb in six.iteritems(profile_dict): + for k, profile_pb in profile_dict.items(): rankId = int(k.split(".")[-1]) trainerId = rankId / self._gpuPerTrainer diff --git a/tools/test_runner.py b/tools/test_runner.py index 615ab9eaefddd..bb1e623ce04c3 100644 --- a/tools/test_runner.py +++ b/tools/test_runner.py @@ -19,7 +19,7 @@ import paddle.fluid as fluid import importlib import paddle.fluid.core as core -from six.moves import cStringIO +from io import StringIO sys.path.append(os.path.abspath(os.path.dirname(__file__))) import static_mode_white_list @@ -38,7 +38,7 @@ def main(): if module_name in static_mode_white_list.STATIC_MODE_TESTING_LIST: flag_need_static_mode = True paddle.enable_static() - buffer = cStringIO() + buffer = StringIO() main = fluid.Program() startup = fluid.Program() scope = fluid.core.Scope() diff --git a/tools/timeline.py b/tools/timeline.py index b6c6a435f600f..e3de686f82997 100644 --- a/tools/timeline.py +++ b/tools/timeline.py @@ -14,7 +14,6 @@ import argparse import json -import six import paddle.fluid.proto.profiler.profiler_pb2 as profiler_pb2 @@ -143,7 +142,7 @@ def _allocate_pid(self): return cur_pid def _allocate_pids(self): - for k, profile_pb in six.iteritems(self._profile_dict): + for k, profile_pb in self._profile_dict.items(): for event in profile_pb.events: if event.type == profiler_pb2.Event.CPU: if (k, event.device_id, "CPU") not in self._devices: @@ -216,7 +215,7 @@ def _allocate_pids(self): "memory usage on %s:npu:%d" % (k, 0), pid) def _allocate_events(self): - for k, profile_pb in six.iteritems(self._profile_dict): + for k, profile_pb in self._profile_dict.items(): for event in profile_pb.events: if event.type == profiler_pb2.Event.CPU: type = "CPU" @@ -243,7 +242,7 @@ def _allocate_memory_event(self): profiler_pb2.MemEvent.CUDAPinnedPlace: "CUDAPinnedPlace", profiler_pb2.MemEvent.NPUPlace: "NPU" } - for k, profile_pb in six.iteritems(self._profile_dict): + for k, profile_pb in self._profile_dict.items(): mem_list = [] end_profiler = 0 for mevent in profile_pb.mem_events: