未验证 提交 18e71bdf 编写于 作者: J Jiangxinz 提交者: GitHub

Revert "Fix some Bugs of Undefined Variable (#33488)" (#33538)

This reverts commit b2afc8df.
上级 308467c3
......@@ -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,
......
......@@ -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):
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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()
......
......@@ -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(
......
......@@ -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())
......
......@@ -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)
......
......@@ -14,7 +14,6 @@
from __future__ import print_function
import six
import tarfile
import numpy as np
import gzip
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册