From 18e71bdf110348b890f595671c2e85a29148ec0c Mon Sep 17 00:00:00 2001 From: Jiangxinz Date: Tue, 15 Jun 2021 10:28:56 +0800 Subject: [PATCH] Revert "Fix some Bugs of Undefined Variable (#33488)" (#33538) This reverts commit b2afc8dfd2151c1646bd2dc639620df8b8858578. --- python/paddle/distributed/utils.py | 3 +-- python/paddle/fluid/dataloader/collate.py | 1 + python/paddle/fluid/optimizer.py | 4 +--- .../tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py | 1 - .../fluid/tests/unittests/test_eager_deletion_delete_vars.py | 2 +- python/paddle/fluid/tests/unittests/xpu/test_pool2d_op_xpu.py | 1 - python/paddle/optimizer/lr.py | 2 +- python/paddle/optimizer/optimizer.py | 4 ++-- python/paddle/tests/test_model.py | 2 +- python/paddle/text/datasets/wmt14.py | 1 - 10 files changed, 8 insertions(+), 13 deletions(-) diff --git a/python/paddle/distributed/utils.py b/python/paddle/distributed/utils.py index 447c059537b..9c56534095c 100644 --- a/python/paddle/distributed/utils.py +++ b/python/paddle/distributed/utils.py @@ -25,7 +25,6 @@ import subprocess from contextlib import closing import socket from paddle.fluid import core -from distutils.util import strtobool __all__ = [ #noqa 'get_host_name_ip', @@ -385,7 +384,7 @@ def add_arguments(argname, type, default, help, argparser, **kwargs): add_argument("name", str, "Jonh", "User name.", parser) args = parser.parse_args() """ - type = strtobool if type == bool else type + type = distutils.util.strtobool if type == bool else type argparser.add_argument( "--" + argname, default=default, diff --git a/python/paddle/fluid/dataloader/collate.py b/python/paddle/fluid/dataloader/collate.py index eaaf4cc2d9f..8e90b308b39 100644 --- a/python/paddle/fluid/dataloader/collate.py +++ b/python/paddle/fluid/dataloader/collate.py @@ -78,6 +78,7 @@ def default_collate_fn(batch): raise TypeError("batch data con only contains: tensor, numpy.ndarray, " "dict, list, number, but got {}".format(type(sample))) + return outputs def default_convert_fn(batch): diff --git a/python/paddle/fluid/optimizer.py b/python/paddle/fluid/optimizer.py index b1b6c95ea33..e2ddc20b8f9 100755 --- a/python/paddle/fluid/optimizer.py +++ b/python/paddle/fluid/optimizer.py @@ -14,7 +14,6 @@ from __future__ import print_function -import warnings import numpy as np import six import os @@ -22,7 +21,6 @@ import logging from collections import defaultdict import paddle -import paddle.fluid as fluid from paddle.fluid.distribute_lookup_table import find_distributed_lookup_table from paddle.fluid.framework import Program, Variable, name_scope, default_main_program, default_startup_program, device_guard @@ -1471,7 +1469,7 @@ class DGCMomentumOptimizer(Optimizer): assert isinstance( num_trainers, int ), "The type of num_trainers should be 'int', but received %s" % type( - num_trainers) + value) assert num_trainers > 0, "The value of num_trainers should be greater than 0!" self._num_trainers = num_trainers diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py index b473d2643d3..f31ddf921f8 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_conv2d_transpose_mkldnn_op.py @@ -18,7 +18,6 @@ import unittest import numpy as np import paddle.fluid.core as core from paddle.fluid.tests.unittests.op_test import OpTest -from paddle import enable_static from paddle.fluid.tests.unittests.test_conv2d_transpose_op import conv2dtranspose_forward_naive, TestConv2DTransposeOp 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 1590d866b1c..835f693ab6d 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 @@ -145,7 +145,7 @@ class TestExecutor(unittest.TestCase): def pe_main(self): image, label, loss = simple_fc_net() loss.persistable = False - persistables, non_persistables = get_persistables_and_non_persistables( + persitables, non_persistables = get_persistables_and_non_persistables( fluid.default_main_program(), [loss.name]) exe = fluid.Executor(self.place) diff --git a/python/paddle/fluid/tests/unittests/xpu/test_pool2d_op_xpu.py b/python/paddle/fluid/tests/unittests/xpu/test_pool2d_op_xpu.py index 53a91af3a71..bebb5c76264 100644 --- a/python/paddle/fluid/tests/unittests/xpu/test_pool2d_op_xpu.py +++ b/python/paddle/fluid/tests/unittests/xpu/test_pool2d_op_xpu.py @@ -25,7 +25,6 @@ from op_test_xpu import XPUOpTest import paddle.fluid as fluid from paddle.fluid import Program, program_guard import paddle -from test_pool2d_op import adaptive_start_index, adaptive_end_index paddle.enable_static() diff --git a/python/paddle/optimizer/lr.py b/python/paddle/optimizer/lr.py index db4e80d8d9a..7da933a9b72 100644 --- a/python/paddle/optimizer/lr.py +++ b/python/paddle/optimizer/lr.py @@ -1349,7 +1349,7 @@ class ReduceOnPlateau(LRScheduler): if isinstance(metrics, (Tensor, numpy.ndarray)): assert len(metrics.shape) == 1 and metrics.shape[0] == 1, "the metrics.shape " \ "should be (1L,), but the current metrics.shape is {}. Maybe that " \ - "you should call paddle.mean to process it first.".format(metrics.shape) + "you should call paddle.mean to process it first.".format(loss.shape) elif not isinstance(metrics, (int, float, numpy.float32, numpy.float64)): raise TypeError( diff --git a/python/paddle/optimizer/optimizer.py b/python/paddle/optimizer/optimizer.py index 93b618b7c9e..2cdf1d0d28e 100644 --- a/python/paddle/optimizer/optimizer.py +++ b/python/paddle/optimizer/optimizer.py @@ -309,11 +309,11 @@ class Optimizer(object): assert model_np.shape == load_para_np.shape, \ "Parameter shape not match, Dygraph Parameter [ {} ] need tensor with shape {} but load tensor with shape {}".format( - model_np.name, model_np.shape, load_para_np.shape) + item.name, model_np.shape, load_para_np.shape) assert model_np.dtype == load_para_np.dtype, \ "Parameter dtype not match, Dygraph Parameter [ {} ] need tensor with dtype {} but load tensor with dtype {}".format( - model_np.name, model_np.dtype, load_para_np.dtype) + item.name, model_np.dtype, load_para_np.dtype) tensor.set(load_para_np, framework._current_expected_place()) diff --git a/python/paddle/tests/test_model.py b/python/paddle/tests/test_model.py index 0ced69c0f2e..ae574a8241b 100644 --- a/python/paddle/tests/test_model.py +++ b/python/paddle/tests/test_model.py @@ -126,7 +126,7 @@ class TestModel(unittest.TestCase): @classmethod def setUpClass(cls): if not fluid.is_compiled_with_cuda(): - cls.skipTest('module not tested when ONLY_CPU compling') + self.skipTest('module not tested when ONLY_CPU compling') cls.device = paddle.set_device('gpu') fluid.enable_dygraph(cls.device) diff --git a/python/paddle/text/datasets/wmt14.py b/python/paddle/text/datasets/wmt14.py index 38ca09bf299..7c8a549e7cb 100644 --- a/python/paddle/text/datasets/wmt14.py +++ b/python/paddle/text/datasets/wmt14.py @@ -14,7 +14,6 @@ from __future__ import print_function -import six import tarfile import numpy as np import gzip -- GitLab