未验证 提交 bc01d56e 编写于 作者: N Nyakku Shigure 提交者: GitHub

[CodeStyle][isort] introduce isort (part6) (#48522)

上级 08c5f4c1
...@@ -19,13 +19,6 @@ extend_skip_glob = [ ...@@ -19,13 +19,6 @@ extend_skip_glob = [
"python/paddle/fluid/tests/unittests/mlu/**", "python/paddle/fluid/tests/unittests/mlu/**",
# These files will be fixed in the future # These files will be fixed in the future
"cmake/**",
"paddle/**",
"r/**",
"tools/**",
"python/paddle/[!f]**",
"python/paddle/fluid/tests/unittests/[t-z]**",
"python/paddle/fluid/tests/unittests/dygraph_to_static/test_error.py", "python/paddle/fluid/tests/unittests/dygraph_to_static/test_error.py",
"python/paddle/fluid/tests/unittests/dygraph_to_static/**", "python/paddle/jit/**",
"python/paddle/fluid/tests/unittests/ipu/test_dy2static_ipu.py",
] ]
...@@ -15,24 +15,25 @@ ...@@ -15,24 +15,25 @@
from collections import OrderedDict from collections import OrderedDict
import paddle import paddle
from paddle.fluid import unique_name
from paddle.fluid.framework import default_main_program
from paddle.distributed.fleet.meta_optimizers.common import OP_ROLE_KEY, OpRole
from .pass_base import PassBase, PassType, register_pass
from paddle.distributed.auto_parallel.operators.common import ( from paddle.distributed.auto_parallel.operators.common import (
is_data_parallel_scale_op,
is_data_parallel_reduce_op, is_data_parallel_reduce_op,
is_data_parallel_scale_op,
) )
from paddle.distributed.auto_parallel.utils import ( from paddle.distributed.auto_parallel.utils import (
find_higher_order_backward_op, find_higher_order_backward_op,
get_var_numel,
insert_dependencies_for_two_vars,
is_forward_op,
is_loss_grad_op, is_loss_grad_op,
is_optimize_op, is_optimize_op,
is_forward_op,
ring_id_to_process_group, ring_id_to_process_group,
get_var_numel,
use_standalone_executor, use_standalone_executor,
insert_dependencies_for_two_vars,
) )
from paddle.distributed.fleet.meta_optimizers.common import OP_ROLE_KEY, OpRole
from paddle.fluid import unique_name
from paddle.fluid.framework import default_main_program
from .pass_base import PassBase, PassType, register_pass
# add new optimizers supporting rescale_grad here # add new optimizers supporting rescale_grad here
__rescale_grad_supported_opts__ = [ __rescale_grad_supported_opts__ = [
......
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import numpy as np
from functools import reduce from functools import reduce
import numpy as np
import paddle import paddle
from .pass_base import PassBase, register_pass from ..auto_parallel.dist_attribute import (
from ..auto_parallel.reshard import Resharder OperatorDistributedAttribute,
TensorDistributedAttribute,
)
from ..auto_parallel.process_group import get_world_process_group from ..auto_parallel.process_group import get_world_process_group
from ..auto_parallel.reshard import Resharder
from ..auto_parallel.utils import ( from ..auto_parallel.utils import (
is_gradient_clip_op,
is_optimize_op,
OP_ROLE_KEY, OP_ROLE_KEY,
OpRole, OpRole,
_get_comm_group, _get_comm_group,
insert_dependencies_for_two_vars, insert_dependencies_for_two_vars,
is_gradient_clip_op,
is_optimize_op,
use_standalone_executor, use_standalone_executor,
) )
from ..auto_parallel.dist_attribute import ( from .pass_base import PassBase, register_pass
TensorDistributedAttribute,
OperatorDistributedAttribute,
)
def _get_params_grads(block): def _get_params_grads(block):
......
...@@ -21,10 +21,7 @@ import paddle ...@@ -21,10 +21,7 @@ import paddle
from paddle.distribution import distribution from paddle.distribution import distribution
from paddle.fluid.data_feeder import check_type, convert_dtype from paddle.fluid.data_feeder import check_type, convert_dtype
from paddle.fluid.framework import _non_static_mode from paddle.fluid.framework import _non_static_mode
from paddle.fluid.layers import ( from paddle.fluid.layers import nn, tensor
nn,
tensor,
)
class Normal(distribution.Distribution): class Normal(distribution.Distribution):
......
...@@ -23,12 +23,7 @@ from paddle.fluid.framework import ( ...@@ -23,12 +23,7 @@ from paddle.fluid.framework import (
_non_static_mode, _non_static_mode,
in_dygraph_mode, in_dygraph_mode,
) )
from paddle.fluid.layers import ( from paddle.fluid.layers import nn, tensor
nn,
tensor,
)
import paddle
from paddle.tensor import random from paddle.tensor import random
......
...@@ -17,8 +17,8 @@ from transformer_dygraph_model import MultiHeadAttention, PrePostProcessLayer ...@@ -17,8 +17,8 @@ from transformer_dygraph_model import MultiHeadAttention, PrePostProcessLayer
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph import Embedding, Layer from paddle.fluid.dygraph import Embedding, Layer
from paddle.nn import Linear
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.nn import Linear
class PositionwiseFeedForwardLayer(Layer): class PositionwiseFeedForwardLayer(Layer):
......
...@@ -17,9 +17,6 @@ from functools import reduce ...@@ -17,9 +17,6 @@ from functools import reduce
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.param_attr as attr import paddle.fluid.param_attr as attr
from functools import reduce
from paddle.fluid.dygraph import Embedding, Layer from paddle.fluid.dygraph import Embedding, Layer
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.static import Variable from paddle.static import Variable
......
...@@ -12,19 +12,17 @@ ...@@ -12,19 +12,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import logging
import unittest import unittest
import logging
import numpy as np import numpy as np
from test_program_translator import get_source_code
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.jit import ProgramTranslator
from paddle.jit.dy2static.convert_call_func import (
CONVERSION_OPTIONS,
)
from test_program_translator import get_source_code
import paddle.jit.dy2static as _jst import paddle.jit.dy2static as _jst
from paddle.jit import ProgramTranslator
from paddle.jit.dy2static.convert_call_func import CONVERSION_OPTIONS
program_translator = ProgramTranslator() program_translator = ProgramTranslator()
......
...@@ -24,10 +24,8 @@ os.environ["CUDA_VISIBLE_DEVICES"] = "2" ...@@ -24,10 +24,8 @@ os.environ["CUDA_VISIBLE_DEVICES"] = "2"
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph import to_variable
from paddle.fluid.dygraph import Embedding, GRUUnit
from paddle import _legacy_C_ops from paddle import _legacy_C_ops
from paddle.fluid.dygraph import Embedding, GRUUnit, to_variable
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.fluid.framework import _non_static_mode from paddle.fluid.framework import _non_static_mode
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
import unittest import unittest
import numpy as np import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.jit.api import declarative from paddle.jit.api import declarative
......
...@@ -22,10 +22,7 @@ import numpy as np ...@@ -22,10 +22,7 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.dy2static.logical_transformer import ( from paddle.jit.dy2static.logical_transformer import cmpop_node_to_str
cmpop_node_to_str,
)
from paddle.jit import ProgramTranslator
from paddle.utils import gast from paddle.utils import gast
program_translator = ProgramTranslator() program_translator = ProgramTranslator()
......
...@@ -12,15 +12,16 @@ ...@@ -12,15 +12,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from paddle.utils import gast
import inspect import inspect
import unittest
import numpy as np import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import unittest
from paddle.jit.dy2static.loop_transformer import NameVisitor
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.jit.dy2static.loop_transformer import NameVisitor
from paddle.utils import gast
SEED = 2020 SEED = 2020
np.random.seed(SEED) np.random.seed(SEED)
......
...@@ -23,11 +23,11 @@ from predictor_utils import PredictorTools ...@@ -23,11 +23,11 @@ from predictor_utils import PredictorTools
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph import to_variable from paddle.fluid.dygraph import to_variable
from paddle.nn import Linear
from paddle.fluid.dygraph.base import switch_to_static_graph from paddle.fluid.dygraph.base import switch_to_static_graph
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.optimizer import AdamOptimizer from paddle.fluid.optimizer import AdamOptimizer
from paddle.nn import Linear
SEED = 2020 SEED = 2020
......
...@@ -26,16 +26,9 @@ from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX ...@@ -26,16 +26,9 @@ from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.fluid.dygraph.nn import BatchNorm, Linear from paddle.fluid.dygraph.nn import BatchNorm, Linear
from paddle.fluid.initializer import MSRA from paddle.fluid.initializer import MSRA
from paddle.fluid.param_attr import ParamAttr from paddle.fluid.param_attr import ParamAttr
from paddle.fluid.dygraph.nn import BatchNorm
from paddle.nn import Linear
from paddle.jit.api import declarative
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX from paddle.nn import Linear
import unittest
from predictor_utils import PredictorTools
# Note: Set True to eliminate randomness. # Note: Set True to eliminate randomness.
# 1. For one operation, cuDNN has several algorithms, # 1. For one operation, cuDNN has several algorithms,
......
...@@ -21,7 +21,7 @@ import numpy as np ...@@ -21,7 +21,7 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph import to_variable, Layer from paddle.fluid.dygraph import Layer, to_variable
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative from paddle.jit.api import declarative
......
...@@ -17,16 +17,14 @@ import os ...@@ -17,16 +17,14 @@ import os
import tempfile import tempfile
import time import time
import unittest import unittest
import paddle
import numpy as np import numpy as np
from predictor_utils import PredictorTools from predictor_utils import PredictorTools
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph.nn import BatchNorm
from paddle.jit import ProgramTranslator
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.fluid.dygraph.nn import BatchNorm
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
SEED = 2020 SEED = 2020
......
...@@ -15,16 +15,15 @@ ...@@ -15,16 +15,15 @@
import os import os
import tempfile import tempfile
import unittest import unittest
import numpy as np import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.jit.dy2static.partial_program import ( from paddle.jit.dy2static.partial_program import partial_program_from
partial_program_from,
)
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
SEED = 2020 SEED = 2020
......
...@@ -12,16 +12,16 @@ ...@@ -12,16 +12,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import unittest
import os import os
import tempfile import tempfile
import unittest
import numpy as np import numpy as np
import paddle.fluid as fluid from test_fetch_feed import Linear
from paddle.jit import ProgramTranslator import paddle.fluid as fluid
from paddle.fluid.optimizer import AdamOptimizer from paddle.fluid.optimizer import AdamOptimizer
from test_fetch_feed import Linear from paddle.jit import ProgramTranslator
np.random.seed(2020) np.random.seed(2020)
......
...@@ -25,11 +25,11 @@ from predictor_utils import PredictorTools ...@@ -25,11 +25,11 @@ from predictor_utils import PredictorTools
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.fluid.dygraph.nn import BatchNorm
from paddle.nn import Linear
from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
from paddle.fluid.dygraph.nn import BatchNorm
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.nn import Linear
SEED = 2020 SEED = 2020
np.random.seed(SEED) np.random.seed(SEED)
......
...@@ -19,12 +19,11 @@ from test_lac import DynamicGRU ...@@ -19,12 +19,11 @@ from test_lac import DynamicGRU
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph.nn import Embedding
from paddle.nn import Linear
from paddle.fluid.dygraph import to_variable from paddle.fluid.dygraph import to_variable
from paddle.fluid.dygraph.nn import Embedding, Linear from paddle.fluid.dygraph.nn import Embedding, Linear
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.nn import Linear
SEED = 2020 SEED = 2020
program_translator = ProgramTranslator() program_translator = ProgramTranslator()
......
...@@ -18,14 +18,13 @@ import time ...@@ -18,14 +18,13 @@ import time
import unittest import unittest
import numpy as np import numpy as np
from seq2seq_dygraph_model import AttentionModel, BaseModel
from seq2seq_utils import Seq2SeqModelHyperParams, get_data_iter
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.clip import GradientClipByGlobalNorm from paddle.fluid.clip import GradientClipByGlobalNorm
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from seq2seq_dygraph_model import BaseModel, AttentionModel
from seq2seq_utils import Seq2SeqModelHyperParams
from seq2seq_utils import get_data_iter
place = ( place = (
fluid.CUDAPlace(0) if fluid.is_compiled_with_cuda() else fluid.CPUPlace() fluid.CUDAPlace(0) if fluid.is_compiled_with_cuda() else fluid.CPUPlace()
) )
......
...@@ -23,12 +23,11 @@ from tsm_config_utils import merge_configs, parse_config, print_configs ...@@ -23,12 +23,11 @@ from tsm_config_utils import merge_configs, parse_config, print_configs
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.dygraph import to_variable
from paddle.fluid.dygraph.nn import BatchNorm from paddle.fluid.dygraph.nn import BatchNorm
from paddle.nn import Linear
from paddle.jit.api import declarative
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.fluid.dygraph import to_variable from paddle.jit.api import declarative
from tsm_config_utils import merge_configs, parse_config, print_configs from paddle.nn import Linear
random.seed(0) random.seed(0)
np.random.seed(0) np.random.seed(0)
......
...@@ -14,13 +14,12 @@ ...@@ -14,13 +14,12 @@
import math import math
import random import random
import paddle
import numpy as np
import paddle
import paddle.fluid as fluid
import unittest import unittest
import numpy as np
import paddle import paddle
import paddle.fluid as fluid
from paddle.fluid.dygraph.nn import Embedding from paddle.fluid.dygraph.nn import Embedding
from paddle.jit import ProgramTranslator from paddle.jit import ProgramTranslator
from paddle.jit.api import declarative from paddle.jit.api import declarative
......
...@@ -18,15 +18,10 @@ import paddle ...@@ -18,15 +18,10 @@ import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.layers as layers import paddle.fluid.layers as layers
import paddle.nn.functional as F import paddle.nn.functional as F
from paddle.fluid.dygraph import ( from paddle.fluid.dygraph import Embedding, Layer, LayerNorm, to_variable
Embedding,
Layer,
LayerNorm,
to_variable,
)
from paddle.nn import Linear
from paddle.fluid.layers.utils import map_structure from paddle.fluid.layers.utils import map_structure
from paddle.jit.api import dygraph_to_static_func from paddle.jit.api import dygraph_to_static_func
from paddle.nn import Linear
def position_encoding_init(n_position, d_pos_vec): def position_encoding_init(n_position, d_pos_vec):
......
...@@ -11,9 +11,10 @@ ...@@ -11,9 +11,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import math
import unittest import unittest
import numpy as np import numpy as np
import math
from op_test import OpTest from op_test import OpTest
......
...@@ -16,6 +16,7 @@ Unit testing for affine_channel_op ...@@ -16,6 +16,7 @@ Unit testing for affine_channel_op
""" """
import unittest import unittest
import numpy as np import numpy as np
from op_test import OpTest from op_test import OpTest
......
...@@ -14,13 +14,15 @@ ...@@ -14,13 +14,15 @@
"""This is unit test of Test data_norm Op.""" """This is unit test of Test data_norm Op."""
import unittest import unittest
import numpy as np import numpy as np
from op_test import OpTest
import paddle import paddle
import paddle.fluid.core as core
from paddle.fluid.op import Operator
import paddle.fluid as fluid import paddle.fluid as fluid
from op_test import OpTest import paddle.fluid.core as core
from paddle.fluid import Program, program_guard from paddle.fluid import Program, program_guard
from paddle.fluid.op import Operator
def _reference_testing(x, batch_size, batch_sum, batch_square_sum, slot_dim=-1): def _reference_testing(x, batch_size, batch_sum, batch_square_sum, slot_dim=-1):
......
...@@ -18,8 +18,8 @@ import numpy as np ...@@ -18,8 +18,8 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.nn import Linear
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.nn import Linear
class Test_Detach(unittest.TestCase): class Test_Detach(unittest.TestCase):
......
...@@ -18,8 +18,8 @@ import numpy as np ...@@ -18,8 +18,8 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.nn import Linear
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.nn import Linear
class SimpleImgConvPool(fluid.dygraph.Layer): class SimpleImgConvPool(fluid.dygraph.Layer):
......
...@@ -20,9 +20,9 @@ from test_imperative_base import new_program_scope ...@@ -20,9 +20,9 @@ from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import core
from paddle.nn import Linear
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.fluid.optimizer import SGDOptimizer from paddle.fluid.optimizer import SGDOptimizer
from paddle.nn import Linear
SEED = 123123111 SEED = 123123111
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import paddle
import numpy as np import numpy as np
from op_test import OpTest, skip_check_grad_ci from op_test import OpTest, skip_check_grad_ci
import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
......
...@@ -16,6 +16,7 @@ import unittest ...@@ -16,6 +16,7 @@ import unittest
import numpy as np import numpy as np
from op_test import OpTest from op_test import OpTest
from paddle.fluid.framework import convert_np_dtype_to_dtype_ from paddle.fluid.framework import convert_np_dtype_to_dtype_
......
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
import os import os
import unittest import unittest
import numpy
import numpy
from parallel_executor_test_base import DeviceType, TestParallelExecutorBase from parallel_executor_test_base import DeviceType, TestParallelExecutorBase
from simple_nets import fc_with_batchnorm, init_data, simple_fc_net from simple_nets import fc_with_batchnorm, init_data, simple_fc_net
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.core as core import paddle.fluid.core as core
......
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import numpy as np import numpy as np
from op_test import OpTest, skip_check_grad_ci
from testsuite import create_op
import paddle import paddle
import paddle.fluid.core as core
import paddle.fluid as fluid import paddle.fluid as fluid
from op_test import OpTest, skip_check_grad_ci import paddle.fluid.core as core
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from testsuite import create_op
def group_norm_naive(x, scale, bias, epsilon, groups, data_layout): def group_norm_naive(x, scale, bias, epsilon, groups, data_layout):
......
...@@ -19,8 +19,8 @@ from test_imperative_base import new_program_scope ...@@ -19,8 +19,8 @@ from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core
import paddle.fluid.dygraph_utils as dygraph_utils import paddle.fluid.dygraph_utils as dygraph_utils
from paddle.fluid import core
from paddle.fluid.dygraph.layer_object_helper import LayerObjectHelper from paddle.fluid.dygraph.layer_object_helper import LayerObjectHelper
from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard
from paddle.fluid.layer_helper import LayerHelper from paddle.fluid.layer_helper import LayerHelper
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
import unittest import unittest
import numpy as np import numpy as np
from paddle.nn import Linear
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.nn import Linear
class TestImperativeContainerSequential(unittest.TestCase): class TestImperativeContainerSequential(unittest.TestCase):
......
...@@ -24,8 +24,8 @@ import paddle ...@@ -24,8 +24,8 @@ import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.core as core import paddle.fluid.core as core
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.nn import Linear
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.nn import Linear
class DMF(fluid.Layer): class DMF(fluid.Layer):
......
...@@ -20,7 +20,6 @@ from test_imperative_base import new_program_scope ...@@ -20,7 +20,6 @@ from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
import paddle
class MLP(fluid.Layer): class MLP(fluid.Layer):
......
...@@ -20,10 +20,10 @@ from test_imperative_base import new_program_scope ...@@ -20,10 +20,10 @@ from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.core as core import paddle.fluid.core as core
from paddle.nn import Linear
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.optimizer import SGDOptimizer from paddle.fluid.optimizer import SGDOptimizer
from paddle.nn import Linear
class Discriminator(fluid.Layer): class Discriminator(fluid.Layer):
......
...@@ -16,10 +16,10 @@ import unittest ...@@ -16,10 +16,10 @@ import unittest
import numpy as np import numpy as np
import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.dygraph as dygraph import paddle.fluid.dygraph as dygraph
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
import paddle
class TestImperativeLayerTrainable(unittest.TestCase): class TestImperativeLayerTrainable(unittest.TestCase):
......
...@@ -27,13 +27,9 @@ from paddle.fluid.dygraph.nn import ( ...@@ -27,13 +27,9 @@ from paddle.fluid.dygraph.nn import (
Embedding, Embedding,
GroupNorm, GroupNorm,
LayerNorm, LayerNorm,
NCE,
PRelu, PRelu,
) )
from paddle.nn import Linear from paddle.nn import Linear
import numpy as np
import os
import tempfile
class TestDygraphLoadStatic(unittest.TestCase): class TestDygraphLoadStatic(unittest.TestCase):
......
...@@ -15,16 +15,15 @@ ...@@ -15,16 +15,15 @@
import unittest import unittest
import numpy as np import numpy as np
from test_imperative_base import new_program_scope
from utils import DyGraphProgramDescTracerTestHelper from utils import DyGraphProgramDescTracerTestHelper
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import core
from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard
from paddle.fluid.optimizer import SGDOptimizer from paddle.fluid.optimizer import SGDOptimizer
from paddle.nn import Linear from paddle.nn import Linear
from test_imperative_base import new_program_scope
from utils import DyGraphProgramDescTracerTestHelper
from paddle.fluid.framework import _test_eager_guard, _in_legacy_dygraph
class SimpleImgConvPool(fluid.dygraph.Layer): class SimpleImgConvPool(fluid.dygraph.Layer):
......
...@@ -21,14 +21,9 @@ import paddle ...@@ -21,14 +21,9 @@ import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import core
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.fluid.dygraph.nn import ( from paddle.fluid.dygraph.nn import BatchNorm, Embedding, GRUUnit, Linear
BatchNorm,
Embedding,
GRUUnit,
Linear,
)
from paddle.nn import Linear
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.nn import Linear
class Config: class Config:
......
...@@ -16,10 +16,13 @@ import itertools ...@@ -16,10 +16,13 @@ import itertools
import unittest import unittest
import numpy as np import numpy as np
from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.distributed.fleet.meta_optimizers import DGCMomentumOptimizer
from paddle.fluid import core from paddle.fluid import core
from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.optimizer import ( from paddle.fluid.optimizer import (
AdadeltaOptimizer, AdadeltaOptimizer,
AdagradOptimizer, AdagradOptimizer,
...@@ -39,10 +42,6 @@ from paddle.fluid.optimizer import ( ...@@ -39,10 +42,6 @@ from paddle.fluid.optimizer import (
RMSPropOptimizer, RMSPropOptimizer,
SGDOptimizer, SGDOptimizer,
) )
from test_imperative_base import new_program_scope
from paddle.fluid.framework import _test_eager_guard
from paddle.distributed.fleet.meta_optimizers import DGCMomentumOptimizer
# Note(wangzhongpu) # Note(wangzhongpu)
# In dygraph, don't support ModelAverage, DGCMomentumOptimizer, ExponentialMovingAverage, PipelineOptimizer, LookaheadOptimizer, RecomputeOptimizer. # In dygraph, don't support ModelAverage, DGCMomentumOptimizer, ExponentialMovingAverage, PipelineOptimizer, LookaheadOptimizer, RecomputeOptimizer.
......
...@@ -16,10 +16,13 @@ import itertools ...@@ -16,10 +16,13 @@ import itertools
import unittest import unittest
import numpy as np import numpy as np
from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.distributed.fleet.meta_optimizers import DGCMomentumOptimizer
from paddle.fluid import core from paddle.fluid import core
from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.optimizer import ( from paddle.fluid.optimizer import (
AdadeltaOptimizer, AdadeltaOptimizer,
AdagradOptimizer, AdagradOptimizer,
...@@ -36,10 +39,6 @@ from paddle.fluid.optimizer import ( ...@@ -36,10 +39,6 @@ from paddle.fluid.optimizer import (
RecomputeOptimizer, RecomputeOptimizer,
RMSPropOptimizer, RMSPropOptimizer,
) )
from test_imperative_base import new_program_scope
from paddle.fluid.framework import _test_eager_guard
from paddle.distributed.fleet.meta_optimizers import DGCMomentumOptimizer
# Note(wangzhongpu) # Note(wangzhongpu)
# In dygraph, don't support ModelAverage, DGCMomentumOptimizer, ExponentialMovingAverage, PipelineOptimizer, LookaheadOptimizer, RecomputeOptimizer. # In dygraph, don't support ModelAverage, DGCMomentumOptimizer, ExponentialMovingAverage, PipelineOptimizer, LookaheadOptimizer, RecomputeOptimizer.
......
...@@ -16,9 +16,9 @@ import unittest ...@@ -16,9 +16,9 @@ import unittest
import numpy as np import numpy as np
import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
import paddle
class TestImperativePartitialBackward(unittest.TestCase): class TestImperativePartitialBackward(unittest.TestCase):
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
import unittest import unittest
import numpy as np import numpy as np
from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import core
from test_imperative_base import new_program_scope
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.optimizer import SGDOptimizer from paddle.fluid.optimizer import SGDOptimizer
......
...@@ -20,8 +20,7 @@ from utils import DyGraphProgramDescTracerTestHelper, is_equal_program ...@@ -20,8 +20,7 @@ from utils import DyGraphProgramDescTracerTestHelper, is_equal_program
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import BatchNorm, core
from paddle.fluid import BatchNorm
from paddle.fluid.dygraph.base import to_variable from paddle.fluid.dygraph.base import to_variable
from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard
from paddle.fluid.layer_helper import LayerHelper from paddle.fluid.layer_helper import LayerHelper
......
...@@ -21,7 +21,6 @@ import paddle ...@@ -21,7 +21,6 @@ import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import core from paddle.fluid import core
from paddle.fluid.dygraph.nn import BatchNorm from paddle.fluid.dygraph.nn import BatchNorm
from test_imperative_base import new_program_scope
from paddle.fluid.framework import _test_eager_guard from paddle.fluid.framework import _test_eager_guard
from paddle.fluid.layer_helper import LayerHelper from paddle.fluid.layer_helper import LayerHelper
......
...@@ -16,7 +16,7 @@ import os ...@@ -16,7 +16,7 @@ import os
import unittest import unittest
import numpy as np import numpy as np
import os
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
......
...@@ -19,15 +19,12 @@ from test_imperative_base import new_program_scope ...@@ -19,15 +19,12 @@ from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.fluid import Embedding, LayerNorm, Layer
from paddle.nn import Linear
from paddle.fluid.dygraph import to_variable, guard
from test_imperative_base import new_program_scope
from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard
from paddle.fluid import core
import numpy as np
import paddle.nn.functional as F import paddle.nn.functional as F
from paddle.fluid import Embedding, Layer, LayerNorm, core
from paddle.fluid.dygraph import guard, to_variable
from paddle.fluid.framework import _in_legacy_dygraph, _test_eager_guard
from paddle.jit import TracedLayer from paddle.jit import TracedLayer
from paddle.nn import Linear
np.set_printoptions(suppress=True) np.set_printoptions(suppress=True)
......
...@@ -16,6 +16,7 @@ import unittest ...@@ -16,6 +16,7 @@ import unittest
import numpy as np import numpy as np
from op_test import OpTest from op_test import OpTest
import paddle.fluid.core as core import paddle.fluid.core as core
......
...@@ -23,11 +23,11 @@ import numpy as np ...@@ -23,11 +23,11 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.nn import Linear
from paddle.fluid import unique_name from paddle.fluid import unique_name
from paddle.fluid.dygraph.io import INFER_PARAMS_INFO_SUFFIX from paddle.fluid.dygraph.io import INFER_PARAMS_INFO_SUFFIX
from paddle.fluid.layers.utils import flatten from paddle.fluid.layers.utils import flatten
from paddle.jit.api import declarative from paddle.jit.api import declarative
from paddle.nn import Linear
from paddle.static import InputSpec from paddle.static import InputSpec
BATCH_SIZE = 32 BATCH_SIZE = 32
......
...@@ -14,13 +14,15 @@ ...@@ -14,13 +14,15 @@
import copy import copy
import math import math
import numpy as np
import unittest import unittest
import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.layers as layers
import paddle.fluid.framework as framework
import paddle.fluid.core as core import paddle.fluid.core as core
import paddle.fluid.framework as framework
import paddle.fluid.layers as layers
def exponential_decay( def exponential_decay(
......
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
import sys import sys
import time import time
import unittest import unittest
import numpy as np
import paddle
from paddle.nn import Linear
import numpy as np import numpy as np
from test_multiprocess_dataloader_static import ( from test_multiprocess_dataloader_static import (
...@@ -31,8 +28,10 @@ from test_multiprocess_dataloader_static import ( ...@@ -31,8 +28,10 @@ from test_multiprocess_dataloader_static import (
prepare_places, prepare_places,
) )
import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.io import DataLoader from paddle.io import DataLoader
from paddle.nn import Linear
class SimpleFCNet(fluid.dygraph.Layer): class SimpleFCNet(fluid.dygraph.Layer):
......
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
import sys import sys
import time import time
import unittest import unittest
import numpy as np
import paddle
from paddle.nn import Linear
import numpy as np import numpy as np
from test_multiprocess_dataloader_iterable_dataset_static import ( from test_multiprocess_dataloader_iterable_dataset_static import (
...@@ -32,8 +28,10 @@ from test_multiprocess_dataloader_iterable_dataset_static import ( ...@@ -32,8 +28,10 @@ from test_multiprocess_dataloader_iterable_dataset_static import (
prepare_places, prepare_places,
) )
import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
from paddle.io import DataLoader from paddle.io import DataLoader
from paddle.nn import Linear
class SimpleFCNet(fluid.dygraph.Layer): class SimpleFCNet(fluid.dygraph.Layer):
......
...@@ -17,7 +17,6 @@ import unittest ...@@ -17,7 +17,6 @@ import unittest
import numpy as np import numpy as np
import paddle import paddle
import numpy as np
class ApiOnesTest(unittest.TestCase): class ApiOnesTest(unittest.TestCase):
......
...@@ -12,19 +12,20 @@ ...@@ -12,19 +12,20 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import unittest
import numpy as np
import os import os
from io import BytesIO
import tempfile import tempfile
import unittest
from io import BytesIO
import numpy as np
from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid
import paddle.fluid.framework as framework
import paddle.nn as nn import paddle.nn as nn
import paddle.optimizer as opt import paddle.optimizer as opt
import paddle.fluid as fluid
from paddle.fluid.optimizer import Adam from paddle.fluid.optimizer import Adam
import paddle.fluid.framework as framework
from test_imperative_base import new_program_scope
from paddle.optimizer.lr import LRScheduler from paddle.optimizer.lr import LRScheduler
BATCH_SIZE = 16 BATCH_SIZE = 16
......
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import numpy as np import numpy as np
from op_test import OpTest
import paddle import paddle
import paddle.fluid.core as core import paddle.fluid.core as core
from op_test import OpTest
def adaptive_start_index(index, input_size, output_size): def adaptive_start_index(index, input_size, output_size):
......
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import paddle
import unittest
import numpy as np
import math import math
import sys import sys
import unittest
from decimal import ROUND_HALF_UP, Decimal
import numpy as np
from op_test import OpTest from op_test import OpTest
from decimal import Decimal, ROUND_HALF_UP import paddle
def _round(x): def _round(x):
......
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import unittest
import numpy as np import numpy as np
from op_test import OpTest from op_test import OpTest
from scipy.special import logit from scipy.special import expit, logit
from scipy.special import expit
import unittest
from paddle.fluid import Program, program_guard
import paddle.fluid as fluid
import paddle import paddle
import paddle.fluid as fluid
from paddle.fluid import Program, program_guard
class TestSigmoidCrossEntropyWithLogitsOp1(OpTest): class TestSigmoidCrossEntropyWithLogitsOp1(OpTest):
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import numpy as np import numpy as np
from op_test import OpTest from op_test import OpTest
......
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import numpy as np import numpy as np
import paddle
import paddle.fluid as fluid
from op_test import OpTest from op_test import OpTest
import paddle import paddle
import paddle.fluid as fluid
class TestSizeOp(OpTest): class TestSizeOp(OpTest):
......
...@@ -13,18 +13,20 @@ ...@@ -13,18 +13,20 @@
# limitations under the License. # limitations under the License.
import errno
import os
import pickle
import tempfile
import unittest import unittest
import numpy as np
from test_imperative_base import new_program_scope
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.core as core import paddle.fluid.core as core
import paddle.fluid.framework as framework import paddle.fluid.framework as framework
from paddle.fluid.optimizer import Adam from paddle.fluid.optimizer import Adam
from test_imperative_base import new_program_scope
import numpy as np
import pickle
import os
import errno
import tempfile
paddle.enable_static() paddle.enable_static()
......
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from paddle.fluid.framework import _dygraph_guard
import paddle.fluid as fluid
import numpy as np import numpy as np
import paddle.fluid as fluid
from paddle.fluid.framework import _dygraph_guard
__all__ = ['DyGraphProgramDescTracerTestHelper', 'is_equal_program'] __all__ = ['DyGraphProgramDescTracerTestHelper', 'is_equal_program']
......
...@@ -20,8 +20,10 @@ import sys ...@@ -20,8 +20,10 @@ import sys
sys.path.append("..") sys.path.append("..")
import unittest import unittest
import numpy as np import numpy as np
from op_test_xpu import XPUOpTest from op_test_xpu import XPUOpTest
import paddle import paddle
import paddle.fluid.core as core import paddle.fluid.core as core
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
# limitations under the License. # limitations under the License.
import os import os
import struct
import sys import sys
import time import time
import numpy as np import numpy as np
import struct
__all__ = [] __all__ = []
......
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import paddle import copy
# TODO: check the hooks of tensor # TODO: check the hooks of tensor
# TODO: check serializing named tensor # TODO: check serializing named tensor
# TODO: check influence on autograd # TODO: check influence on autograd
import sys import sys
import copy
import threading import threading
from multiprocessing.util import register_after_fork from collections import OrderedDict
from multiprocessing.reduction import ForkingPickler from multiprocessing.reduction import ForkingPickler
from multiprocessing.util import register_after_fork
from collections import OrderedDict import paddle
def _supported_check(): def _supported_check():
......
...@@ -12,15 +12,21 @@ ...@@ -12,15 +12,21 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import paddle.fluid.core as core
from paddle.fluid.core import AnalysisConfig, PaddleDType, PaddlePlace
from paddle.fluid.core import PaddleInferPredictor, PaddleInferTensor
from paddle.fluid.core import convert_to_mixed_precision_bind
import os import os
import numpy as np
from typing import Set from typing import Set
import numpy as np
import paddle.fluid.core as core
from paddle.fluid.core import (
AnalysisConfig,
PaddleDType,
PaddleInferPredictor,
PaddleInferTensor,
PaddlePlace,
convert_to_mixed_precision_bind,
)
DataType = PaddleDType DataType = PaddleDType
PlaceType = PaddlePlace PlaceType = PaddlePlace
PrecisionType = AnalysisConfig.Precision PrecisionType = AnalysisConfig.Precision
......
...@@ -13,19 +13,17 @@ ...@@ -13,19 +13,17 @@
# limitations under the License. # limitations under the License.
import paddle import paddle
from paddle.fluid.param_attr import ParamAttr
from paddle.fluid.initializer import Normal, Constant
from paddle.fluid.framework import static_only, Variable, _non_static_mode
from paddle.fluid.layers.layer_function_generator import templatedoc
from paddle.fluid.data_feeder import check_dtype
from paddle.common_ops_import import ( from paddle.common_ops_import import (
LayerHelper,
check_type, check_type,
check_variable_and_dtype, check_variable_and_dtype,
utils, utils,
LayerHelper,
) )
from paddle.fluid.data_feeder import check_dtype
from paddle.fluid.framework import Variable, _non_static_mode, static_only
from paddle.fluid.initializer import Constant, Normal
from paddle.fluid.layers.layer_function_generator import templatedoc
from paddle.fluid.param_attr import ParamAttr
__all__ = [] __all__ = []
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import os import os
from PIL import Image from PIL import Image
import paddle import paddle
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册