diff --git a/dataset/dota_coco/dota_generate_test_result.py b/dataset/dota_coco/dota_generate_test_result.py index 00569970a8b80e5467cc9ded2f0cf09253e786c1..44c8f1804bcff723e1dbb5df2e172340c4b1e41e 100644 --- a/dataset/dota_coco/dota_generate_test_result.py +++ b/dataset/dota_coco/dota_generate_test_result.py @@ -12,13 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys import os -import os.path as osp import re -import json import glob -import cv2 + import numpy as np from multiprocessing import Pool from functools import partial @@ -80,10 +77,10 @@ def py_cpu_nms_poly_fast(dets, thresh): polys = [] for i in range(len(dets)): - tm_polygon = [dets[i][0], dets[i][1], - dets[i][2], dets[i][3], - dets[i][4], dets[i][5], - dets[i][6], dets[i][7]] + tm_polygon = [ + dets[i][0], dets[i][1], dets[i][2], dets[i][3], dets[i][4], + dets[i][5], dets[i][6], dets[i][7] + ] polys.append(tm_polygon) polys = np.array(polys) order = scores.argsort()[::-1] @@ -124,7 +121,7 @@ def py_cpu_nms_poly_fast(dets, thresh): def poly2origpoly(poly, x, y, rate): origpoly = [] - for i in range(int(len(poly)/2)): + for i in range(int(len(poly) / 2)): tmp_x = float(poly[i * 2] + x) / float(rate) tmp_y = float(poly[i * 2 + 1] + y) / float(rate) origpoly.append(tmp_x) @@ -196,11 +193,14 @@ def merge_single(output_dir, nms, pred_class_lst): for det in nameboxnmsdict[imgname]: confidence = det[-1] bbox = det[0:-1] - outline = imgname + ' ' + str(confidence) + ' ' + ' '.join(map(str, bbox)) + outline = imgname + ' ' + str(confidence) + ' ' + ' '.join( + map(str, bbox)) f_out.write(outline + '\n') -def dota_generate_test_result(pred_txt_dir, output_dir='output', dota_version='v1.0'): +def dota_generate_test_result(pred_txt_dir, + output_dir='output', + dota_version='v1.0'): """ pred_txt_dir: dir of pred txt output_dir: dir of output @@ -228,7 +228,8 @@ def dota_generate_test_result(pred_txt_dir, output_dir='output', dota_version='v pred_classes_lst = [] for class_name in pred_classes.keys(): - print('class_name: {}, count: {}'.format(class_name, len(pred_classes[class_name]))) + print('class_name: {}, count: {}'.format(class_name, + len(pred_classes[class_name]))) pred_classes_lst.append((class_name, pred_classes[class_name])) # step2: merge @@ -241,7 +242,8 @@ def dota_generate_test_result(pred_txt_dir, output_dir='output', dota_version='v if __name__ == '__main__': parser = argparse.ArgumentParser(description='dota anno to coco') parser.add_argument('--pred_txt_dir', help='path of pred txt dir') - parser.add_argument('--output_dir', help='path of output dir', default='output') + parser.add_argument( + '--output_dir', help='path of output dir', default='output') parser.add_argument( '--dota_version', help='dota_version, v1.0 or v1.5 or v2.0', @@ -251,5 +253,6 @@ if __name__ == '__main__': args = parser.parse_args() # process - dota_generate_test_result(args.pred_txt_dir, args.output_dir, args.dota_version) + dota_generate_test_result(args.pred_txt_dir, args.output_dir, + args.dota_version) print('done!') diff --git a/dataset/dota_coco/dota_to_coco.py b/dataset/dota_coco/dota_to_coco.py index 0905df4e0a41aeb2995e61c8310a95780a49338d..3aa557b8b3f9bce0a8637ca1a9266ab298ea23fc 100644 --- a/dataset/dota_coco/dota_to_coco.py +++ b/dataset/dota_coco/dota_to_coco.py @@ -17,9 +17,6 @@ import os.path as osp import json import glob import cv2 -import numpy as np -from PIL import Image -import logging import argparse # add python path of PadleDetection to sys.path diff --git a/deploy/benchmark/log_parser_excel.py b/deploy/benchmark/log_parser_excel.py index b4d841d9daca91cd10e86dbe3bff33c60ed4c891..2375e9634ed1c39c2ca6727422b8ace56a9b3262 100644 --- a/deploy/benchmark/log_parser_excel.py +++ b/deploy/benchmark/log_parser_excel.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import sys import re import argparse import pandas as pd diff --git a/deploy/python/benchmark_utils.py b/deploy/python/benchmark_utils.py index 2bed99aa22384b74694db6cb23558b6e1f309026..af7637288dff517314d95e5404dcd88b8db956c7 100644 --- a/deploy/python/benchmark_utils.py +++ b/deploy/python/benchmark_utils.py @@ -12,9 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import argparse import os -import time import logging import paddle diff --git a/deploy/python/det_keypoint_unite_infer.py b/deploy/python/det_keypoint_unite_infer.py index 6470ecf087a0064bae6661a10b673705aaeff194..c5d319d4a4868252c4f1f4eddfe002093de2b728 100644 --- a/deploy/python/det_keypoint_unite_infer.py +++ b/deploy/python/det_keypoint_unite_infer.py @@ -13,7 +13,7 @@ # limitations under the License. import os -from PIL import Image + import cv2 import math import numpy as np diff --git a/deploy/python/infer.py b/deploy/python/infer.py index 6d56ee585c2e9b71d086905a9a0e9b0ad606a161..ba8706f215e6e64eb45137be5538a90e6e0c938d 100644 --- a/deploy/python/infer.py +++ b/deploy/python/infer.py @@ -13,12 +13,10 @@ # limitations under the License. import os -import time import yaml import glob from functools import reduce -from PIL import Image import cv2 import numpy as np import math diff --git a/deploy/python/preprocess.py b/deploy/python/preprocess.py index e6c0b8c1fdccde33183096c051a38ab68268343a..0e4052d9c118fe6e36c79ec81d3af06b98f99cee 100644 --- a/deploy/python/preprocess.py +++ b/deploy/python/preprocess.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from PIL import Image import cv2 import numpy as np diff --git a/deploy/python/visualize.py b/deploy/python/visualize.py index ca9a12d9ee0c64e1fd551cc6348cfbd1dc38125d..f15d1b7a67626f5e21166881bb9861f22e02ba3b 100644 --- a/deploy/python/visualize.py +++ b/deploy/python/visualize.py @@ -19,7 +19,6 @@ import os import cv2 import numpy as np from PIL import Image, ImageDraw -from scipy import ndimage import math diff --git a/docs/tutorials/FAQ.md b/docs/tutorials/FAQ.md index 2496216502e724ffdc2c0d969c7a8e97f85d89c1..a9b289343c4647e863dd4948d9c1329a21c0c87d 100644 --- a/docs/tutorials/FAQ.md +++ b/docs/tutorials/FAQ.md @@ -25,9 +25,9 @@ * PaddleDetection中提供的默认配置一般是采用8卡训练的配置,配置文件中的`batch_size`数为每卡的batch size,若训练的时候不是使用8卡或者对`batch_size`有修改,需要等比例的调小初始`learning_rate`来获得较好的收敛效果 -* 如果使用自定义数据集并且样本数比较少,建议增大`snapshot_epoch`数来增加第一次进行eval的时候的训练轮数来保证模型已经较好收敛 +* 如果使用自定义数据集并且样本数比较少,建议增大`snapshot_epoch`数来增加第一次进行eval的时候的训练轮数来保证模型已经较好收敛 -* 若使用自定义数据集训练,可以加载我们发布的COCO或VOC数据集上训练好的权重进行finetune训练来加快收敛速度,可以使用`-o pretrain_weights=xxx`的方式指定预训练权重,xxx可以是Model Zoo里发布的模型权重链接 +* 若使用自定义数据集训练,可以加载我们发布的COCO或VOC数据集上训练好的权重进行finetune训练来加快收敛速度,可以使用`-o pretrain_weights=xxx`的方式指定预训练权重,xxx可以是Model Zoo里发布的模型权重链接 @@ -93,4 +93,4 @@ https://github.com/PaddlePaddle/PaddleDetection/blob/b87a1ea86fa18ce69e44a17ad1b TestDataset: !ImageFolder anno_path: annotations/instances_val2017.json -``` \ No newline at end of file +``` diff --git a/ppdet/core/workspace.py b/ppdet/core/workspace.py index 5d6a5d9f71581e51774aabac4e90504b6099db21..e633746ed804e29ca9cc53c9b6cf39c1a8a168a6 100644 --- a/ppdet/core/workspace.py +++ b/ppdet/core/workspace.py @@ -21,7 +21,6 @@ import os import sys import yaml -import copy import collections try: diff --git a/ppdet/data/reader.py b/ppdet/data/reader.py index 253b9047c726f04396e04f9b93f19996a166a400..c9ea09af2f7250d67cb005345a48d59107ab7eab 100644 --- a/ppdet/data/reader.py +++ b/ppdet/data/reader.py @@ -13,21 +13,19 @@ # limitations under the License. import os -import copy import traceback import six import sys -import multiprocessing as mp if sys.version_info >= (3, 0): - import queue as Queue + pass else: - import Queue + pass import numpy as np from paddle.io import DataLoader, DistributedBatchSampler from paddle.fluid.dataloader.collate import default_collate_fn -from ppdet.core.workspace import register, serializable, create +from ppdet.core.workspace import register from . import transform from .shm_utils import _get_shared_memory_size_in_M diff --git a/ppdet/data/source/dataset.py b/ppdet/data/source/dataset.py index 96b81326a2729c16637da33eaba39f7743fed2a3..b0d8726ed1dac7e6202840b404d8ce9694d80655 100644 --- a/ppdet/data/source/dataset.py +++ b/ppdet/data/source/dataset.py @@ -14,7 +14,7 @@ import os import numpy as np -from collections import OrderedDict + try: from collections.abc import Sequence except Exception: diff --git a/ppdet/data/transform/autoaugment_utils.py b/ppdet/data/transform/autoaugment_utils.py index 78e3bb36b3c2a750744101d46667dded539426c2..cfa89d374d94260c881566c12ef6a6afd5e823b9 100644 --- a/ppdet/data/transform/autoaugment_utils.py +++ b/ppdet/data/transform/autoaugment_utils.py @@ -23,8 +23,6 @@ import inspect import math from PIL import Image, ImageEnhance import numpy as np -import os -import sys import cv2 from copy import deepcopy diff --git a/ppdet/data/transform/keypoint_operators.py b/ppdet/data/transform/keypoint_operators.py index f122e118fd9a7a3b6737644c2feac1334eaaff09..a578f0854939efb197cf9b7fca97cf7aed55e779 100644 --- a/ppdet/data/transform/keypoint_operators.py +++ b/ppdet/data/transform/keypoint_operators.py @@ -27,7 +27,6 @@ import cv2 import numpy as np import math import copy -import os from ...modeling.keypoint_utils import get_affine_mat_kernel, warp_affine_joints, get_affine_transform, affine_transform from ppdet.core.workspace import serializable diff --git a/ppdet/data/transform/mot_operators.py b/ppdet/data/transform/mot_operators.py index e85805743c6c5b903a2c5cd3d30a937298289ba2..5af64bb4418dd8011839c80c15be4a18fd1cdddc 100644 --- a/ppdet/data/transform/mot_operators.py +++ b/ppdet/data/transform/mot_operators.py @@ -31,7 +31,6 @@ import math from .operators import BaseOperator, register_op from .batch_operators import Gt2TTFTarget from ppdet.modeling.bbox_utils import bbox_iou_np_expand -from ppdet.core.workspace import serializable from ppdet.utils.logger import setup_logger logger = setup_logger(__name__) diff --git a/ppdet/data/transform/operators.py b/ppdet/data/transform/operators.py index 58376120454a3d43bdac53def88c0911f9ebf378..f59adbd1d11026f53110d16fe435712977595c4f 100644 --- a/ppdet/data/transform/operators.py +++ b/ppdet/data/transform/operators.py @@ -35,10 +35,9 @@ import os import copy import cv2 -from PIL import Image, ImageEnhance, ImageDraw +from PIL import Image, ImageDraw from ppdet.core.workspace import serializable -from ppdet.modeling.layers import AnchorGrid from ppdet.modeling import bbox_utils from ..reader import Compose @@ -46,7 +45,7 @@ from .op_helper import (satisfy_sample_constraint, filter_and_process, generate_sample_bbox, clip_bbox, data_anchor_sampling, satisfy_sample_constraint_coverage, crop_image_sampling, generate_sample_bbox_square, bbox_area_sampling, - is_poly, gaussian_radius, draw_gaussian, transform_bbox) + is_poly, transform_bbox) from ppdet.utils.logger import setup_logger logger = setup_logger(__name__) diff --git a/ppdet/engine/callbacks.py b/ppdet/engine/callbacks.py index b623e1988fed889a751851bf144097e57c3006cf..70dbf33522398666f9bc5c0ba95ba6eddbbeff92 100644 --- a/ppdet/engine/callbacks.py +++ b/ppdet/engine/callbacks.py @@ -20,9 +20,7 @@ import os import sys import datetime import six -import numpy as np -import paddle import paddle.distributed as dist from ppdet.utils.checkpoint import save_model @@ -217,7 +215,8 @@ class VisualDLWriter(Callback): logger.error('visualdl not found, plaese install visualdl. ' 'for example: `pip install visualdl`.') raise e - self.vdl_writer = LogWriter(model.cfg.get('vdl_log_dir', 'vdl_log_dir/scalar')) + self.vdl_writer = LogWriter( + model.cfg.get('vdl_log_dir', 'vdl_log_dir/scalar')) self.vdl_loss_step = 0 self.vdl_mAP_step = 0 self.vdl_image_step = 0 diff --git a/ppdet/engine/trainer.py b/ppdet/engine/trainer.py index e1a9672f44327c9456f0cd70664419e94a342ac6..0cf2ae683a42e5e64587aa1b2261b009636eb77c 100644 --- a/ppdet/engine/trainer.py +++ b/ppdet/engine/trainer.py @@ -17,11 +17,9 @@ from __future__ import division from __future__ import print_function import os -import sys import copy import time -import random -import datetime + import numpy as np from PIL import Image diff --git a/ppdet/ext_op/setup.py b/ppdet/ext_op/setup.py index 6859f0cc29b80a171534eb385654f24f92a60921..c99f14fd074a5968911c173cd902afc3635aa4df 100644 --- a/ppdet/ext_op/setup.py +++ b/ppdet/ext_op/setup.py @@ -1,4 +1,4 @@ -from paddle.utils.cpp_extension import CppExtension, CUDAExtension, setup +from paddle.utils.cpp_extension import CUDAExtension, setup if __name__ == "__main__": setup( diff --git a/ppdet/ext_op/test.py b/ppdet/ext_op/test.py index 83403edd3a9e6a34accd386aac26d0bdb1d77b20..bdd84e7e53831424b34d0be75e371a4b69219361 100644 --- a/ppdet/ext_op/test.py +++ b/ppdet/ext_op/test.py @@ -1,9 +1,6 @@ import numpy as np -import os import sys -import cv2 import time -import shapely from shapely.geometry import Polygon import paddle diff --git a/ppdet/metrics/coco_utils.py b/ppdet/metrics/coco_utils.py index 60f29155a0a19cd215c7edfaded67e0ce7b095d8..47b92bc628be1d80aaf45a4133f81ccafc723da8 100644 --- a/ppdet/metrics/coco_utils.py +++ b/ppdet/metrics/coco_utils.py @@ -150,7 +150,7 @@ def cocoapi_eval(jsonfile, results_flatten = list(itertools.chain(*results_per_category)) headers = ['category', 'AP'] * (num_columns // 2) results_2d = itertools.zip_longest( - * [results_flatten[i::num_columns] for i in range(num_columns)]) + *[results_flatten[i::num_columns] for i in range(num_columns)]) table_data = [headers] table_data += [result for result in results_2d] table = AsciiTable(table_data) diff --git a/ppdet/metrics/json_results.py b/ppdet/metrics/json_results.py index 94b3c827fbf22d1a7c4cad07bcc2ececf90e4392..c703de63be89e326da979d2edbe0a3e1afca3bec 100755 --- a/ppdet/metrics/json_results.py +++ b/ppdet/metrics/json_results.py @@ -12,9 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import six -import os import numpy as np -import cv2 def get_det_res(bboxes, bbox_nums, image_id, label_to_cat_id_map, bias=0): diff --git a/ppdet/metrics/keypoint_metrics.py b/ppdet/metrics/keypoint_metrics.py index a2bcccaf6a4be9393feb2324c63e79b23d1201dd..49f0c7a588012b92c33de54199a2c6b8c2127bbc 100644 --- a/ppdet/metrics/keypoint_metrics.py +++ b/ppdet/metrics/keypoint_metrics.py @@ -12,10 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import copy import os import json -from collections import OrderedDict from collections import defaultdict import numpy as np from pycocotools.coco import COCO diff --git a/ppdet/model_zoo/model_zoo.py b/ppdet/model_zoo/model_zoo.py index 17af46f7970a46ab889d332c59e9e7a06de7bdbe..27581ef793dee60e0661f3b2fb69d9b4421ec1a5 100644 --- a/ppdet/model_zoo/model_zoo.py +++ b/ppdet/model_zoo/model_zoo.py @@ -12,9 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os import os.path as osp -import glob import pkg_resources try: diff --git a/ppdet/model_zoo/tests/test_get_model.py b/ppdet/model_zoo/tests/test_get_model.py index e07217fa09fcefcac7bba1c94d18610df071bbe1..8887185e0ca2f6c8edc020be2b92b47c9933d604 100644 --- a/ppdet/model_zoo/tests/test_get_model.py +++ b/ppdet/model_zoo/tests/test_get_model.py @@ -21,7 +21,6 @@ import paddle import ppdet import unittest - # NOTE: weights downloading costs time, we choose # a small model for unittesting MODEL_NAME = 'ppyolo/ppyolo_tiny_650e_coco' diff --git a/ppdet/modeling/architectures/centernet.py b/ppdet/modeling/architectures/centernet.py index 719e4c20b640d3b70f42fcff96ea8ede697813aa..8fb90d03007e6d2fb5283d270a667df5f60d124e 100755 --- a/ppdet/modeling/architectures/centernet.py +++ b/ppdet/modeling/architectures/centernet.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import paddle from ppdet.core.workspace import register, create from .meta_arch import BaseArch diff --git a/ppdet/modeling/architectures/meta_arch.py b/ppdet/modeling/architectures/meta_arch.py index fb2f5bd1a5f43c55e4c72cd2823250708371bbab..00085428d75bfc8d99533a22a08060354713e637 100644 --- a/ppdet/modeling/architectures/meta_arch.py +++ b/ppdet/modeling/architectures/meta_arch.py @@ -2,7 +2,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np import paddle import paddle.nn as nn from ppdet.core.workspace import register diff --git a/ppdet/modeling/architectures/s2anet.py b/ppdet/modeling/architectures/s2anet.py index 40b8c89ef9bda73f2d339bba3334a50ac665508f..ecfc987f909e3116d0e97b4047d5e2ba057456ac 100644 --- a/ppdet/modeling/architectures/s2anet.py +++ b/ppdet/modeling/architectures/s2anet.py @@ -19,7 +19,6 @@ from __future__ import print_function import paddle from ppdet.core.workspace import register, create from .meta_arch import BaseArch -import numpy as np __all__ = ['S2ANet'] diff --git a/ppdet/modeling/backbones/blazenet.py b/ppdet/modeling/backbones/blazenet.py index d5f345e600ce6addfefd306aa6426ef64a4cde42..b8e04080461d23557330e9bed774838e449dfd1b 100644 --- a/ppdet/modeling/backbones/blazenet.py +++ b/ppdet/modeling/backbones/blazenet.py @@ -20,10 +20,8 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr -from paddle.regularizer import L2Decay from paddle.nn.initializer import KaimingNormal from ppdet.core.workspace import register, serializable -from numbers import Integral from ..shape_spec import ShapeSpec __all__ = ['BlazeNet'] diff --git a/ppdet/modeling/backbones/darknet.py b/ppdet/modeling/backbones/darknet.py index 9c78dbbb1d6cf501795f8da1560e88ceea38a1ba..246529699ba8d99d08f05e4bbf24699fa10a80b7 100755 --- a/ppdet/modeling/backbones/darknet.py +++ b/ppdet/modeling/backbones/darknet.py @@ -15,8 +15,7 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F -from paddle import ParamAttr -from paddle.regularizer import L2Decay + from ppdet.core.workspace import register, serializable from ppdet.modeling.ops import batch_norm, mish from ..shape_spec import ShapeSpec diff --git a/ppdet/modeling/backbones/ghostnet.py b/ppdet/modeling/backbones/ghostnet.py index 16fb78c0ef273b23bd6665eb29fe0e213baa47af..91fa43d186d4034b1007250e589bb9c65d3414bb 100644 --- a/ppdet/modeling/backbones/ghostnet.py +++ b/ppdet/modeling/backbones/ghostnet.py @@ -17,9 +17,9 @@ import paddle from paddle import ParamAttr import paddle.nn as nn import paddle.nn.functional as F -from paddle.nn import Conv2D, BatchNorm, AdaptiveAvgPool2D, Linear -from paddle.regularizer import L2Decay -from paddle.nn.initializer import Uniform, KaimingNormal +from paddle.nn import AdaptiveAvgPool2D, Linear +from paddle.nn.initializer import Uniform + from ppdet.core.workspace import register, serializable from numbers import Integral from ..shape_spec import ShapeSpec diff --git a/ppdet/modeling/backbones/hrnet.py b/ppdet/modeling/backbones/hrnet.py index 0955f8b228e874f0a879dbe943c1845e3e4c3636..b74002cec82e5246c13db99be25e19098d45f001 100644 --- a/ppdet/modeling/backbones/hrnet.py +++ b/ppdet/modeling/backbones/hrnet.py @@ -21,7 +21,7 @@ from paddle.nn.initializer import Normal from numbers import Integral import math -from ppdet.core.workspace import register, serializable +from ppdet.core.workspace import register from ..shape_spec import ShapeSpec __all__ = ['HRNet'] diff --git a/ppdet/modeling/backbones/mobilenet_v1.py b/ppdet/modeling/backbones/mobilenet_v1.py index cecc6a5b5e79db265936fa149019ac9323811eaf..8cf602832f879667ad684c11febb12f4a91c03ac 100644 --- a/ppdet/modeling/backbones/mobilenet_v1.py +++ b/ppdet/modeling/backbones/mobilenet_v1.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr diff --git a/ppdet/modeling/backbones/senet.py b/ppdet/modeling/backbones/senet.py index a621c69b94df0de9c3f34445d6a48b8a61640177..eb0bad33f2def79189b647dd7723f1fad5ae90e1 100644 --- a/ppdet/modeling/backbones/senet.py +++ b/ppdet/modeling/backbones/senet.py @@ -12,9 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle import paddle.nn as nn -import paddle.nn.functional as F + from ppdet.core.workspace import register, serializable from .resnet import ResNet, Blocks, BasicBlock, BottleNeck diff --git a/ppdet/modeling/backbones/vgg.py b/ppdet/modeling/backbones/vgg.py index dd03872cbe5fd845a4d2ddb4b452c1ec3eb46196..9311efa238296cb111f5fd5b92e758c7ea524c76 100755 --- a/ppdet/modeling/backbones/vgg.py +++ b/ppdet/modeling/backbones/vgg.py @@ -4,7 +4,6 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr -from paddle.regularizer import L2Decay from paddle.nn import Conv2D, MaxPool2D from ppdet.core.workspace import register, serializable from ..shape_spec import ShapeSpec diff --git a/ppdet/modeling/bbox_utils.py b/ppdet/modeling/bbox_utils.py index fb5dda6ed0d9ac9f294d70b78859e0a9a9dbaa14..aa55538f31fb5c04cc4e181195acc4ff2289cbd7 100644 --- a/ppdet/modeling/bbox_utils.py +++ b/ppdet/modeling/bbox_utils.py @@ -14,8 +14,6 @@ import math import paddle -import paddle.nn.functional as F -import math import numpy as np diff --git a/ppdet/modeling/heads/bbox_head.py b/ppdet/modeling/heads/bbox_head.py index cd73dff5b12b752e325bd607545ac785babdb29b..e4d7d68785d7632b0053f70faf94a5cccdb27713 100644 --- a/ppdet/modeling/heads/bbox_head.py +++ b/ppdet/modeling/heads/bbox_head.py @@ -21,8 +21,6 @@ from paddle.nn.initializer import Normal, XavierUniform, KaimingNormal from paddle.regularizer import L2Decay from ppdet.core.workspace import register, create -from ppdet.modeling import ops - from .roi_extractor import RoIAlign from ..shape_spec import ShapeSpec from ..bbox_utils import bbox2delta diff --git a/ppdet/modeling/heads/cascade_head.py b/ppdet/modeling/heads/cascade_head.py index abd8305bf6cdc3db976f2322090770938049d0c4..935642bd6d85c402afa84900c72627e97db0f9d6 100644 --- a/ppdet/modeling/heads/cascade_head.py +++ b/ppdet/modeling/heads/cascade_head.py @@ -15,16 +15,13 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F -from paddle.nn.initializer import Normal, XavierUniform -from paddle.regularizer import L2Decay - -from ppdet.core.workspace import register, create -from ppdet.modeling import ops +from paddle.nn.initializer import Normal +from ppdet.core.workspace import register from .bbox_head import BBoxHead, TwoFCHead, XConvNormHead from .roi_extractor import RoIAlign from ..shape_spec import ShapeSpec -from ..bbox_utils import bbox2delta, delta2bbox, clip_bbox, nonempty_bbox +from ..bbox_utils import delta2bbox, clip_bbox, nonempty_bbox __all__ = ['CascadeTwoFCHead', 'CascadeXConvNormHead', 'CascadeHead'] diff --git a/ppdet/modeling/heads/centernet_head.py b/ppdet/modeling/heads/centernet_head.py index 00ac01ec2da416a0849901f32347d4eef76c6c34..aa3fbe2c318cdfe3ded000897675103b6e664dcd 100755 --- a/ppdet/modeling/heads/centernet_head.py +++ b/ppdet/modeling/heads/centernet_head.py @@ -12,12 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np import math import paddle import paddle.nn as nn import paddle.nn.functional as F -from paddle import ParamAttr from paddle.nn.initializer import KaimingUniform from ppdet.core.workspace import register from ppdet.modeling.losses import CTFocalLoss diff --git a/ppdet/modeling/heads/face_head.py b/ppdet/modeling/heads/face_head.py index 83f34c26c1819fae3d4c18cf4c9952005788924d..bb51f2eb96fbed3e9696852d011a55c1e2115937 100644 --- a/ppdet/modeling/heads/face_head.py +++ b/ppdet/modeling/heads/face_head.py @@ -14,11 +14,8 @@ import paddle import paddle.nn as nn -import paddle.nn.functional as F -from ppdet.core.workspace import register -from paddle.regularizer import L2Decay -from paddle import ParamAttr +from ppdet.core.workspace import register from ..layers import AnchorGeneratorSSD diff --git a/ppdet/modeling/heads/keypoint_hrhrnet_head.py b/ppdet/modeling/heads/keypoint_hrhrnet_head.py index 2cec010bb7844dd35c309eb1e83c33a3b2c917db..869b1816e6688bd354296e5e4c4ed84cd6a0566a 100644 --- a/ppdet/modeling/heads/keypoint_hrhrnet_head.py +++ b/ppdet/modeling/heads/keypoint_hrhrnet_head.py @@ -14,7 +14,7 @@ import paddle import paddle.nn as nn -import paddle.nn.functional as F + from ppdet.core.workspace import register from .. import layers as L from ..backbones.hrnet import BasicBlock diff --git a/ppdet/modeling/heads/mask_head.py b/ppdet/modeling/heads/mask_head.py index 7d4e33e27f2a39997362a890a987648c1e0f9cb0..bfce2dc5b085a7428565213d66433117023fbbba 100644 --- a/ppdet/modeling/heads/mask_head.py +++ b/ppdet/modeling/heads/mask_head.py @@ -16,12 +16,9 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle.nn.initializer import KaimingNormal -from paddle.regularizer import L2Decay from ppdet.core.workspace import register, create -from ppdet.modeling import ops from ppdet.modeling.layers import ConvNormLayer - from .roi_extractor import RoIAlign diff --git a/ppdet/modeling/heads/ttf_head.py b/ppdet/modeling/heads/ttf_head.py index 4d1360b34a3641b1a5c8e73e43906f92fb483a2b..dfe97bdb715c613618c78f218ca5b4f99cedaf94 100644 --- a/ppdet/modeling/heads/ttf_head.py +++ b/ppdet/modeling/heads/ttf_head.py @@ -16,7 +16,7 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr -from paddle.nn.initializer import Constant, Uniform, Normal +from paddle.nn.initializer import Constant, Normal from paddle.regularizer import L2Decay from ppdet.core.workspace import register from ppdet.modeling.layers import DeformableConvV2, LiteConv diff --git a/ppdet/modeling/layers.py b/ppdet/modeling/layers.py index 80501f075d729b507c365615dd50b3c4ec3049be..fd31812650c84b2a9fb9a14fa9c446ba1a11cb58 100644 --- a/ppdet/modeling/layers.py +++ b/ppdet/modeling/layers.py @@ -21,7 +21,6 @@ import paddle import paddle.nn as nn from paddle import ParamAttr from paddle import to_tensor -from paddle.nn import Conv2D, BatchNorm2D, GroupNorm import paddle.nn.functional as F from paddle.nn.initializer import Normal, Constant, XavierUniform from paddle.regularizer import L2Decay diff --git a/ppdet/modeling/losses/ctfocal_loss.py b/ppdet/modeling/losses/ctfocal_loss.py index 9b51b51ee34a0dd9852747c0eb72d1b526da9765..6d5af94a2758e1809ce5b6f17fe2bf975f05be62 100644 --- a/ppdet/modeling/losses/ctfocal_loss.py +++ b/ppdet/modeling/losses/ctfocal_loss.py @@ -17,7 +17,7 @@ from __future__ import division from __future__ import print_function import paddle -import paddle.nn.functional as F + from ppdet.core.workspace import register, serializable __all__ = ['CTFocalLoss'] diff --git a/ppdet/modeling/losses/fcos_loss.py b/ppdet/modeling/losses/fcos_loss.py index 8134548a16fb9c14bc1e05546f1fbea492999da7..c8d6005739bbbf70d307d8bd7fbc3a0e48c037cb 100644 --- a/ppdet/modeling/losses/fcos_loss.py +++ b/ppdet/modeling/losses/fcos_loss.py @@ -15,7 +15,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np + import paddle import paddle.nn as nn import paddle.nn.functional as F diff --git a/ppdet/modeling/losses/iou_aware_loss.py b/ppdet/modeling/losses/iou_aware_loss.py index 1e6aa8bf068354cddca8b2dd7c89f8a2be7f5ab6..4a9e904dd8266c606f61e35bb52121865476997e 100644 --- a/ppdet/modeling/losses/iou_aware_loss.py +++ b/ppdet/modeling/losses/iou_aware_loss.py @@ -16,11 +16,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import paddle import paddle.nn.functional as F from ppdet.core.workspace import register, serializable from .iou_loss import IouLoss -from ..bbox_utils import xywh2xyxy, bbox_iou +from ..bbox_utils import bbox_iou @register diff --git a/ppdet/modeling/losses/iou_loss.py b/ppdet/modeling/losses/iou_loss.py index 297001cc5d5f7b8f09848272baac35e1695bb6c1..9b8da6c059c90d7bbba7b8e5688aa7556a38ac63 100644 --- a/ppdet/modeling/losses/iou_loss.py +++ b/ppdet/modeling/losses/iou_loss.py @@ -19,9 +19,9 @@ from __future__ import print_function import numpy as np import paddle -import paddle.nn.functional as F + from ppdet.core.workspace import register, serializable -from ..bbox_utils import xywh2xyxy, bbox_iou +from ..bbox_utils import bbox_iou __all__ = ['IouLoss', 'GIoULoss', 'DIouLoss'] diff --git a/ppdet/modeling/losses/keypoint_loss.py b/ppdet/modeling/losses/keypoint_loss.py index d37ef5759a9c9c18692ac8c7baae1e47051dbf62..62b5a54a227bb4a5ab7ff9b9a2af8b4c144fe01e 100644 --- a/ppdet/modeling/losses/keypoint_loss.py +++ b/ppdet/modeling/losses/keypoint_loss.py @@ -20,7 +20,7 @@ from itertools import cycle, islice from collections import abc import paddle import paddle.nn as nn -import paddle.nn.functional as F + from ppdet.core.workspace import register, serializable __all__ = ['HrHRNetLoss', 'KeyPointMSELoss'] diff --git a/ppdet/modeling/mot/tracker/base_sde_tracker.py b/ppdet/modeling/mot/tracker/base_sde_tracker.py index 294cf8be53e287cbc6d03c0291ad0f3729955b05..9c60ef5dbc5d77d3e16d7abb828d9b6e4b487f6b 100644 --- a/ppdet/modeling/mot/tracker/base_sde_tracker.py +++ b/ppdet/modeling/mot/tracker/base_sde_tracker.py @@ -15,7 +15,6 @@ This code is borrow from https://github.com/nwojke/deep_sort/blob/master/deep_sort/track.py """ -import numpy as np from ppdet.core.workspace import register, serializable __all__ = ['TrackState', 'Track'] diff --git a/ppdet/modeling/necks/blazeface_fpn.py b/ppdet/modeling/necks/blazeface_fpn.py index f712372a12372a94b88914abf3de5f76202ee7fc..c992e04083dc9d3ee47b239c71921785a5663317 100644 --- a/ppdet/modeling/necks/blazeface_fpn.py +++ b/ppdet/modeling/necks/blazeface_fpn.py @@ -12,15 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np -import math import paddle import paddle.nn.functional as F from paddle import ParamAttr import paddle.nn as nn from paddle.nn.initializer import KaimingNormal from ppdet.core.workspace import register, serializable -from ppdet.modeling.layers import ConvNormLayer from ..shape_spec import ShapeSpec __all__ = ['BlazeNeck'] diff --git a/ppdet/modeling/necks/centernet_fpn.py b/ppdet/modeling/necks/centernet_fpn.py index 0ecfbdd1d20c5ff31f8d3eeae975f74550bd68d8..089f1bbd6a4bb3efea7322925ca26413c2441651 100755 --- a/ppdet/modeling/necks/centernet_fpn.py +++ b/ppdet/modeling/necks/centernet_fpn.py @@ -15,8 +15,6 @@ import numpy as np import math import paddle -import paddle.nn.functional as F -from paddle import ParamAttr import paddle.nn as nn from paddle.nn.initializer import KaimingUniform from ppdet.core.workspace import register, serializable diff --git a/ppdet/modeling/necks/fpn.py b/ppdet/modeling/necks/fpn.py index 867b7dc451a85773a1e902232c260b47d08ece4a..0633fb5b2713c5ddc1c1c2e03ce3dd7eec90dbcd 100644 --- a/ppdet/modeling/necks/fpn.py +++ b/ppdet/modeling/necks/fpn.py @@ -12,13 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np -import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr from paddle.nn.initializer import XavierUniform -from paddle.regularizer import L2Decay + from ppdet.core.workspace import register, serializable from ppdet.modeling.layers import ConvNormLayer from ..shape_spec import ShapeSpec diff --git a/ppdet/modeling/necks/hrfpn.py b/ppdet/modeling/necks/hrfpn.py index 4b737c9fb3153a3536fdb571318e38d407b89050..8df7cb1d68e1c73b64e04e76384f243ba98cb80f 100644 --- a/ppdet/modeling/necks/hrfpn.py +++ b/ppdet/modeling/necks/hrfpn.py @@ -16,8 +16,7 @@ import paddle import paddle.nn.functional as F from paddle import ParamAttr import paddle.nn as nn -from paddle.regularizer import L2Decay -from ppdet.core.workspace import register, serializable +from ppdet.core.workspace import register from ..shape_spec import ShapeSpec __all__ = ['HRFPN'] diff --git a/ppdet/modeling/necks/ttf_fpn.py b/ppdet/modeling/necks/ttf_fpn.py index 9c7f3924f0c2f611be5aab73cfd23921226e5eec..60cc69f8081198fa7436894a2ed4b7d3944eeb10 100644 --- a/ppdet/modeling/necks/ttf_fpn.py +++ b/ppdet/modeling/necks/ttf_fpn.py @@ -17,7 +17,6 @@ import paddle.nn as nn import paddle.nn.functional as F from paddle import ParamAttr from paddle.nn.initializer import Constant, Uniform, Normal, XavierUniform -from paddle import ParamAttr from ppdet.core.workspace import register, serializable from paddle.regularizer import L2Decay from ppdet.modeling.layers import DeformableConvV2, ConvNormLayer, LiteConv diff --git a/ppdet/modeling/necks/yolo_fpn.py b/ppdet/modeling/necks/yolo_fpn.py index d3197f0586b4170cbef6760c3fb945578cd73ccc..e8913131e63b4d8302f2e076926a12774fb062b7 100644 --- a/ppdet/modeling/necks/yolo_fpn.py +++ b/ppdet/modeling/necks/yolo_fpn.py @@ -15,7 +15,6 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F -from paddle import ParamAttr from ppdet.core.workspace import register, serializable from ppdet.modeling.layers import DropBlock from ..backbones.darknet import ConvBNLayer diff --git a/ppdet/modeling/ops.py b/ppdet/modeling/ops.py index 0b9cccf9b469d67c96ae2b24307a0d5adceae3ce..6fa4d8ad3c2fcece1d8f193d723675db7b741f73 100644 --- a/ppdet/modeling/ops.py +++ b/ppdet/modeling/ops.py @@ -21,12 +21,7 @@ from paddle.regularizer import L2Decay from paddle.fluid.framework import Variable, in_dygraph_mode from paddle.fluid import core from paddle.fluid.layer_helper import LayerHelper -from paddle.fluid.dygraph import layers -from paddle.fluid.data_feeder import check_variable_and_dtype, check_type, check_dtype, convert_dtype -import math -import six -import numpy as np -from functools import reduce +from paddle.fluid.data_feeder import check_variable_and_dtype, check_type, check_dtype __all__ = [ 'roi_pool', diff --git a/ppdet/modeling/post_process.py b/ppdet/modeling/post_process.py index 21a692298ff6517ccdb6641805f749306f0fb1a9..698f95f03271f8e86414affb63130f165fa3733f 100644 --- a/ppdet/modeling/post_process.py +++ b/ppdet/modeling/post_process.py @@ -17,7 +17,7 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from ppdet.core.workspace import register -from ppdet.modeling.bbox_utils import nonempty_bbox, rbox2poly, rbox2poly +from ppdet.modeling.bbox_utils import nonempty_bbox, rbox2poly from ppdet.modeling.layers import TTFBox from .transformers import bbox_cxcywh_to_xyxy try: diff --git a/ppdet/modeling/proposal_generator/anchor_generator.py b/ppdet/modeling/proposal_generator/anchor_generator.py index 8088ffa04affa3c2ecd81348d9eb7cb749f7b4f8..8693676011c8680cff30e0b60e0979887c7a8945 100644 --- a/ppdet/modeling/proposal_generator/anchor_generator.py +++ b/ppdet/modeling/proposal_generator/anchor_generator.py @@ -12,15 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np import math import paddle import paddle.nn as nn -import paddle.nn.functional as F from ppdet.core.workspace import register -from .. import ops @register diff --git a/ppdet/modeling/proposal_generator/proposal_generator.py b/ppdet/modeling/proposal_generator/proposal_generator.py index 12518e48817233e705638163d59e9fe9a9986938..1fcb8b1e2de963e9867249bbb6bc2f524e07d1d2 100644 --- a/ppdet/modeling/proposal_generator/proposal_generator.py +++ b/ppdet/modeling/proposal_generator/proposal_generator.py @@ -12,11 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np - import paddle -import paddle.nn as nn -import paddle.nn.functional as F from ppdet.core.workspace import register, serializable from .. import ops diff --git a/ppdet/modeling/proposal_generator/rpn_head.py b/ppdet/modeling/proposal_generator/rpn_head.py index cf836bed45d08d979320d8f4331c07d305af41f0..1664d7839b7daaa2cd7d2d4d1d7e3c578f7e5a5e 100644 --- a/ppdet/modeling/proposal_generator/rpn_head.py +++ b/ppdet/modeling/proposal_generator/rpn_head.py @@ -16,11 +16,8 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F from paddle.nn.initializer import Normal -from paddle.regularizer import L2Decay from ppdet.core.workspace import register -from ppdet.modeling import ops - from .anchor_generator import AnchorGenerator from .target_layer import RPNTargetAssign from .proposal_generator import ProposalGenerator diff --git a/ppdet/modeling/proposal_generator/target.py b/ppdet/modeling/proposal_generator/target.py index edd1386eae31331d12f5639e2873cd415b0a5a75..c767408c679ea38b432cf4429fcf029a7870450b 100644 --- a/ppdet/modeling/proposal_generator/target.py +++ b/ppdet/modeling/proposal_generator/target.py @@ -12,12 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import six -import math import numpy as np import paddle from ..bbox_utils import bbox2delta, bbox_overlaps -import copy def rpn_anchor_target(anchors, diff --git a/ppdet/modeling/reid/fairmot_embedding_head.py b/ppdet/modeling/reid/fairmot_embedding_head.py index 19ca28080a997e87b2a7a3a3e7a1695d2c2beea4..72f8243effae1be44c8706fa1b7be900f4d345bc 100755 --- a/ppdet/modeling/reid/fairmot_embedding_head.py +++ b/ppdet/modeling/reid/fairmot_embedding_head.py @@ -17,7 +17,6 @@ import math import paddle import paddle.nn as nn import paddle.nn.functional as F -from paddle import ParamAttr from paddle.nn.initializer import KaimingUniform, Uniform from ppdet.core.workspace import register from ppdet.modeling.heads.centernet_head import ConvLayer diff --git a/ppdet/modeling/tests/test_base.py b/ppdet/modeling/tests/test_base.py index cfd03fe0fbc4b0d4fd395e797a1117556a6ac8d3..cbb9033b393a24167ec1ebc32a4d924fa564f929 100644 --- a/ppdet/modeling/tests/test_base.py +++ b/ppdet/modeling/tests/test_base.py @@ -16,7 +16,6 @@ from __future__ import print_function import unittest import contextlib -import numpy as np import paddle import paddle.fluid as fluid diff --git a/ppdet/modeling/tests/test_ops.py b/ppdet/modeling/tests/test_ops.py index d951b90dd0b9e9bac705bc605a7f88dcd4e88fc7..d4b5747487d3ee49627e4fe8aecec31cf2759ae2 100644 --- a/ppdet/modeling/tests/test_ops.py +++ b/ppdet/modeling/tests/test_ops.py @@ -24,7 +24,6 @@ import numpy as np import paddle import paddle.fluid as fluid -from paddle.fluid.framework import Program, program_guard from paddle.fluid.dygraph import base import ppdet.modeling.ops as ops diff --git a/ppdet/modeling/tests/test_yolov3_loss.py b/ppdet/modeling/tests/test_yolov3_loss.py index 8037da84d2df484d8bfb7e7646cda62c267850e7..cec8bc940a4abb852d0b210b76ffe4386b8fc12e 100644 --- a/ppdet/modeling/tests/test_yolov3_loss.py +++ b/ppdet/modeling/tests/test_yolov3_loss.py @@ -15,13 +15,9 @@ from __future__ import division import unittest -import numpy as np -from scipy.special import logit -from scipy.special import expit import paddle from paddle import fluid -from paddle.fluid import core # add python path of PadleDetection to sys.path import os import sys @@ -31,7 +27,6 @@ if parent_path not in sys.path: from ppdet.modeling.losses import YOLOv3Loss from ppdet.data.transform.op_helper import jaccard_overlap -import random import numpy as np diff --git a/ppdet/optimizer.py b/ppdet/optimizer.py index 034be246002f6d4d35cea7f8409645f2e0a1e5ab..77eac91d3a0e55bcc231b0c83cf72ae945242273 100644 --- a/ppdet/optimizer.py +++ b/ppdet/optimizer.py @@ -17,14 +17,11 @@ from __future__ import division from __future__ import print_function import math -import copy import paddle import paddle.nn as nn import paddle.optimizer as optimizer -from paddle.optimizer.lr import CosineAnnealingDecay import paddle.regularizer as regularizer -from paddle import cos from ppdet.core.workspace import register, serializable diff --git a/ppdet/slim/distill.py b/ppdet/slim/distill.py index d5c9d72669a601ce331afde69ce92ca6642fb3d2..b808553dd0c0b6a8285b8090385ac6e1cc4b8e69 100644 --- a/ppdet/slim/distill.py +++ b/ppdet/slim/distill.py @@ -20,12 +20,11 @@ import paddle import paddle.nn as nn import paddle.nn.functional as F -from ppdet.core.workspace import register, serializable, load_config -from ppdet.core.workspace import create -from ppdet.utils.logger import setup_logger +from ppdet.core.workspace import register, create, load_config from ppdet.modeling import ops from ppdet.utils.checkpoint import load_pretrain_weight -from ppdet.modeling.losses import YOLOv3Loss +from ppdet.utils.logger import setup_logger + logger = setup_logger(__name__) diff --git a/ppdet/slim/quant.py b/ppdet/slim/quant.py index a1fe126ef2e3c8b614c2171c4f3a43ae709f480f..837055969424e6d95a87e32379031e4b45053148 100644 --- a/ppdet/slim/quant.py +++ b/ppdet/slim/quant.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import paddle from paddle.utils import try_import from ppdet.core.workspace import register, serializable diff --git a/ppdet/utils/checkpoint.py b/ppdet/utils/checkpoint.py index 6a6f856779c80bca844a8cb71c6757e28bf2d3ef..329fa2194e6c54278c205ab2e6eaebfa011b4472 100644 --- a/ppdet/utils/checkpoint.py +++ b/ppdet/utils/checkpoint.py @@ -20,7 +20,6 @@ from __future__ import unicode_literals import errno import os import time -import re import numpy as np import paddle import paddle.nn as nn diff --git a/ppdet/utils/download.py b/ppdet/utils/download.py index c4ecd079a6c2682d311ec2c0bb3086124acb158a..4e898b79dbbddd25f56b9e1dc56d8ca197e07ecf 100644 --- a/ppdet/utils/download.py +++ b/ppdet/utils/download.py @@ -29,10 +29,10 @@ import binascii import tarfile import zipfile -from .voc_utils import create_list from ppdet.core.workspace import BASE_KEY - from .logger import setup_logger +from .voc_utils import create_list + logger = setup_logger(__name__) __all__ = [ diff --git a/ppdet/utils/logger.py b/ppdet/utils/logger.py index 99b82f995e4ec1a8ec19b8253aa1c2b3948d1e2d..51e296205273f0cc57fc4007758342cddf5210fa 100644 --- a/ppdet/utils/logger.py +++ b/ppdet/utils/logger.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import functools import logging import os import sys diff --git a/ppdet/utils/stats.py b/ppdet/utils/stats.py index 6e4d284b5e227d3f39855e4381c9b5d5e629589e..4cd36d91cf80418720c24915522f1cf4587fe7bd 100644 --- a/ppdet/utils/stats.py +++ b/ppdet/utils/stats.py @@ -14,7 +14,6 @@ import collections import numpy as np -import datetime __all__ = ['SmoothedValue', 'TrainingStats'] diff --git a/ppdet/utils/visualizer.py b/ppdet/utils/visualizer.py index fc1c53164256abbbabc4a636a9b9f672f0cbbaaf..505c416b0998a2966dba568607f186d87e06ca4a 100644 --- a/ppdet/utils/visualizer.py +++ b/ppdet/utils/visualizer.py @@ -20,7 +20,6 @@ from __future__ import unicode_literals import numpy as np from PIL import Image, ImageDraw import cv2 -import os import math from .colormap import colormap diff --git a/ppdet/utils/voc_utils.py b/ppdet/utils/voc_utils.py index 1a4f3268a86f38b4340a732ef17db94821a8edfc..cd6d9f90ea85e355562d9bb8bd30319deb0f7901 100644 --- a/ppdet/utils/voc_utils.py +++ b/ppdet/utils/voc_utils.py @@ -20,7 +20,6 @@ import os import os.path as osp import re import random -import shutil __all__ = ['create_list'] diff --git a/static/application/christmas/blazeface/module.py b/static/application/christmas/blazeface/module.py index bb402a4aa8308912f2e0270e67dd345536b282b0..40656ff83fab02e54dd2c620575d7384fdbdba5c 100644 --- a/static/application/christmas/blazeface/module.py +++ b/static/application/christmas/blazeface/module.py @@ -15,10 +15,9 @@ import os import time from functools import reduce -import base64 import cv2 import numpy as np -from paddlehub.module.module import moduleinfo, serving +from paddlehub.module.module import moduleinfo import blazeface.data_feed as D diff --git a/static/application/christmas/solov2/module.py b/static/application/christmas/solov2/module.py index 2ae8f33b1ac985fbf660cfb0123e734b08779d3f..333ec6384aa0459b10266f8b7bf2447e3c35ddea 100644 --- a/static/application/christmas/solov2/module.py +++ b/static/application/christmas/solov2/module.py @@ -15,11 +15,9 @@ import os import time from functools import reduce -import base64 import cv2 import numpy as np -from paddlehub.module.module import moduleinfo, serving - +from paddlehub.module.module import moduleinfo import solov2.processor as P import solov2.data_feed as D diff --git a/static/application/christmas/solov2_blazeface/face_makeup_main.py b/static/application/christmas/solov2_blazeface/face_makeup_main.py index 344f9b9e4f1f124d8e642f75f4d7765393b5e401..c86a179428760a2cf58741341b8bb66f68bcfba9 100644 --- a/static/application/christmas/solov2_blazeface/face_makeup_main.py +++ b/static/application/christmas/solov2_blazeface/face_makeup_main.py @@ -13,10 +13,8 @@ # limitations under the License. import os import cv2 -import json import math import numpy as np -import argparse HAT_SCALES = { '1.png': [3.0, 0.9, .0], diff --git a/static/application/christmas/solov2_blazeface/module.py b/static/application/christmas/solov2_blazeface/module.py index edf85ea23c858ab3fe1fab551de81fdc78778653..1c63427e514b21ce6505e767b1e02fff71252194 100644 --- a/static/application/christmas/solov2_blazeface/module.py +++ b/static/application/christmas/solov2_blazeface/module.py @@ -13,7 +13,6 @@ # limitations under the License. import os -import time import base64 import json @@ -21,8 +20,7 @@ import cv2 import numpy as np import paddle.nn as nn import paddlehub as hub -from paddlehub.module.module import moduleinfo, serving, Module - +from paddlehub.module.module import moduleinfo, serving import solov2_blazeface.processor as P diff --git a/static/application/christmas/solov2_blazeface/processor.py b/static/application/christmas/solov2_blazeface/processor.py index c8b357dba04336689fc62e4f603fdb70e56feead..702985db392dddfe4b0d0b87e5061b8b447433a5 100644 --- a/static/application/christmas/solov2_blazeface/processor.py +++ b/static/application/christmas/solov2_blazeface/processor.py @@ -16,7 +16,7 @@ from __future__ import division import cv2 import numpy as np -from PIL import Image, ImageDraw +from PIL import Image import solov2_blazeface.face_makeup_main as face_makeup_main diff --git a/static/application/christmas/test_main.py b/static/application/christmas/test_main.py index 0b351669953b67cc36720a1b9164aa54e798f109..ed8f2c375ad5df461063cfc572c88a1379cb681c 100644 --- a/static/application/christmas/test_main.py +++ b/static/application/christmas/test_main.py @@ -12,12 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle import paddlehub as hub import cv2 -from PIL import Image -import numpy as np -import base64 img_file = 'demo_images/test.jpg' background = 'element_source/background/1.png' diff --git a/static/deploy/python/infer.py b/static/deploy/python/infer.py index 3f6e72a484c092e8ed4efbe7578c6fbb56321b83..9b606aa44bba02508ad9a3de8e4923cc76f490ca 100644 --- a/static/deploy/python/infer.py +++ b/static/deploy/python/infer.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: @@ -28,7 +30,6 @@ import yaml import ast from functools import reduce -from PIL import Image import cv2 import numpy as np import paddle @@ -508,7 +509,7 @@ def predict_video(detector, camera_id): fps = 30 width = int(capture.get(cv2.CAP_PROP_FRAME_WIDTH)) height = int(capture.get(cv2.CAP_PROP_FRAME_HEIGHT)) - fourcc = cv2.VideoWriter_fourcc(* 'mp4v') + fourcc = cv2.VideoWriter_fourcc(*'mp4v') if not os.path.exists(FLAGS.output_dir): os.makedirs(FLAGS.output_dir) out_path = os.path.join(FLAGS.output_dir, video_name) diff --git a/static/deploy/python/visualize.py b/static/deploy/python/visualize.py index 439bf686c85de9d8b6e89d303c4250426931a5a7..933356a4b359830a0d81a97511d35894af0ee89c 100644 --- a/static/deploy/python/visualize.py +++ b/static/deploy/python/visualize.py @@ -18,7 +18,6 @@ from __future__ import division import cv2 import numpy as np from PIL import Image, ImageDraw -from scipy import ndimage def visualize_box_mask(im, results, labels, mask_resolution=14, threshold=0.5): diff --git a/static/docs/conf.py b/static/docs/conf.py index 08e62a4cfc28a881d31bc5db555b0333a186d51d..58c87db78208d7465a3c0b6a8702f2269f83452d 100644 --- a/static/docs/conf.py +++ b/static/docs/conf.py @@ -18,11 +18,6 @@ # import os import sys -# sys.path.insert(0, os.path.abspath('.')) - -import sphinx_rtd_theme -from recommonmark.parser import CommonMarkParser -from recommonmark.transform import AutoStructify sys.path.insert(0, os.path.abspath("..")) sys.path.insert(0, os.path.abspath("../../")) diff --git a/static/ppdet/data/parallel_map.py b/static/ppdet/data/parallel_map.py index 17ea51b438df3a625b3a6e4b3099f6dfa58f4b9b..fd64299b13b38cdc1be7b56976b487109eb08e08 100644 --- a/static/ppdet/data/parallel_map.py +++ b/static/ppdet/data/parallel_map.py @@ -31,7 +31,6 @@ import uuid import logging import signal import threading -import traceback logger = logging.getLogger(__name__) diff --git a/static/ppdet/data/shared_queue/queue.py b/static/ppdet/data/shared_queue/queue.py index 52a40d741e4db8531d0010ccc7be9c2e8f3f1ead..3191d2c71e66a6e4d0f97640feb6be194235889e 100644 --- a/static/ppdet/data/shared_queue/queue.py +++ b/static/ppdet/data/shared_queue/queue.py @@ -17,7 +17,6 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import sys import six if six.PY3: import pickle diff --git a/static/ppdet/data/shared_queue/sharedmemory.py b/static/ppdet/data/shared_queue/sharedmemory.py index 1630c7b39afefec84906fe4dc9cedb8875cffa91..e92e84cb8483317f2c27682c88b402f951671614 100644 --- a/static/ppdet/data/shared_queue/sharedmemory.py +++ b/static/ppdet/data/shared_queue/sharedmemory.py @@ -24,7 +24,6 @@ import os import time import math import struct -import sys import six if six.PY3: @@ -32,7 +31,6 @@ if six.PY3: else: import cPickle as pickle -import json import uuid import random import numpy as np diff --git a/static/ppdet/data/transform/autoaugment_utils.py b/static/ppdet/data/transform/autoaugment_utils.py index 78e3bb36b3c2a750744101d46667dded539426c2..cfa89d374d94260c881566c12ef6a6afd5e823b9 100644 --- a/static/ppdet/data/transform/autoaugment_utils.py +++ b/static/ppdet/data/transform/autoaugment_utils.py @@ -23,8 +23,6 @@ import inspect import math from PIL import Image, ImageEnhance import numpy as np -import os -import sys import cv2 from copy import deepcopy diff --git a/static/ppdet/modeling/anchor_heads/fcos_head.py b/static/ppdet/modeling/anchor_heads/fcos_head.py index a08e02976365ae8395c6f898f9f28492cee3e679..43f8e42cfdfc9f57c63c72b5719f3f1de221f385 100644 --- a/static/ppdet/modeling/anchor_heads/fcos_head.py +++ b/static/ppdet/modeling/anchor_heads/fcos_head.py @@ -20,8 +20,8 @@ import math import paddle.fluid as fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import Normal, Constant, NumpyArrayInitializer -from paddle.fluid.regularizer import L2Decay +from paddle.fluid.initializer import Normal, Constant + from ppdet.modeling.ops import ConvNorm, DeformConvNorm from ppdet.modeling.ops import MultiClassNMS diff --git a/static/ppdet/modeling/anchor_heads/solov2_head.py b/static/ppdet/modeling/anchor_heads/solov2_head.py index 590b428e8ae46bd3065a7ef44844b4f787c5b12f..990a18c9a2bea3b5aaa2aea0a2c0df40ae2b798e 100644 --- a/static/ppdet/modeling/anchor_heads/solov2_head.py +++ b/static/ppdet/modeling/anchor_heads/solov2_head.py @@ -19,7 +19,6 @@ from __future__ import print_function import paddle from paddle import fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.regularizer import L2Decay from ppdet.modeling.ops import ConvNorm, DeformConvNorm, MaskMatrixNMS, DropBlock from ppdet.core.workspace import register diff --git a/static/ppdet/modeling/anchor_heads/ttf_head.py b/static/ppdet/modeling/anchor_heads/ttf_head.py index 54a474d9dcc88e93560704bfd3b4f6efe8e54e6b..06e889204d3cf26c003995a025bead7375516223 100644 --- a/static/ppdet/modeling/anchor_heads/ttf_head.py +++ b/static/ppdet/modeling/anchor_heads/ttf_head.py @@ -25,7 +25,6 @@ from paddle.fluid.initializer import Normal, Constant, Uniform, Xavier from paddle.fluid.regularizer import L2Decay from ppdet.core.workspace import register from ppdet.modeling.ops import DeformConv, DropBlock, ConvNorm -from ppdet.modeling.losses import GiouLoss __all__ = ['TTFHead', 'TTFLiteHead'] diff --git a/static/ppdet/modeling/anchor_heads/yolo_head.py b/static/ppdet/modeling/anchor_heads/yolo_head.py index 49b211ff6327d1d63ad31b13dcbb7bacdd239b9f..d11892c21379b4123f2f92b0056cc1e6b0c82ea2 100644 --- a/static/ppdet/modeling/anchor_heads/yolo_head.py +++ b/static/ppdet/modeling/anchor_heads/yolo_head.py @@ -22,8 +22,7 @@ from paddle import fluid from paddle.fluid.param_attr import ParamAttr from paddle.fluid.regularizer import L2Decay -from ppdet.modeling.ops import MultiClassNMS, MultiClassSoftNMS, MatrixNMS -from ppdet.modeling.losses.yolo_loss import YOLOv3Loss +from ppdet.modeling.ops import MultiClassNMS, MultiClassSoftNMS from ppdet.core.workspace import register from ppdet.modeling.ops import DropBlock from .iou_aware import get_iou_aware_score diff --git a/static/ppdet/modeling/architectures/blazeface.py b/static/ppdet/modeling/architectures/blazeface.py index 7508a6b083954f1f5079b47121e02c2cdc0ef7ce..7db23732acbc40aa4b19a794024705b86dfa3cd1 100644 --- a/static/ppdet/modeling/architectures/blazeface.py +++ b/static/ppdet/modeling/architectures/blazeface.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np from collections import OrderedDict from paddle import fluid diff --git a/static/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py b/static/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py index 837d87e974642ffaf213c96f33660016fa1057d7..e863d627e3d07091fd2ec8a01de8bdcf797163a1 100644 --- a/static/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py +++ b/static/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py @@ -17,7 +17,6 @@ from __future__ import division from __future__ import print_function import numpy as np -import sys from collections import OrderedDict import copy diff --git a/static/ppdet/modeling/architectures/cornernet_squeeze.py b/static/ppdet/modeling/architectures/cornernet_squeeze.py index 61e17f0cea82a61503da04a2f4fc5dc24019c9d4..0dde99a4ba6a3474e0d9aaabdb7bea7f99f50d56 100644 --- a/static/ppdet/modeling/architectures/cornernet_squeeze.py +++ b/static/ppdet/modeling/architectures/cornernet_squeeze.py @@ -21,7 +21,6 @@ from collections import OrderedDict from paddle import fluid from ppdet.core.workspace import register -import numpy as np from ppdet.utils.check import check_version __all__ = ['CornerNetSqueeze'] diff --git a/static/ppdet/modeling/architectures/faceboxes.py b/static/ppdet/modeling/architectures/faceboxes.py index 2d8abe6b9b57d08427d340d3b708d73c682b43e3..f38c96f6c5672ef17c8005172145eff62aca56b8 100644 --- a/static/ppdet/modeling/architectures/faceboxes.py +++ b/static/ppdet/modeling/architectures/faceboxes.py @@ -16,7 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np from collections import OrderedDict from paddle import fluid diff --git a/static/ppdet/modeling/architectures/htc.py b/static/ppdet/modeling/architectures/htc.py index c20822f85ed1920523d8f98f4b11356c4ad3ed46..f4bdb5838f2e4c4ccdac31050ee6d5f40cc36b1a 100644 --- a/static/ppdet/modeling/architectures/htc.py +++ b/static/ppdet/modeling/architectures/htc.py @@ -18,13 +18,9 @@ from __future__ import print_function from collections import OrderedDict import copy -import numpy as np import paddle.fluid as fluid -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import MSRA -from paddle.fluid.regularizer import L2Decay -from ppdet.experimental import mixed_precision_global_state + from ppdet.core.workspace import register from ppdet.utils.check import check_version diff --git a/static/ppdet/modeling/backbones/bfp.py b/static/ppdet/modeling/backbones/bfp.py index 6bafc68c93e0dc71309ed5b53f1c3c823b63bcd1..6e6389ed8747131185ba7f7f57674891adef0d40 100644 --- a/static/ppdet/modeling/backbones/bfp.py +++ b/static/ppdet/modeling/backbones/bfp.py @@ -16,14 +16,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import sys - from collections import OrderedDict from paddle import fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import Xavier -from paddle.fluid.regularizer import L2Decay from ppdet.core.workspace import register diff --git a/static/ppdet/modeling/backbones/gc_block.py b/static/ppdet/modeling/backbones/gc_block.py index fbd37422345b5676e6ac73b9a537c28a6c5f463e..06c122775da4918cff07e1f93d308628920de89d 100755 --- a/static/ppdet/modeling/backbones/gc_block.py +++ b/static/ppdet/modeling/backbones/gc_block.py @@ -17,7 +17,6 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import paddle import paddle.fluid as fluid from paddle.fluid import ParamAttr from paddle.fluid.initializer import ConstantInitializer diff --git a/static/ppdet/modeling/backbones/hourglass.py b/static/ppdet/modeling/backbones/hourglass.py index b38f79bb408af2c1e0fb47e5faef908130e04e8c..4dfd1c18f74f9a35468bb9bf70e3eb641afdc41e 100644 --- a/static/ppdet/modeling/backbones/hourglass.py +++ b/static/ppdet/modeling/backbones/hourglass.py @@ -20,10 +20,7 @@ from paddle import fluid from paddle.fluid.param_attr import ParamAttr from paddle.fluid.initializer import Uniform -import functools from ppdet.core.workspace import register -from .resnet import ResNet -import math __all__ = ['Hourglass'] diff --git a/static/ppdet/modeling/backbones/hrfpn.py b/static/ppdet/modeling/backbones/hrfpn.py index 174c6d10d769d6ee86f899e8bcf04dde6c9a902f..85fd403baa8554181567b758238ea0a08711cdee 100644 --- a/static/ppdet/modeling/backbones/hrfpn.py +++ b/static/ppdet/modeling/backbones/hrfpn.py @@ -20,8 +20,6 @@ from collections import OrderedDict from paddle import fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import Xavier -from paddle.fluid.regularizer import L2Decay from ppdet.core.workspace import register diff --git a/static/ppdet/modeling/backbones/hrnet.py b/static/ppdet/modeling/backbones/hrnet.py index bd86fb79b88505734f0ff1dedc51fb98b31c4eb2..d45d25916b18bd9caae61146e9b240d6cfc7ea59 100644 --- a/static/ppdet/modeling/backbones/hrnet.py +++ b/static/ppdet/modeling/backbones/hrnet.py @@ -28,8 +28,6 @@ from numbers import Integral from paddle.fluid.initializer import MSRA import math -from .name_adapter import NameAdapter - __all__ = ['HRNet'] diff --git a/static/ppdet/modeling/backbones/mobilenet_v3.py b/static/ppdet/modeling/backbones/mobilenet_v3.py index 96c425fd6a54fa1b41a7b08049701d9c94366fc9..1dad8c26d1fe11180ecc2eadea08252b20b11511 100644 --- a/static/ppdet/modeling/backbones/mobilenet_v3.py +++ b/static/ppdet/modeling/backbones/mobilenet_v3.py @@ -22,10 +22,7 @@ import paddle.fluid as fluid from paddle.fluid.param_attr import ParamAttr from paddle.fluid.regularizer import L2Decay -import math import numpy as np -from collections import OrderedDict - from ppdet.core.workspace import register from numbers import Integral diff --git a/static/ppdet/modeling/backbones/res2net.py b/static/ppdet/modeling/backbones/res2net.py index d30ce0b80641d8e2f4c16a2346cb0ada1c16e741..b15047cb80f8e479bbc58afbe8e8d2b2e7162f8c 100644 --- a/static/ppdet/modeling/backbones/res2net.py +++ b/static/ppdet/modeling/backbones/res2net.py @@ -16,20 +16,11 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from collections import OrderedDict - from paddle import fluid -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.framework import Variable -from paddle.fluid.regularizer import L2Decay -from paddle.fluid.initializer import Constant from ppdet.core.workspace import register, serializable -from numbers import Integral - from .nonlocal_helper import add_space_nonlocal -from .name_adapter import NameAdapter -from .resnet import ResNet, ResNetC5 +from .resnet import ResNet __all__ = ['Res2Net', 'Res2NetC5'] diff --git a/static/ppdet/modeling/losses/diou_loss_yolo.py b/static/ppdet/modeling/losses/diou_loss_yolo.py index 9d83eecde5e9bd67a149fa21dfec194c432e3f97..bb412438f5fb10b33aa76e11a502bc33c6eb96cd 100644 --- a/static/ppdet/modeling/losses/diou_loss_yolo.py +++ b/static/ppdet/modeling/losses/diou_loss_yolo.py @@ -15,9 +15,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import NumpyArrayInitializer from paddle import fluid from ppdet.core.workspace import register, serializable diff --git a/static/ppdet/modeling/losses/fcos_loss.py b/static/ppdet/modeling/losses/fcos_loss.py index 7275874c625cb4660e9cc9a875d52521e76c6cfa..260d053511cbf2874419cf313334b3dd22d21357 100644 --- a/static/ppdet/modeling/losses/fcos_loss.py +++ b/static/ppdet/modeling/losses/fcos_loss.py @@ -18,7 +18,6 @@ from __future__ import print_function from paddle import fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import Normal, Constant, NumpyArrayInitializer from ppdet.core.workspace import register, serializable INF = 1e8 diff --git a/static/ppdet/modeling/losses/iou_aware_loss.py b/static/ppdet/modeling/losses/iou_aware_loss.py index d0aeb9df38579475158ca871d2f4efa7b0ffec6a..d15c20e7331e014cda6be652b1a18d97f41bf509 100644 --- a/static/ppdet/modeling/losses/iou_aware_loss.py +++ b/static/ppdet/modeling/losses/iou_aware_loss.py @@ -15,9 +15,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import numpy as np -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import NumpyArrayInitializer from paddle import fluid from ppdet.core.workspace import register, serializable diff --git a/static/ppdet/modeling/losses/iou_loss.py b/static/ppdet/modeling/losses/iou_loss.py index 590217000a0053f7f3c5ebc40e82caee73a274b1..ac098e966b25f0a57bc45156c28c778d2dc5be12 100644 --- a/static/ppdet/modeling/losses/iou_loss.py +++ b/static/ppdet/modeling/losses/iou_loss.py @@ -16,9 +16,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function import numpy as np -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import NumpyArrayInitializer - from paddle import fluid from ppdet.core.workspace import register, serializable diff --git a/static/ppdet/modeling/losses/ssd_with_lmk_loss.py b/static/ppdet/modeling/losses/ssd_with_lmk_loss.py index 8cedee2d4ea32432046c8f0bbcb5c2b3a221da2b..3da23c911b679ce8c30ccd3ba16c02ed92082bf1 100644 --- a/static/ppdet/modeling/losses/ssd_with_lmk_loss.py +++ b/static/ppdet/modeling/losses/ssd_with_lmk_loss.py @@ -14,7 +14,6 @@ import paddle.fluid as fluid from paddle.fluid.layer_helper import LayerHelper -from paddle.fluid.framework import Variable import paddle.fluid.layers as layers from paddle.fluid.layers import (tensor, iou_similarity, bipartite_match, target_assign, box_coder) diff --git a/static/ppdet/modeling/roi_heads/htc_bbox_head.py b/static/ppdet/modeling/roi_heads/htc_bbox_head.py index d43c7d9b83d3dd8014947c5f7962514cb927e4a3..f633074a904ea43efe68f79137c51913500236d6 100644 --- a/static/ppdet/modeling/roi_heads/htc_bbox_head.py +++ b/static/ppdet/modeling/roi_heads/htc_bbox_head.py @@ -17,12 +17,10 @@ from __future__ import division from __future__ import print_function import paddle.fluid as fluid from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import Normal, Xavier +from paddle.fluid.initializer import Normal from paddle.fluid.regularizer import L2Decay -from paddle.fluid.initializer import MSRA from ppdet.modeling.ops import MultiClassNMS -from ppdet.modeling.ops import ConvNorm from ppdet.modeling.losses import SmoothL1Loss from ppdet.core.workspace import register diff --git a/static/ppdet/modeling/roi_heads/htc_semantic_head.py b/static/ppdet/modeling/roi_heads/htc_semantic_head.py index 227889885107bad22414ddde6c1de1cc1152fea9..98bc18cbad2674322ae419d82c0ffadc6952aa3a 100644 --- a/static/ppdet/modeling/roi_heads/htc_semantic_head.py +++ b/static/ppdet/modeling/roi_heads/htc_semantic_head.py @@ -17,12 +17,8 @@ from __future__ import division from __future__ import print_function from paddle import fluid -from paddle.fluid.param_attr import ParamAttr -from paddle.fluid.initializer import MSRA -from paddle.fluid.regularizer import L2Decay from ppdet.core.workspace import register -from ppdet.modeling.ops import ConvNorm __all__ = ['FusedSemanticHead'] diff --git a/static/ppdet/modeling/tests/test_architectures.py b/static/ppdet/modeling/tests/test_architectures.py index bbcbc1aaff7183d580a69fa7c3d96431a0bbd7d1..5786f9b5651a575ac3acc0464ebe5880c2a7eef4 100644 --- a/static/ppdet/modeling/tests/test_architectures.py +++ b/static/ppdet/modeling/tests/test_architectures.py @@ -17,10 +17,8 @@ from __future__ import division from __future__ import print_function import unittest -import numpy as np import paddle -import paddle.fluid as fluid import os import sys # add python path of PadleDetection to sys.path @@ -29,9 +27,9 @@ if parent_path not in sys.path: sys.path.append(parent_path) try: + from ppdet.utils.check import enable_static_mode, logger from ppdet.modeling.tests.decorator_helper import prog_scope from ppdet.core.workspace import load_config, merge_config, create - from ppdet.utils.check import enable_static_mode except ImportError as e: if sys.argv[0].find('static') >= 0: logger.error("Importing ppdet failed when running static model " diff --git a/static/ppdet/utils/bbox_utils.py b/static/ppdet/utils/bbox_utils.py index ff16e8b9d101a49ac250e7834f2fd6b3d2c22015..c6204d73bc141cd9208127f164cfac3f0f934d9f 100644 --- a/static/ppdet/utils/bbox_utils.py +++ b/static/ppdet/utils/bbox_utils.py @@ -19,8 +19,6 @@ from __future__ import print_function import logging import numpy as np -import paddle.fluid as fluid - __all__ = ["bbox_overlaps", "box_to_delta"] logger = logging.getLogger(__name__) diff --git a/static/ppdet/utils/eval_utils.py b/static/ppdet/utils/eval_utils.py index d6769bbcf2056f2de4da1a3f067c14b4799a8ab4..d55e5008d86c59fbd2e2522e32b472e16d7eefca 100644 --- a/static/ppdet/utils/eval_utils.py +++ b/static/ppdet/utils/eval_utils.py @@ -24,7 +24,7 @@ import time import paddle.fluid as fluid from .voc_eval import bbox_eval as voc_bbox_eval -from .post_process import mstest_box_post_process, mstest_mask_post_process, box_flip +from .post_process import mstest_box_post_process, mstest_mask_post_process __all__ = ['parse_fetches', 'eval_run', 'eval_results', 'json_eval_results'] diff --git a/static/ppdet/utils/export_utils.py b/static/ppdet/utils/export_utils.py index f2e280a8b0c6a474005fc44dbd9a3d5b1fa60976..5d4f3790a16930fd22e4895a97a012061e41f22f 100644 --- a/static/ppdet/utils/export_utils.py +++ b/static/ppdet/utils/export_utils.py @@ -18,7 +18,6 @@ from __future__ import print_function import os import yaml -import numpy as np from collections import OrderedDict import logging diff --git a/static/ppdet/utils/oid_eval.py b/static/ppdet/utils/oid_eval.py index 0a5a0c534cff10d8b5c399181f1b3631abff2a0b..c2a7e6da6c6fb9cd63ddca812065e0031b0848b7 100644 --- a/static/ppdet/utils/oid_eval.py +++ b/static/ppdet/utils/oid_eval.py @@ -17,10 +17,6 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import os -import sys -import numpy as np - from .coco_eval import bbox2out import logging diff --git a/static/ppdet/utils/post_process.py b/static/ppdet/utils/post_process.py index cf251998348504332675799bd3d3ccfb342d515c..ad8f2f23365c0d09941642a5bc558ff2360a42f0 100644 --- a/static/ppdet/utils/post_process.py +++ b/static/ppdet/utils/post_process.py @@ -19,7 +19,6 @@ from __future__ import print_function import logging import numpy as np import cv2 -import paddle.fluid as fluid __all__ = ['nms'] diff --git a/static/ppdet/utils/voc_eval.py b/static/ppdet/utils/voc_eval.py index 4ffd91260c25b295d435caa3b07e75bc60597a8b..3d6c6b967d122386bc117043c8694f6d8ef1a17d 100644 --- a/static/ppdet/utils/voc_eval.py +++ b/static/ppdet/utils/voc_eval.py @@ -18,8 +18,6 @@ from __future__ import print_function from __future__ import unicode_literals import os -import sys -import numpy as np from ..data.source.voc import pascalvoc_label from .map_utils import DetectionMAP diff --git a/static/ppdet/utils/voc_utils.py b/static/ppdet/utils/voc_utils.py index 69fec1c16953463788067719fcc60234a3b9193f..735cc2aef0b9c871557ed1d5de42cdb6512f1ae1 100644 --- a/static/ppdet/utils/voc_utils.py +++ b/static/ppdet/utils/voc_utils.py @@ -20,7 +20,6 @@ import os import os.path as osp import re import random -import shutil __all__ = ['create_list'] diff --git a/static/ppdet/utils/widerface_eval_utils.py b/static/ppdet/utils/widerface_eval_utils.py index e7447e8fee0e3fc107351748c9e11c5c277462ad..e949a497c04364b9cfe3cef0f4cde332260997ff 100644 --- a/static/ppdet/utils/widerface_eval_utils.py +++ b/static/ppdet/utils/widerface_eval_utils.py @@ -20,7 +20,6 @@ import os import numpy as np from ppdet.data.source.widerface import widerface_label -from ppdet.utils.coco_eval import bbox2out import logging logger = logging.getLogger(__name__) diff --git a/static/slim/distillation/distill.py b/static/slim/distillation/distill.py index d19ef2eb446a7059ae61896aff0c54754df81c15..dd98d538522fce49b4afc9a94e608fe89a389031 100644 --- a/static/slim/distillation/distill.py +++ b/static/slim/distillation/distill.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: @@ -27,11 +29,9 @@ FORMAT = '%(asctime)s-%(levelname)s: %(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) -import numpy as np from collections import OrderedDict from paddleslim.dist.single_distiller import merge, l2_loss -import paddle from paddle import fluid try: diff --git a/static/slim/extensions/distill_pruned_model/distill_pruned_model.py b/static/slim/extensions/distill_pruned_model/distill_pruned_model.py index 9824024b4023a20573dc82828b55196d8343e9a8..02b112d22a8c4ce9eaa75ff494a4a6344a49e868 100644 --- a/static/slim/extensions/distill_pruned_model/distill_pruned_model.py +++ b/static/slim/extensions/distill_pruned_model/distill_pruned_model.py @@ -16,7 +16,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 4))) @@ -28,13 +29,11 @@ FORMAT = '%(asctime)s-%(levelname)s: %(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) -import numpy as np from collections import OrderedDict -from paddleslim.dist.single_distiller import merge, l2_loss +from paddleslim.dist.single_distiller import merge from paddleslim.prune import Pruner from paddleslim.analysis import flops -import paddle from paddle import fluid try: diff --git a/static/slim/nas/search_space/blazefacespace_nas.py b/static/slim/nas/search_space/blazefacespace_nas.py index 342a2c8129aa968007f5a14779f7d737aaa40398..06b1edefc35e4588a966b93f851e6bfdb2c33567 100644 --- a/static/slim/nas/search_space/blazefacespace_nas.py +++ b/static/slim/nas/search_space/blazefacespace_nas.py @@ -17,8 +17,6 @@ from __future__ import division from __future__ import print_function import numpy as np -import paddle.fluid as fluid -from paddle.fluid.param_attr import ParamAttr from paddleslim.nas.search_space.search_space_base import SearchSpaceBase from paddleslim.nas.search_space.search_space_registry import SEARCHSPACE from ppdet.modeling.backbones.blazenet import BlazeNet diff --git a/static/slim/nas/train_nas.py b/static/slim/nas/train_nas.py index 12709c82d8a9db5120c1016f3562fa1b46c5c9e8..d0836d4c32c83670126e82daf6c9e857da4e30df 100644 --- a/static/slim/nas/train_nas.py +++ b/static/slim/nas/train_nas.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: @@ -27,7 +29,6 @@ import numpy as np import datetime from collections import deque -import paddle from paddle import fluid import logging @@ -61,7 +62,6 @@ except ImportError as e: from paddleslim.analysis import flops, TableLatencyEvaluator from paddleslim.nas import SANAS -import search_space @register diff --git a/static/slim/prune/eval.py b/static/slim/prune/eval.py index fa76ac8bbe352ec50c23b8bb7f3b3147af743fcc..c87f86e3896cd5aef583f362afae3ebb16e79192 100644 --- a/static/slim/prune/eval.py +++ b/static/slim/prune/eval.py @@ -16,14 +16,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle import paddle.fluid as fluid from paddleslim.prune import Pruner from paddleslim.analysis import flops diff --git a/static/slim/prune/export_model.py b/static/slim/prune/export_model.py index d8fcdb8fccac085b9bbab3f59000cd00a474586c..d6f92a35ed092dda6caa80df6c33f164a96ba585 100644 --- a/static/slim/prune/export_model.py +++ b/static/slim/prune/export_model.py @@ -16,13 +16,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle from paddle import fluid import logging diff --git a/static/slim/prune/infer.py b/static/slim/prune/infer.py index 176cd22a1dd8a6adf46e4aee1d4eb2b8684a5935..63cb73ec74b14d5147a350a95a721931892a42cd 100644 --- a/static/slim/prune/infer.py +++ b/static/slim/prune/infer.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -26,7 +28,6 @@ import glob import numpy as np from PIL import Image -import paddle from paddle import fluid from paddleslim.prune import Pruner from paddleslim.analysis import flops diff --git a/static/slim/prune/prune.py b/static/slim/prune/prune.py index a75c6d4cbc89de0df5c8150af5024b02ab83178f..e1c559d85355248930a793e7a22ea9641ea0d0bc 100644 --- a/static/slim/prune/prune.py +++ b/static/slim/prune/prune.py @@ -16,7 +16,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) @@ -29,7 +30,6 @@ import datetime from collections import deque from paddleslim.prune import Pruner from paddleslim.analysis import flops -import paddle from paddle import fluid import logging diff --git a/static/slim/quantization/eval.py b/static/slim/quantization/eval.py index b16d8007d768ee0dc66d913e5dc1fc09cd1174a8..a552cc94411e894c04e10bc39df99085d95b7439 100644 --- a/static/slim/quantization/eval.py +++ b/static/slim/quantization/eval.py @@ -16,14 +16,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle import paddle.fluid as fluid import logging diff --git a/static/slim/quantization/export_model.py b/static/slim/quantization/export_model.py index 067c21c376c350715190a056be330650102498f1..456b7aceaa9633245c10b243a2c7467182a76da8 100644 --- a/static/slim/quantization/export_model.py +++ b/static/slim/quantization/export_model.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: @@ -27,7 +29,6 @@ FORMAT = '%(asctime)s-%(levelname)s: %(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) -import paddle from paddle import fluid try: diff --git a/static/slim/quantization/infer.py b/static/slim/quantization/infer.py index 58c1dac714d4aa3c61eb206e42b885e50fc0dab5..453f54b736a683687a4a199728655c436d01c326 100644 --- a/static/slim/quantization/infer.py +++ b/static/slim/quantization/infer.py @@ -16,17 +16,17 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) -import glob import numpy as np from PIL import Image -import paddle from paddle import fluid import logging diff --git a/static/slim/quantization/pact.py b/static/slim/quantization/pact.py index 554ad5b0f59627ded8cfbd462b6466e8a3912550..fdc04f76a1348b6b4fa124575baa73d8f0dafd4d 100644 --- a/static/slim/quantization/pact.py +++ b/static/slim/quantization/pact.py @@ -12,10 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys import paddle import paddle.fluid as fluid -from paddleslim.quant import quant_aware, convert import numpy as np from paddle.fluid.layer_helper import LayerHelper diff --git a/static/slim/quantization/train.py b/static/slim/quantization/train.py index 12ed7ef508fda5c6a5d1435d30735d3718626c88..046313e99a25dcb737d3113888661d35a7a66e2e 100644 --- a/static/slim/quantization/train.py +++ b/static/slim/quantization/train.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: @@ -28,7 +30,6 @@ import datetime from collections import deque import shutil -import paddle from paddle import fluid import logging @@ -58,7 +59,7 @@ except ImportError as e: else: raise e -from paddleslim.quant import quant_aware, convert +from paddleslim.quant import quant_aware from pact import pact, get_optimizer diff --git a/static/slim/sensitive/sensitive.py b/static/slim/sensitive/sensitive.py index a43506ebef42d711a35b6893d0a5f5bac075dc5b..903aa958398b4a123f5c23ecc6ef0bc627ab4eb4 100644 --- a/static/slim/sensitive/sensitive.py +++ b/static/slim/sensitive/sensitive.py @@ -16,29 +16,22 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 3))) if parent_path not in sys.path: sys.path.append(parent_path) -import time -import numpy as np -import datetime -from collections import deque - -import paddle from paddle import fluid -from ppdet.experimental import mixed_precision_context from ppdet.core.workspace import load_config, merge_config, create from ppdet.data.reader import create_reader -from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results -from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode +from ppdet.utils.check import check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint from paddleslim.prune import sensitivity import logging diff --git a/static/tools/anchor_cluster.py b/static/tools/anchor_cluster.py index e5fb7147b2dfa5718a42d06a4f6f35b71952b5b4..76b707a8836ad685da28e01d48a5dfb9ef157b9e 100644 --- a/static/tools/anchor_cluster.py +++ b/static/tools/anchor_cluster.py @@ -29,7 +29,6 @@ logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) from scipy.cluster.vq import kmeans -import random import numpy as np from tqdm import tqdm diff --git a/static/tools/configure.py b/static/tools/configure.py index 64ff575b4a77f2a8dea6db9c08b37907948806be..02515727ed748d5f549fdeab4e9b33233572625b 100644 --- a/static/tools/configure.py +++ b/static/tools/configure.py @@ -17,7 +17,7 @@ from __future__ import print_function import os import sys from argparse import ArgumentParser, RawDescriptionHelpFormatter -import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -114,8 +114,9 @@ def list_modules(**kwargs): print("") max_len = max([len(mod.name) for mod in modules]) for mod in modules: - print(color_tty.green(mod.name.ljust(max_len)), - mod.doc.split('\n')[0]) + print( + color_tty.green(mod.name.ljust(max_len)), + mod.doc.split('\n')[0]) print("") diff --git a/static/tools/eval.py b/static/tools/eval.py index dfaf70dfe6c555b4382958b50718724e8831e90b..9a7f3798608de2ad5d1373547515f4d8b3e93f1c 100644 --- a/static/tools/eval.py +++ b/static/tools/eval.py @@ -16,13 +16,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle import paddle.fluid as fluid import logging diff --git a/static/tools/export_model.py b/static/tools/export_model.py index d6f6013b7162dc1b03679d514387634703c522e0..908039c8b39ea021de0e7d70e967b51696f7710c 100644 --- a/static/tools/export_model.py +++ b/static/tools/export_model.py @@ -23,7 +23,6 @@ parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle from paddle import fluid import logging diff --git a/static/tools/export_serving_model.py b/static/tools/export_serving_model.py index ae11a60cae5cda489014d3b48e18a7a0b22117c6..22eced7d89aedd1b7fb0573aab607c11b313150a 100644 --- a/static/tools/export_serving_model.py +++ b/static/tools/export_serving_model.py @@ -16,14 +16,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: sys.path.append(parent_path) -import yaml -import paddle from paddle import fluid import logging diff --git a/static/tools/face_eval.py b/static/tools/face_eval.py index e47ded2674ccfd371d07ec76aa1d0c931d55399f..f0ac7343feb5520039e7b26f326b359c6ac5debc 100644 --- a/static/tools/face_eval.py +++ b/static/tools/face_eval.py @@ -23,7 +23,6 @@ parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: sys.path.append(parent_path) -import paddle import paddle.fluid as fluid import numpy as np import cv2 diff --git a/static/tools/infer.py b/static/tools/infer.py index df831fd547924f468107131d2c45819d87071b93..4f4c2e3fe63d9f4662b6eed6dbb91c8256073325 100644 --- a/static/tools/infer.py +++ b/static/tools/infer.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -27,7 +29,6 @@ import numpy as np import six from PIL import Image, ImageOps -import paddle from paddle import fluid import logging diff --git a/static/tools/train.py b/static/tools/train.py index 4417a9d9b8b36d5a23ecde7dbc5988b2b4e4c9fd..f07c12f080d366b98b9221f9a1e0963584bb07e5 100644 --- a/static/tools/train.py +++ b/static/tools/train.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -30,7 +32,6 @@ import six from collections import deque from paddle.fluid import profiler -import paddle from paddle import fluid from paddle.fluid.layers.learning_rate_scheduler import _decay_step_counter from paddle.fluid.optimizer import ExponentialMovingAverage diff --git a/static/tools/train_multi_machine.py b/static/tools/train_multi_machine.py index 31a7f706a832ac179ab5ef450be1eef64d357aec..098845d0a58cd2bf76ee0400c4a30f6ce2d4814c 100644 --- a/static/tools/train_multi_machine.py +++ b/static/tools/train_multi_machine.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -33,7 +35,6 @@ import random import datetime import six from collections import deque -import paddle from paddle.fluid import profiler from paddle import fluid diff --git a/static/tools/x2coco.py b/static/tools/x2coco.py index ef2f0d7172da4f678b5405a8b56dbfe3e808a590..a7765c78fa56a62ba2e5bff78fa95d910a7cc18a 100644 --- a/static/tools/x2coco.py +++ b/static/tools/x2coco.py @@ -19,11 +19,9 @@ import glob import json import os import os.path as osp -import sys import shutil import xml.etree.ElementTree as ET from tqdm import tqdm -import re import numpy as np import PIL.ImageDraw diff --git a/tools/anchor_cluster.py b/tools/anchor_cluster.py index 87c7e93700bf834ad22841fb43f404d9bdc073e8..78ed3ea07dd348975054979000955074d914ccdd 100644 --- a/tools/anchor_cluster.py +++ b/tools/anchor_cluster.py @@ -27,13 +27,12 @@ from ppdet.utils.logger import setup_logger logger = setup_logger('ppdet.anchor_cluster') from scipy.cluster.vq import kmeans -import random import numpy as np from tqdm import tqdm from ppdet.utils.cli import ArgsParser from ppdet.utils.check import check_gpu, check_version, check_config -from ppdet.core.workspace import load_config, merge_config, create +from ppdet.core.workspace import load_config, merge_config class BaseAnchorCluster(object): diff --git a/tools/eval.py b/tools/eval.py index 5df7a07745b86009b02f34f81edb27a81bed7822..bf75555c1149249101cf47f655ce145792047bcc 100755 --- a/tools/eval.py +++ b/tools/eval.py @@ -16,7 +16,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: diff --git a/tools/eval_mot.py b/tools/eval_mot.py index 59d8a7a433d4584ab8bd8b589cadeb930314fea6..cd608678a8a294ebf0615f23d56c1c802556dcbd 100644 --- a/tools/eval_mot.py +++ b/tools/eval_mot.py @@ -15,7 +15,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys + +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -24,7 +27,6 @@ if parent_path not in sys.path: # ignore warning log import warnings warnings.filterwarnings('ignore') -import glob import paddle from paddle.distributed import ParallelEnv diff --git a/tools/export_model.py b/tools/export_model.py index 213be3d09054ba08e12fe38b523ee7bec5391b46..3420cf27f810c7f325e0b35a31b790f594803749 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -15,7 +15,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys + +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: diff --git a/tools/infer.py b/tools/infer.py index 7ea0d2353a2472127e5cbfeb07c63f66d88f2830..b24c205ff23196d2bd884646ca7d1f4474ef2a28 100755 --- a/tools/infer.py +++ b/tools/infer.py @@ -15,7 +15,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys + +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: diff --git a/tools/infer_mot.py b/tools/infer_mot.py index 407e9aae4aabcab3e718c050a2137a63f8e7e7c8..044d1e685c5822dbbf953ce943047b9820f5c4d2 100644 --- a/tools/infer_mot.py +++ b/tools/infer_mot.py @@ -15,7 +15,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys + +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: @@ -24,7 +27,6 @@ if parent_path not in sys.path: # ignore warning log import warnings warnings.filterwarnings('ignore') -import glob import paddle from paddle.distributed import ParallelEnv diff --git a/tools/train.py b/tools/train.py index 211322fd5389b817c52066b16168734c22608ba2..55aed43ee032cde13f66cb2288fb3e412c9f70db 100755 --- a/tools/train.py +++ b/tools/train.py @@ -16,22 +16,21 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -import os, sys +import os +import sys + # add python path of PadleDetection to sys.path parent_path = os.path.abspath(os.path.join(__file__, *(['..'] * 2))) if parent_path not in sys.path: sys.path.append(parent_path) -import random -import numpy as np # ignore warning log import warnings warnings.filterwarnings('ignore') import paddle -from ppdet.core.workspace import load_config, merge_config, create -from ppdet.utils.checkpoint import load_weight +from ppdet.core.workspace import load_config, merge_config from ppdet.engine import Trainer, init_parallel_env, set_random_seed, init_fleet_env from ppdet.slim import build_slim_model diff --git a/tools/x2coco.py b/tools/x2coco.py index e92ab4be94f8d92f7ac22c7741f8c7859af2f4ec..9164f9c8c159a96d0445c03437c715e6124f9a0c 100644 --- a/tools/x2coco.py +++ b/tools/x2coco.py @@ -19,11 +19,9 @@ import glob import json import os import os.path as osp -import sys import shutil import xml.etree.ElementTree as ET from tqdm import tqdm -import re import numpy as np import PIL.ImageDraw