Skip to content

Commit 8c17fc0

Browse files
authored
[CodeStyle][PLR0402] import a.b to from a import b (#52125)
1 parent 0c5a4ba commit 8c17fc0

File tree

1,383 files changed

+1958
-2177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,383 files changed

+1958
-2177
lines changed

paddle/infrt/tests/models/efficientnet-b4/net/efficientnet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# limitations under the License.
1414

1515
import paddle
16-
import paddle.nn as nn
1716
import paddle.nn.functional as F
17+
from paddle import nn
1818

1919
from .utils import (
2020
drop_connect,

paddle/infrt/tests/models/efficientnet-b4/net/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
from functools import partial
1919

2020
import paddle
21-
import paddle.nn as nn
2221
import paddle.nn.functional as F
22+
from paddle import nn
2323

2424
# Parameters for the entire model (stem, all blocks, and head)
2525
GlobalParams = collections.namedtuple(

paddle/infrt/tests/models/linear.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import numpy as np
1717

1818
import paddle
19-
import paddle.nn as nn
2019
import paddle.optimizer as opt
20+
from paddle import nn
2121

2222
BATCH_SIZE = 16
2323
BATCH_NUM = 4

pyproject.toml

+3
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ select = [
115115
# "B030",
116116
"B032",
117117
# "B904",
118+
119+
# Pylint
120+
"PLR0402",
118121
]
119122
unfixable = [
120123
"NPY001"

python/paddle/audio/features/layers.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
from typing import Optional, Union
1616

1717
import paddle
18-
import paddle.nn as nn
19-
from paddle import Tensor
18+
from paddle import Tensor, nn
2019

2120
from ..functional import compute_fbank_matrix, create_dct, power_to_db
2221
from ..functional.window import get_window

python/paddle/common_ops_import.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
import paddle.fluid as fluid # noqa: F401
14+
from paddle import fluid # noqa: F401
1515
from paddle.fluid import core, dygraph_utils # noqa: F401
1616
from paddle.fluid.core import VarDesc # noqa: F401
1717
from paddle.fluid.data_feeder import ( # noqa: F401

python/paddle/cost_model/cost_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import numpy as np
1919

2020
import paddle
21-
import paddle.static as static
21+
from paddle import static
2222
from paddle.fluid import core
2323

2424

python/paddle/dataset/cifar.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import numpy
3434

3535
import paddle.dataset.common
36-
import paddle.utils.deprecated as deprecated
36+
from paddle.utils import deprecated
3737

3838
__all__ = []
3939

python/paddle/dataset/conll05.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import tarfile
2525

2626
import paddle.dataset.common
27-
import paddle.utils.deprecated as deprecated
27+
from paddle.utils import deprecated
2828

2929
__all__ = []
3030

python/paddle/dataset/flowers.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
import tarfile
3434
from multiprocessing import cpu_count
3535

36-
import paddle.utils.deprecated as deprecated
3736
from paddle.dataset.image import load_image_bytes, simple_transform
3837
from paddle.reader import map_readers, xmap_readers
39-
from paddle.utils import try_import
38+
from paddle.utils import deprecated, try_import
4039

4140
from .common import download
4241

python/paddle/dataset/imdb.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import tarfile
2727

2828
import paddle.dataset.common
29-
import paddle.utils.deprecated as deprecated
29+
from paddle.utils import deprecated
3030

3131
__all__ = []
3232

python/paddle/dataset/imikolov.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import tarfile
2424

2525
import paddle.dataset.common
26-
import paddle.utils.deprecated as deprecated
26+
from paddle.utils import deprecated
2727

2828
__all__ = []
2929

python/paddle/dataset/mnist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy
2525

2626
import paddle.dataset.common
27-
import paddle.utils.deprecated as deprecated
27+
from paddle.utils import deprecated
2828

2929
__all__ = []
3030

python/paddle/dataset/movielens.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import numpy as np
3030

3131
import paddle.dataset.common
32-
import paddle.utils.deprecated as deprecated
32+
from paddle.utils import deprecated
3333

3434
__all__ = []
3535

python/paddle/dataset/uci_housing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import numpy as np
2727

2828
import paddle.dataset.common
29-
import paddle.utils.deprecated as deprecated
29+
from paddle.utils import deprecated
3030

3131
__all__ = []
3232

python/paddle/dataset/voc2012.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import numpy as np
2626
from PIL import Image
2727

28-
import paddle.utils.deprecated as deprecated
2928
from paddle.dataset.common import download
29+
from paddle.utils import deprecated
3030

3131
__all__ = []
3232

python/paddle/dataset/wmt14.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import tarfile
2424

2525
import paddle.dataset.common
26-
import paddle.utils.deprecated as deprecated
26+
from paddle.utils import deprecated
2727

2828
__all__ = []
2929

python/paddle/dataset/wmt16.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from collections import defaultdict
3434

3535
import paddle
36-
import paddle.utils.deprecated as deprecated
36+
from paddle.utils import deprecated
3737

3838
__all__ = []
3939

python/paddle/distributed/auto_parallel/engine.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323

2424
import paddle
2525
import paddle.distributed.auto_parallel.utils as auto_utils
26-
import paddle.utils as utils
27-
from paddle import static
26+
from paddle import static, utils
2827
from paddle.distributed import fleet
2928
from paddle.fluid.executor import _to_name_str
3029
from paddle.framework import IrGraph

python/paddle/distributed/collective.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import paddle
1919

2020
# (TODO: GhostScreaming) It will be removed later.
21-
import paddle.fluid.core as core
21+
from paddle.fluid import core
2222
from paddle.framework import in_dygraph_mode
2323

2424
from .communication.group import Group, _add_new_group, is_initialized

python/paddle/distributed/communication/all_gather.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import numpy as np
1616

1717
import paddle
18-
import paddle.distributed.communication.stream as stream
19-
import paddle.framework as framework
18+
from paddle import framework
19+
from paddle.distributed.communication import stream
2020

2121
from .serialization_utils import (
2222
convert_object_to_tensor,

python/paddle/distributed/communication/all_reduce.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.distributed.communication.stream as stream
15+
from paddle.distributed.communication import stream
1616
from paddle.distributed.communication.reduce import ReduceOp
1717

1818

python/paddle/distributed/communication/all_to_all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.distributed.communication.stream as stream
15+
from paddle.distributed.communication import stream
1616

1717

1818
def alltoall(in_tensor_list, out_tensor_list, group=None, sync_op=True):

python/paddle/distributed/communication/batch_isend_irecv.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import contextlib
1616

1717
import paddle.distributed as dist
18-
import paddle.framework as framework
18+
from paddle import framework
1919
from paddle.distributed.communication.group import (
2020
_get_global_group,
2121
_warn_cur_rank_not_in_group,

python/paddle/distributed/communication/broadcast.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import paddle
1616
import paddle.distributed as dist
17-
import paddle.distributed.communication.stream as stream
18-
import paddle.framework as framework
17+
from paddle import framework
18+
from paddle.distributed.communication import stream
1919

2020
from .serialization_utils import (
2121
convert_object_to_tensor,

python/paddle/distributed/communication/group.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import paddle
1818
import paddle.distributed as dist
19-
import paddle.framework as framework
19+
from paddle import framework
2020

2121

2222
class Group:

python/paddle/distributed/communication/recv.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.distributed.communication.stream as stream
15+
from paddle.distributed.communication import stream
1616

1717

1818
def recv(tensor, src=0, group=None, sync_op=True):

python/paddle/distributed/communication/reduce.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# limitations under the License.
1414

1515
import paddle
16-
import paddle.distributed.communication.stream as stream
17-
import paddle.framework as framework
16+
from paddle import framework
17+
from paddle.distributed.communication import stream
1818

1919

2020
class ReduceOp:

python/paddle/distributed/communication/reduce_scatter.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.distributed.communication.stream as stream
15+
from paddle.distributed.communication import stream
1616
from paddle.distributed.communication.reduce import ReduceOp
1717
from paddle.distributed.communication.stream.reduce_scatter import (
1818
_reduce_scatter_base as _reduce_scatter_base_stream,

python/paddle/distributed/communication/scatter.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import paddle
1818
import paddle.distributed as dist
19-
import paddle.distributed.communication.stream as stream
20-
import paddle.framework as framework
19+
from paddle import framework
20+
from paddle.distributed.communication import stream
2121

2222
from .serialization_utils import (
2323
convert_object_to_tensor,

python/paddle/distributed/communication/send.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.distributed.communication.stream as stream
15+
from paddle.distributed.communication import stream
1616

1717

1818
def send(tensor, dst=0, group=None, sync_op=True):

python/paddle/distributed/communication/stream/all_gather.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import paddle
1616
import paddle.distributed as dist
17-
import paddle.fluid.data_feeder as data_feeder
18-
import paddle.framework as framework
17+
from paddle import framework
1918
from paddle.distributed.communication.group import _get_global_group
19+
from paddle.fluid import data_feeder
2020

2121

2222
def _all_gather_into_tensor_in_dygraph(

python/paddle/distributed/communication/stream/all_reduce.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.fluid.data_feeder as data_feeder
16-
import paddle.framework as framework
15+
from paddle import framework
1716
from paddle.distributed.communication.group import (
1817
_get_global_group,
1918
_warn_cur_rank_not_in_group,
2019
)
2120
from paddle.distributed.communication.reduce import ReduceOp, _get_reduce_op
21+
from paddle.fluid import data_feeder
2222

2323

2424
def _all_reduce_in_dygraph(tensor, op, group, sync_op, use_calc_stream):

python/paddle/distributed/communication/stream/all_to_all.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
import paddle
1616
import paddle.distributed as dist
17-
import paddle.fluid.data_feeder as data_feeder
18-
import paddle.framework as framework
17+
from paddle import framework
1918
from paddle.distributed.communication.group import (
2019
_get_global_group,
2120
_warn_cur_rank_not_in_group,
2221
)
22+
from paddle.fluid import data_feeder
2323

2424

2525
def _all_to_all_tensor_in_dygraph(

python/paddle/distributed/communication/stream/broadcast.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.fluid.data_feeder as data_feeder
16-
import paddle.framework as framework
15+
from paddle import framework
1716
from paddle.distributed.communication.group import (
1817
_get_global_group,
1918
_get_or_throw_group_rank,
2019
_warn_cur_rank_not_in_group,
2120
)
21+
from paddle.fluid import data_feeder
2222

2323

2424
def _broadcast_in_dygraph(

python/paddle/distributed/communication/stream/recv.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.fluid.data_feeder as data_feeder
16-
import paddle.framework as framework
15+
from paddle import framework
1716
from paddle.distributed.communication.group import (
1817
_get_global_group,
1918
_get_or_throw_group_rank,
2019
_warn_cur_rank_not_in_group,
2120
)
21+
from paddle.fluid import data_feeder
2222

2323

2424
def _recv_in_dygraph(

python/paddle/distributed/communication/stream/reduce.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import paddle.fluid.data_feeder as data_feeder
16-
import paddle.framework as framework
15+
from paddle import framework
1716
from paddle.distributed.communication.group import (
1817
_get_global_group,
1918
_get_or_throw_group_rank,
2019
_warn_cur_rank_not_in_group,
2120
)
2221
from paddle.distributed.communication.reduce import ReduceOp, _get_reduce_op
22+
from paddle.fluid import data_feeder
2323

2424

2525
def _reduce_in_dygraph(

python/paddle/distributed/communication/stream/reduce_scatter.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
import paddle
16-
import paddle.framework as framework
16+
from paddle import framework
1717
from paddle.distributed.communication.group import (
1818
_get_global_group,
1919
_warn_cur_rank_not_in_group,

0 commit comments

Comments
 (0)