From 2bec3c958f77ffbc056cf98bcf4f2c243fa5fc1e Mon Sep 17 00:00:00 2001 From: Yizhuang Zhou Date: Tue, 20 Oct 2020 14:54:16 +0800 Subject: [PATCH 1/2] fix(classification): fix pylint --- .../vision/classification/resnet/inference.py | 5 ++--- official/vision/classification/resnet/test.py | 17 +++++++--------- .../vision/classification/resnet/train.py | 19 +++++++++--------- .../classification/shufflenet/inference.py | 6 +++--- .../vision/classification/shufflenet/model.py | 6 +++--- .../vision/classification/shufflenet/test.py | 17 +++++++--------- .../vision/classification/shufflenet/train.py | 20 +++++++++---------- 7 files changed, 40 insertions(+), 50 deletions(-) diff --git a/official/vision/classification/resnet/inference.py b/official/vision/classification/resnet/inference.py index 042c85f5..7f41a533 100644 --- a/official/vision/classification/resnet/inference.py +++ b/official/vision/classification/resnet/inference.py @@ -9,15 +9,14 @@ import argparse import json -import model as resnet_model - import cv2 import numpy as np import megengine import megengine.data.transform as T import megengine.functional as F -import megengine.jit as jit + +import model as resnet_model # pylint-disable=import-error logging = megengine.logger.get_logger() diff --git a/official/vision/classification/resnet/test.py b/official/vision/classification/resnet/test.py index 1e8a3292..70b5e2d1 100644 --- a/official/vision/classification/resnet/test.py +++ b/official/vision/classification/resnet/test.py @@ -7,20 +7,17 @@ # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import argparse -import bisect import multiprocessing -import os -import threading import time -import model as resnet_model - import megengine -from megengine import data as data -from megengine import distributed as dist -from megengine import functional as F -from megengine import jit as jit -from megengine.data import transform as T +import megengine.data as data +import megengine.distributed as dist +import megengine.functional as F +import megengine.data.transform as T + +import model as resnet_model # pylint-disable=import-error + logging = megengine.logger.get_logger() diff --git a/official/vision/classification/resnet/train.py b/official/vision/classification/resnet/train.py index fb39a44d..f610f9ff 100644 --- a/official/vision/classification/resnet/train.py +++ b/official/vision/classification/resnet/train.py @@ -10,19 +10,18 @@ import bisect import multiprocessing import os -import threading import time -import model as resnet_model - import megengine -from megengine import autodiff as autodiff -from megengine import data as data -from megengine import distributed as dist -from megengine import functional as F -from megengine import jit as jit -from megengine import optimizer as optim -from megengine.data import transform as T +import megengine.autodiff as autodiff +import megengine.data as data +import megengine.distributed as dist +import megengine.functional as F +import megengine.optimizer as optim +import megengine.data.transform as T + +import model as resnet_model # pylint-disable=import-error + logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/inference.py b/official/vision/classification/shufflenet/inference.py index 44c3528c..c966f3de 100644 --- a/official/vision/classification/shufflenet/inference.py +++ b/official/vision/classification/shufflenet/inference.py @@ -9,15 +9,15 @@ import argparse import json -import model as snet_model - import cv2 import numpy as np import megengine import megengine.data.transform as T import megengine.functional as F -import megengine.jit as jit + +import model as snet_model # pylint-disable=import-error + logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/model.py b/official/vision/classification/shufflenet/model.py index b923fc59..3d971eaf 100644 --- a/official/vision/classification/shufflenet/model.py +++ b/official/vision/classification/shufflenet/model.py @@ -33,9 +33,9 @@ # This file has been modified by Megvii ("Megvii Modifications"). # All Megvii Modifications are Copyright (C) 2014-2019 Megvii Inc. All rights reserved. # ------------------------------------------------------------------------------ -from megengine import functional as F -from megengine import hub as hub -from megengine import module as M +import megengine.functional as F +import megengine.hub as hub +import megengine.module as M class ShuffleV2Block(M.Module): diff --git a/official/vision/classification/shufflenet/test.py b/official/vision/classification/shufflenet/test.py index fc72ae41..b3cc3a0d 100644 --- a/official/vision/classification/shufflenet/test.py +++ b/official/vision/classification/shufflenet/test.py @@ -7,20 +7,17 @@ # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import argparse -import bisect import multiprocessing -import os -import threading import time -import model as snet_model - import megengine -from megengine import data as data -from megengine import distributed as dist -from megengine import functional as F -from megengine import jit as jit -from megengine.data import transform as T +import megengine.data as data +import megengine.distributed as dist +import megengine.functional as F +import megengine.data.transform as T + +import model as snet_model # pylint-disable=import-error + logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/train.py b/official/vision/classification/shufflenet/train.py index 42011428..d3a31d3f 100644 --- a/official/vision/classification/shufflenet/train.py +++ b/official/vision/classification/shufflenet/train.py @@ -7,22 +7,20 @@ # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT ARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import argparse -import bisect import multiprocessing import os -import threading import time -import model as snet_model - import megengine -from megengine import autodiff as autodiff -from megengine import data as data -from megengine import distributed as dist -from megengine import functional as F -from megengine import jit as jit -from megengine import optimizer as optim -from megengine.data import transform as T +import megengine.autodiff as autodiff +import megengine.data as data +import megengine.distributed as dist +import megengine.functional as F +import megengine.optimizer as optim +import megengine.data.transform as T + +import model as snet_model # pylint-disable=import-error + logging = megengine.logger.get_logger() From 32f0d5e12dce27a5599dd27cd3fa47c4c81fe4a8 Mon Sep 17 00:00:00 2001 From: Yizhuang Zhou Date: Tue, 20 Oct 2020 15:01:04 +0800 Subject: [PATCH 2/2] fix(classification): isort --- official/vision/classification/resnet/inference.py | 4 ++-- official/vision/classification/resnet/test.py | 7 +++---- official/vision/classification/resnet/train.py | 7 +++---- official/vision/classification/shufflenet/inference.py | 5 ++--- official/vision/classification/shufflenet/test.py | 7 +++---- official/vision/classification/shufflenet/train.py | 7 +++---- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/official/vision/classification/resnet/inference.py b/official/vision/classification/resnet/inference.py index 7f41a533..3a8d6104 100644 --- a/official/vision/classification/resnet/inference.py +++ b/official/vision/classification/resnet/inference.py @@ -9,6 +9,8 @@ import argparse import json +import model as resnet_model # pylint-disable=import-error + import cv2 import numpy as np @@ -16,8 +18,6 @@ import megengine.data.transform as T import megengine.functional as F -import model as resnet_model # pylint-disable=import-error - logging = megengine.logger.get_logger() diff --git a/official/vision/classification/resnet/test.py b/official/vision/classification/resnet/test.py index 70b5e2d1..d1878d06 100644 --- a/official/vision/classification/resnet/test.py +++ b/official/vision/classification/resnet/test.py @@ -10,14 +10,13 @@ import multiprocessing import time +import model as resnet_model # pylint-disable=import-error + import megengine import megengine.data as data +import megengine.data.transform as T import megengine.distributed as dist import megengine.functional as F -import megengine.data.transform as T - -import model as resnet_model # pylint-disable=import-error - logging = megengine.logger.get_logger() diff --git a/official/vision/classification/resnet/train.py b/official/vision/classification/resnet/train.py index f610f9ff..c8d7b7d2 100644 --- a/official/vision/classification/resnet/train.py +++ b/official/vision/classification/resnet/train.py @@ -12,16 +12,15 @@ import os import time +import model as resnet_model # pylint-disable=import-error + import megengine import megengine.autodiff as autodiff import megengine.data as data +import megengine.data.transform as T import megengine.distributed as dist import megengine.functional as F import megengine.optimizer as optim -import megengine.data.transform as T - -import model as resnet_model # pylint-disable=import-error - logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/inference.py b/official/vision/classification/shufflenet/inference.py index c966f3de..7d598daa 100644 --- a/official/vision/classification/shufflenet/inference.py +++ b/official/vision/classification/shufflenet/inference.py @@ -9,6 +9,8 @@ import argparse import json +import model as snet_model # pylint-disable=import-error + import cv2 import numpy as np @@ -16,9 +18,6 @@ import megengine.data.transform as T import megengine.functional as F -import model as snet_model # pylint-disable=import-error - - logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/test.py b/official/vision/classification/shufflenet/test.py index b3cc3a0d..8a2a428e 100644 --- a/official/vision/classification/shufflenet/test.py +++ b/official/vision/classification/shufflenet/test.py @@ -10,14 +10,13 @@ import multiprocessing import time +import model as snet_model # pylint-disable=import-error + import megengine import megengine.data as data +import megengine.data.transform as T import megengine.distributed as dist import megengine.functional as F -import megengine.data.transform as T - -import model as snet_model # pylint-disable=import-error - logging = megengine.logger.get_logger() diff --git a/official/vision/classification/shufflenet/train.py b/official/vision/classification/shufflenet/train.py index d3a31d3f..cfe8fb98 100644 --- a/official/vision/classification/shufflenet/train.py +++ b/official/vision/classification/shufflenet/train.py @@ -11,16 +11,15 @@ import os import time +import model as snet_model # pylint-disable=import-error + import megengine import megengine.autodiff as autodiff import megengine.data as data +import megengine.data.transform as T import megengine.distributed as dist import megengine.functional as F import megengine.optimizer as optim -import megengine.data.transform as T - -import model as snet_model # pylint-disable=import-error - logging = megengine.logger.get_logger()