Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/paddle/device/cuda/streams.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from paddle.fluid.core import CUDAStream as Stream
from paddle.fluid.core import CUDAEvent as Event
from paddle.fluid.core import CUDAStream as Stream # noqa: F401
from paddle.fluid.core import CUDAEvent as Event # noqa: F401
1 change: 0 additions & 1 deletion python/paddle/incubate/autograd/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import functools
import typing

import paddle
Expand Down
2 changes: 0 additions & 2 deletions python/paddle/incubate/autograd/primreg.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import functools


class Registry(object):
""" A general registry object. """
Expand Down
8 changes: 4 additions & 4 deletions python/paddle/incubate/autograd/primrules.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

from . import primops
from .primops import (add, broadcast, concat, cos, div, eq, erf, exp,
fill_const, gather, ge, gt, log, matmul, max, mul, ne,
neg, reduce_sum, reshape, scatter_add, select, set_value,
sin, slice_assign, slice_select, split, sqrt, sub, tanh,
fill_const, gather, ge, gt, log, matmul, mul, ne, neg,
reduce_sum, reshape, scatter_add, select, set_value, sin,
slice_assign, slice_select, split, sqrt, sub, tanh,
transpose, bernoulli, rsqrt)
from .primreg import (REGISTER_JVP, REGISTER_ORIG2PRIM, REGISTER_PRIM2ORIG,
REGISTER_TRANSPOSE, lookup_fn, lookup_jvp,
lookup_orig2prim, lookup_prim2orig, lookup_transpose,
op_position_inputs, op_position_output)
from .utils import INT_DTYPE_2_STRING, get_input_var_list, get_output_var_list
from .utils import INT_DTYPE_2_STRING, get_output_var_list
from paddle.fluid.data_feeder import convert_dtype
from paddle.fluid.framework import convert_np_dtype_to_dtype_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import math
import paddle
import paddle.nn.functional as F
import numpy as np
from .naive_gate import NaiveGate
from ..utils import limit_by_capacity

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import paddle
import paddle.nn as nn
import paddle.nn.functional as F


class NaiveGate(BaseGate):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import math
import paddle
import paddle.nn as nn
import paddle.nn.functional as F
from .naive_gate import NaiveGate
from ..utils import limit_by_capacity
Expand Down
5 changes: 1 addition & 4 deletions python/paddle/incubate/distributed/models/moe/grad_clip.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@

from paddle.fluid.clip import ClipGradBase, _squared_l2_norm
from paddle.fluid.dygraph import base as imperative_base
from paddle.fluid import core, layers, framework
from paddle.fluid import core, layers
from paddle.distributed import collective
import six
import warnings
import copy


class ClipGradForMOEByGlobalNorm(ClipGradBase):
Expand Down
8 changes: 0 additions & 8 deletions python/paddle/incubate/distributed/models/moe/moe_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,14 @@
# Copyright 2021, Jiaao He. All rights reserved.
# Licensed under the Apache License, Version 2.0 (the "License").

import collections
import math

import numpy as np
import paddle
import paddle.nn as nn
import paddle.nn.functional as F
from paddle.distributed.utils.moe_utils import global_scatter, global_gather
from paddle.distributed import alltoall, all_gather

from paddle.distributed.fleet.meta_parallel import get_rng_state_tracker
from paddle.distributed import fleet
from paddle.autograd import PyLayer
from .gate import NaiveGate, GShardGate, SwitchGate, BaseGate
from .utils import count_by_gate
from paddle import fluid
from paddle.fluid.framework import in_dygraph_mode
from paddle.incubate.distributed.fleet import recompute_hybrid

Expand Down
3 changes: 0 additions & 3 deletions python/paddle/incubate/multiprocessing/reductions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@
# TODO: check the hooks of tensor
# TODO: check serializing named tensor
# TODO: check influence on autograd
import os
import sys
import warnings
import math
import copy
import threading
import multiprocessing
from multiprocessing.util import register_after_fork
from multiprocessing.reduction import ForkingPickler

Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/nn/functional/fused_matmul_bias.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.tensor.linalg import matmul
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops


def fused_matmul_bias(x,
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/incubate/nn/functional/fused_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode, default_main_program
from paddle.fluid.data_feeder import check_variable_and_dtype, check_dtype
from paddle.fluid import core, dygraph_utils
from paddle import _C_ops, _legacy_C_ops
from paddle.fluid import core
from paddle import _legacy_C_ops

__all__ = []

Expand Down
2 changes: 0 additions & 2 deletions python/paddle/incubate/nn/layer/fused_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
# 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.
from paddle.nn import functional as F
from paddle.incubate.nn import functional as incubate_f
from paddle.nn import Layer
from paddle.framework import ParamAttr
import paddle
from paddle.nn.layer.transformer import _convert_attention_mask, _convert_param_attr_to_list
from paddle.nn.initializer import Constant
Expand Down
4 changes: 1 addition & 3 deletions python/paddle/incubate/operators/graph_khop_sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import paddle
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.fluid.data_feeder import check_variable_and_dtype
from paddle.fluid import core
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops


def graph_khop_sampler(row,
Expand Down
4 changes: 1 addition & 3 deletions python/paddle/incubate/operators/graph_reindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import paddle
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.fluid.data_feeder import check_variable_and_dtype
from paddle.fluid import core
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops
import paddle.utils.deprecated as deprecated


Expand Down
4 changes: 1 addition & 3 deletions python/paddle/incubate/operators/graph_sample_neighbors.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import paddle
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.fluid.data_feeder import check_variable_and_dtype
from paddle.fluid import core
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops
import paddle.utils.deprecated as deprecated


Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/operators/graph_send_recv.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import numpy as np
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode, _in_legacy_dygraph, in_dygraph_mode
from paddle.fluid.framework import _in_legacy_dygraph, in_dygraph_mode
from paddle.fluid.framework import Variable
from paddle.fluid.data_feeder import check_variable_and_dtype, check_type, check_dtype, convert_dtype
from paddle.fluid.layers.tensor import cast
Expand Down
17 changes: 1 addition & 16 deletions python/paddle/incubate/operators/resnet_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import copy
import collections
import itertools
import six
import math
import sys
import warnings
from functools import partial, reduce

import numpy as np
import paddle
import paddle.fluid as fluid
from paddle import framework
from paddle.device import get_device, get_cudnn_version
from paddle.nn import initializer as I
from paddle.nn import Layer, LayerList
from paddle.nn import Layer
from paddle.fluid.layers import utils
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.layers.utils import map_structure, flatten, pack_sequence_as
from paddle.fluid.data_feeder import convert_dtype
from paddle.fluid.param_attr import ParamAttr
from paddle import _C_ops, _legacy_C_ops


def resnet_unit(x, filter_x, scale_x, bias_x, mean_x, var_x, z, filter_z,
Expand Down
3 changes: 1 addition & 2 deletions python/paddle/incubate/operators/softmax_mask_fuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.fluid import core
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops


def softmax_mask_fuse(x, mask, name=None):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@

from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.framework import _non_static_mode
from paddle.fluid import core
from paddle import _C_ops, _legacy_C_ops
from paddle import _legacy_C_ops


def softmax_mask_fuse_upper_triangle(x):
Expand Down
3 changes: 0 additions & 3 deletions python/paddle/incubate/optimizer/distributed_fused_lamb.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@
from paddle.fluid import framework, core, layers, unique_name
from paddle.fluid.framework import Variable
from paddle.fluid.clip import ClipGradByGlobalNorm
from paddle.fluid.initializer import Constant
from paddle.fluid.layer_helper import LayerHelper
from paddle.fluid.optimizer import Optimizer
from paddle.distributed.collective import new_group
from paddle.fluid.executor import global_scope
from paddle.fluid.framework import name_scope
from paddle.fluid import core, unique_name
import numpy as np


def init_communicator(block, rank, ranks, ring_id):
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/optimizer/functional/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import paddle
from paddle.fluid.framework import Variable
from paddle.fluid.data_feeder import check_type, check_dtype
from paddle.fluid.data_feeder import check_type


def check_input_type(input, name, op_name):
Expand Down
5 changes: 2 additions & 3 deletions python/paddle/incubate/optimizer/lookahead.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# limitations under the License.

from paddle.optimizer import Optimizer
from paddle.fluid import core, framework, layers, unique_name
from paddle.fluid.framework import Program, Variable, name_scope, default_main_program, default_startup_program, device_guard
from paddle.fluid import framework, layers, unique_name
from paddle.fluid.framework import Variable
from paddle.fluid.layer_helper import LayerHelper
import paddle
import numpy as np
from paddle.fluid.dygraph import base as imperative_base

__all__ = []
Expand Down
5 changes: 2 additions & 3 deletions python/paddle/incubate/optimizer/modelaverage.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# limitations under the License.

from paddle.optimizer import Optimizer
from paddle.fluid import core, framework, layers
from paddle.fluid.framework import Program, Variable
from paddle.fluid import framework, layers
from paddle.fluid.framework import Program
from paddle.fluid.layer_helper import LayerHelper
import paddle
import numpy as np
from paddle.fluid.dygraph import base as imperative_base
from paddle.fluid.wrapped_decorator import signature_safe_contextmanager
from paddle import _C_ops, _legacy_C_ops
Expand Down
1 change: 0 additions & 1 deletion python/paddle/incubate/passes/fuse_resnet_unit_pass.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import paddle
import paddle.fluid.ir as ir


Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import dygraph_only, core
from paddle import in_dynamic_mode
from paddle.fluid.layer_helper import LayerHelper
Expand Down
4 changes: 2 additions & 2 deletions python/paddle/incubate/sparse/creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# limitations under the License.

import paddle
from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import core, dygraph_only
from paddle.fluid.framework import _current_expected_place, _get_paddle_place
from paddle.tensor import to_tensor, max
from paddle.fluid.data_feeder import check_variable_and_dtype, check_type, check_dtype, convert_dtype
from paddle.fluid.data_feeder import convert_dtype
from paddle import in_dynamic_mode
from paddle.fluid.layer_helper import LayerHelper

Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/multiary.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import dygraph_only

__all__ = []
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/nn/functional/activation.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

__all__ = []

from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import dygraph_only
from paddle import in_dynamic_mode
from paddle.fluid.layer_helper import LayerHelper
Expand Down
4 changes: 1 addition & 3 deletions python/paddle/incubate/sparse/nn/functional/conv.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@

__all__ = []

from paddle import _C_ops, _legacy_C_ops, in_dynamic_mode
from paddle import _C_ops, in_dynamic_mode
from paddle.fluid.layers.utils import convert_to_list
from paddle.fluid.layers.nn import elementwise_add
from ...creation import sparse_coo_tensor
from ...binary import add
from paddle.nn.functional.conv import _update_padding_nd
from paddle.fluid.layer_helper import LayerHelper
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/nn/functional/pooling.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

from paddle.fluid.layers import utils
from paddle import _C_ops, _legacy_C_ops, in_dynamic_mode
from paddle import _C_ops, in_dynamic_mode
from paddle.nn.functional.pooling import _update_padding_nd

__all__ = []
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/nn/functional/transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

__all__ = []

from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import dygraph_only


Expand Down
2 changes: 1 addition & 1 deletion python/paddle/incubate/sparse/unary.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import numpy as np

from paddle import _C_ops, _legacy_C_ops
from paddle import _C_ops
from paddle.fluid.framework import dygraph_only, core, convert_np_dtype_to_dtype_

__all__ = []
Expand Down
Loading