From 4ec452149bb0fd7ae99eea4842c22973190a1dd4 Mon Sep 17 00:00:00 2001 From: zhaoting Date: Fri, 9 Apr 2021 18:08:03 +0800 Subject: [PATCH] clean static checking --- .../centernet/src/lib/datasets/dataset/coco_hp.py | 2 +- .../official/cv/cnn_direction_model/src/dataset.py | 5 ++--- model_zoo/official/cv/cnn_direction_model/train.py | 9 ++++----- model_zoo/official/cv/crnn/src/dataset.py | 2 +- model_zoo/official/cv/ctpn/ascend310_infer/build.sh | 2 +- model_zoo/official/cv/ctpn/scripts/run_eval_ascend.sh | 4 ++-- model_zoo/official/cv/ctpn/scripts/run_infer_310.sh | 6 +++--- .../official/cv/deeplabv3/ascend310_infer/build.sh | 3 ++- .../official/cv/deeplabv3/scripts/run_infer_310.sh | 4 ++-- .../cv/faster_rcnn/ascend310_infer/src/build.sh | 2 +- .../official/cv/faster_rcnn/scripts/run_infer_310.sh | 4 ++-- model_zoo/official/cv/faster_rcnn/src/util.py | 2 +- .../cv/inceptionv4/scripts/run_distribute_train_gpu.sh | 2 +- .../official/cv/inceptionv4/scripts/run_eval_gpu.sh | 2 +- .../official/cv/maskrcnn/ascend310_infer/src/build.sh | 4 ++-- model_zoo/official/cv/maskrcnn/src/dataset.py | 4 ++-- model_zoo/official/cv/maskrcnn/src/util.py | 2 +- .../official/cv/maskrcnn_mobilenetv1/src/dataset.py | 1 + model_zoo/official/cv/openpose/eval.py | 2 +- .../official/cv/psenet/src/ETSNET/pse/adaptor.cpp | 5 +++-- model_zoo/official/cv/psenet/src/dataset.py | 10 +++++----- model_zoo/official/cv/resnet/src/resnet.py | 2 +- .../official/cv/resnet/src/resnet_gpu_benchmark.py | 2 +- .../cv/resnet152/scripts/run_distribute_train.sh | 2 +- .../cv/resnet152/scripts/run_standalone_train.sh | 2 +- model_zoo/official/cv/resnet152/src/resnet.py | 2 +- model_zoo/official/cv/resnext101/src/dataset.py | 2 +- model_zoo/official/cv/resnext50/src/dataset.py | 2 +- model_zoo/official/cv/ssd/ascend310_infer/build.sh | 3 ++- model_zoo/official/cv/ssd/scripts/run_infer_310.sh | 4 ++-- .../cv/tinydarknet/scripts/run_standalone_train.sh | 2 +- model_zoo/official/cv/unet/postprocess.py | 1 - model_zoo/official/cv/unet/scripts/run_infer_310.sh | 2 +- .../official/cv/unet3d/scripts/run_standalone_eval.sh | 2 +- model_zoo/official/cv/vgg16/src/dataset.py | 2 +- model_zoo/official/cv/warpctc/src/dataset.py | 2 +- model_zoo/official/cv/yolov4/scripts/run_infer_310.sh | 2 +- .../nlp/fasttext/scripts/run_distribute_train_8p.sh | 6 +++--- model_zoo/official/nlp/gru/src/dataset.py | 3 ++- model_zoo/official/nlp/lstm/script/run_eval_ascend.sh | 2 +- model_zoo/official/nlp/lstm/script/run_train_ascend.sh | 2 +- .../official/recommend/naml/ascend310_infer/build.sh | 2 +- .../official/recommend/naml/script/run_infer_310.sh | 4 ++-- model_zoo/research/audio/deepspeech2/src/callback.py | 2 +- model_zoo/research/audio/wavenet/evaluate.py | 4 ++-- model_zoo/research/audio/wavenet/export.py | 2 +- model_zoo/research/audio/wavenet/src/callback.py | 2 +- .../research/audio/wavenet/wavenet_vocoder/conv.py | 2 +- .../cv/FaceDetection/scripts/run_distribute_train.sh | 2 +- .../research/cv/FaceDetection/scripts/run_eval.sh | 2 +- .../research/cv/FaceDetection/scripts/run_export.sh | 2 +- .../cv/FaceDetection/scripts/run_standalone_train.sh | 2 +- model_zoo/research/cv/FaceQualityAssessment/eval.py | 2 +- .../scripts/run_distribute_train.sh | 2 +- .../cv/FaceQualityAssessment/scripts/run_export.sh | 2 +- .../scripts/run_standalone_train.sh | 2 +- model_zoo/research/cv/FaceQualityAssessment/train.py | 2 +- model_zoo/research/cv/FaceRecognition/eval.py | 2 +- .../scripts/run_distribute_train_base.sh | 4 ++-- .../scripts/run_distribute_train_beta.sh | 4 ++-- .../research/cv/FaceRecognition/scripts/run_eval.sh | 2 +- .../research/cv/FaceRecognition/scripts/run_export.sh | 2 +- .../scripts/run_distribute_train.sh | 2 +- .../cv/FaceRecognitionForTracking/scripts/run_eval.sh | 2 +- .../FaceRecognitionForTracking/scripts/run_export.sh | 2 +- .../scripts/run_standalone_train.sh | 2 +- model_zoo/research/cv/IPT/src/data/srdata.py | 4 +--- model_zoo/research/cv/IPT/src/metrics.py | 2 +- .../cv/centernet/scripts/run_standalone_eval_ascend.sh | 4 ++-- .../cv/centernet/scripts/run_standalone_eval_cpu.sh | 4 ++-- .../cv/resnet50_adv_pruning/mindpsore_hub_conf.py | 4 ++-- model_zoo/research/nlp/ternarybert/scripts/run_eval.sh | 2 +- model_zoo/research/nlp/ternarybert/src/config.py | 2 +- model_zoo/research/nlp/textrcnn/src/dataset.py | 2 +- model_zoo/research/nlp/tprr/src/reader_eval.py | 2 +- .../research/nlp/tprr/src/rerank_and_reader_utils.py | 2 +- model_zoo/research/nlp/tprr/src/reranker_eval.py | 2 +- 77 files changed, 106 insertions(+), 106 deletions(-) diff --git a/model_zoo/official/cv/centerface/dependency/centernet/src/lib/datasets/dataset/coco_hp.py b/model_zoo/official/cv/centerface/dependency/centernet/src/lib/datasets/dataset/coco_hp.py index 556f8b8fb75..1ccb35ce736 100644 --- a/model_zoo/official/cv/centerface/dependency/centernet/src/lib/datasets/dataset/coco_hp.py +++ b/model_zoo/official/cv/centerface/dependency/centernet/src/lib/datasets/dataset/coco_hp.py @@ -28,8 +28,8 @@ from __future__ import print_function import os import numpy as np -import pycocotools.coco as coco import cv2 +import pycocotools.coco as coco class CenterfaceDataset(): """ diff --git a/model_zoo/official/cv/cnn_direction_model/src/dataset.py b/model_zoo/official/cv/cnn_direction_model/src/dataset.py index 92c75e5150e..ec1bbdefe0d 100644 --- a/model_zoo/official/cv/cnn_direction_model/src/dataset.py +++ b/model_zoo/official/cv/cnn_direction_model/src/dataset.py @@ -16,6 +16,8 @@ Data operations, will be used in train.py and eval.py """ import os +import cv2 +import numpy as np import mindspore.dataset as ds import mindspore.dataset.vision.c_transforms as C @@ -24,9 +26,6 @@ from src.dataset_utils import lucky, noise_blur, noise_speckle, noise_gamma, noi randcrop, resize, rdistort, rgeometry, rotate_about_center, whole_rdistort, warp_perspective, random_contrast, \ unify_img_label -import cv2 -import numpy as np - cv2.setNumThreads(0) image_height = None diff --git a/model_zoo/official/cv/cnn_direction_model/train.py b/model_zoo/official/cv/cnn_direction_model/train.py index 5e9a0142be0..f05974da962 100644 --- a/model_zoo/official/cv/cnn_direction_model/train.py +++ b/model_zoo/official/cv/cnn_direction_model/train.py @@ -16,11 +16,6 @@ import argparse import os import random - -from src.cnn_direction_model import CNNDirectionModel -from src.config import config1 as config -from src.dataset import create_dataset_train - import numpy as np import mindspore as ms @@ -35,6 +30,10 @@ from mindspore.train.callback import ModelCheckpoint, CheckpointConfig, LossMoni from mindspore.train.model import Model, ParallelMode from mindspore.train.serialization import load_checkpoint, load_param_into_net +from src.cnn_direction_model import CNNDirectionModel +from src.config import config1 as config +from src.dataset import create_dataset_train + parser = argparse.ArgumentParser(description='Image classification') parser.add_argument('--run_distribute', type=bool, default=False, help='Run distribute') parser.add_argument('--device_num', type=int, default=1, help='Device num.') diff --git a/model_zoo/official/cv/crnn/src/dataset.py b/model_zoo/official/cv/crnn/src/dataset.py index da6d1f6bfaa..094f0bc7635 100644 --- a/model_zoo/official/cv/crnn/src/dataset.py +++ b/model_zoo/official/cv/crnn/src/dataset.py @@ -15,11 +15,11 @@ """Dataset preprocessing.""" import os import numpy as np +from PIL import Image, ImageFile import mindspore.common.dtype as mstype import mindspore.dataset as ds import mindspore.dataset.transforms.c_transforms as C import mindspore.dataset.vision.c_transforms as vc -from PIL import Image, ImageFile from src.config import config1, label_dict from src.ic03_dataset import IC03Dataset from src.ic13_dataset import IC13Dataset diff --git a/model_zoo/official/cv/ctpn/ascend310_infer/build.sh b/model_zoo/official/cv/ctpn/ascend310_infer/build.sh index 8bf761bc335..770a8851efa 100644 --- a/model_zoo/official/cv/ctpn/ascend310_infer/build.sh +++ b/model_zoo/official/cv/ctpn/ascend310_infer/build.sh @@ -17,7 +17,7 @@ if [ ! -d out ]; then mkdir out fi -cd out +cd out || exit cmake .. \ -DMINDSPORE_PATH="`pip show mindspore-ascend | grep Location | awk '{print $2"/mindspore"}' | xargs realpath`" make diff --git a/model_zoo/official/cv/ctpn/scripts/run_eval_ascend.sh b/model_zoo/official/cv/ctpn/scripts/run_eval_ascend.sh index 0a0d49ab029..9848459fb43 100644 --- a/model_zoo/official/cv/ctpn/scripts/run_eval_ascend.sh +++ b/model_zoo/official/cv/ctpn/scripts/run_eval_ascend.sh @@ -67,13 +67,13 @@ do cp ../*.py ./eval cp *.sh ./eval cp -r ../src ./eval - cd ./eval + cd ./eval || exit env > env.log CHECKPOINT_FILE_PATH=$file echo "start eval for checkpoint file: ${CHECKPOINT_FILE_PATH}" python eval.py --device_id=$DEVICE_ID --image_path=$IMAGE_PATH --dataset_path=$DATASET_PATH --checkpoint_path=$CHECKPOINT_FILE_PATH &> log echo "end eval for checkpoint file: ${CHECKPOINT_FILE_PATH}" - cd ./submit + cd ./submit || exit file_base_name=$(basename $file) zip -r ../../submit_${file_base_name%.*}.zip *.txt cd ../../ diff --git a/model_zoo/official/cv/ctpn/scripts/run_infer_310.sh b/model_zoo/official/cv/ctpn/scripts/run_infer_310.sh index a3dd05cbc88..dac4cbbf187 100755 --- a/model_zoo/official/cv/ctpn/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/ctpn/scripts/run_infer_310.sh @@ -63,7 +63,7 @@ fi function compile_app() { - cd ../ascend310_infer + cd ../ascend310_infer || exit if [ -f "Makefile" ]; then make clean fi @@ -113,9 +113,9 @@ function cal_acc() if [ -f "ubmit.zip" ]; then rm -f submit.zip fi - cd output + cd output || exit zip -r ../submit.zip *.txt - cd - + cd - || exit } compile_app diff --git a/model_zoo/official/cv/deeplabv3/ascend310_infer/build.sh b/model_zoo/official/cv/deeplabv3/ascend310_infer/build.sh index 76edaa8ac3b..285514e19f2 100644 --- a/model_zoo/official/cv/deeplabv3/ascend310_infer/build.sh +++ b/model_zoo/official/cv/deeplabv3/ascend310_infer/build.sh @@ -17,7 +17,8 @@ if [ -d out ]; then rm -rf out fi -mkdir out && cd out +mkdir out +cd out || exit if [ -f "Makefile" ]; then make clean diff --git a/model_zoo/official/cv/deeplabv3/scripts/run_infer_310.sh b/model_zoo/official/cv/deeplabv3/scripts/run_infer_310.sh index 3b7c47a7bbf..40f7e22dca5 100644 --- a/model_zoo/official/cv/deeplabv3/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/deeplabv3/scripts/run_infer_310.sh @@ -60,13 +60,13 @@ fi function compile_app() { - cd ../ascend310_infer + cd ../ascend310_infer || exit bash build.sh &> build.log } function infer() { - cd - + cd - || exit if [ -d result_Files ]; then rm -rf ./result_Files fi diff --git a/model_zoo/official/cv/faster_rcnn/ascend310_infer/src/build.sh b/model_zoo/official/cv/faster_rcnn/ascend310_infer/src/build.sh index 0599ca7dcd3..82d02bf3f0a 100755 --- a/model_zoo/official/cv/faster_rcnn/ascend310_infer/src/build.sh +++ b/model_zoo/official/cv/faster_rcnn/ascend310_infer/src/build.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================ -path_cur=$(cd "`dirname $0`"; pwd) +path_cur=$(cd "`dirname $0`" || exit; pwd) build_type="Release" function preparePath() { diff --git a/model_zoo/official/cv/faster_rcnn/scripts/run_infer_310.sh b/model_zoo/official/cv/faster_rcnn/scripts/run_infer_310.sh index 18888108a75..b0a6f7cb9ea 100755 --- a/model_zoo/official/cv/faster_rcnn/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/faster_rcnn/scripts/run_infer_310.sh @@ -67,9 +67,9 @@ function air_to_om() function compile_app() { - cd ../ascend310_infer/src + cd ../ascend310_infer/src || exit sh build.sh &> build.log - cd - + cd - || exit } function infer() diff --git a/model_zoo/official/cv/faster_rcnn/src/util.py b/model_zoo/official/cv/faster_rcnn/src/util.py index ad208f0dfc2..fdd1ab04895 100644 --- a/model_zoo/official/cv/faster_rcnn/src/util.py +++ b/model_zoo/official/cv/faster_rcnn/src/util.py @@ -15,9 +15,9 @@ """coco eval for fasterrcnn""" import json import numpy as np +import mmcv from pycocotools.coco import COCO from pycocotools.cocoeval import COCOeval -import mmcv _init_value = np.array(0.0) summary_init = { diff --git a/model_zoo/official/cv/inceptionv4/scripts/run_distribute_train_gpu.sh b/model_zoo/official/cv/inceptionv4/scripts/run_distribute_train_gpu.sh index d24d716b39f..ff0a892a1a9 100644 --- a/model_zoo/official/cv/inceptionv4/scripts/run_distribute_train_gpu.sh +++ b/model_zoo/official/cv/inceptionv4/scripts/run_distribute_train_gpu.sh @@ -18,7 +18,7 @@ rm -rf device mkdir device cp ./*.py ./device cp -r ./src ./device -cd ./device +cd ./device || exit DATA_DIR=$1 diff --git a/model_zoo/official/cv/inceptionv4/scripts/run_eval_gpu.sh b/model_zoo/official/cv/inceptionv4/scripts/run_eval_gpu.sh index 115e5e8f22a..cbe12e5b2e4 100644 --- a/model_zoo/official/cv/inceptionv4/scripts/run_eval_gpu.sh +++ b/model_zoo/official/cv/inceptionv4/scripts/run_eval_gpu.sh @@ -18,7 +18,7 @@ rm -rf evaluation mkdir evaluation cp ./*.py ./evaluation cp -r ./src ./evaluation -cd ./evaluation +cd ./evaluation || exit export DEVICE_ID=0 export RANK_SIZE=1 diff --git a/model_zoo/official/cv/maskrcnn/ascend310_infer/src/build.sh b/model_zoo/official/cv/maskrcnn/ascend310_infer/src/build.sh index 0599ca7dcd3..f00e5e91fa7 100755 --- a/model_zoo/official/cv/maskrcnn/ascend310_infer/src/build.sh +++ b/model_zoo/official/cv/maskrcnn/ascend310_infer/src/build.sh @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================ -path_cur=$(cd "`dirname $0`"; pwd) +path_cur=$(cd "`dirname $0`" || exit; pwd) build_type="Release" function preparePath() { rm -rf $1 mkdir -p $1 - cd $1 + cd $1 || exit } function buildA300() { diff --git a/model_zoo/official/cv/maskrcnn/src/dataset.py b/model_zoo/official/cv/maskrcnn/src/dataset.py index bb055bde2c0..9605004ac7b 100644 --- a/model_zoo/official/cv/maskrcnn/src/dataset.py +++ b/model_zoo/official/cv/maskrcnn/src/dataset.py @@ -19,13 +19,13 @@ from __future__ import division import os import numpy as np from numpy import random - +import cv2 import mmcv + import mindspore.dataset as de import mindspore.dataset.vision.c_transforms as C from mindspore.mindrecord import FileWriter from src.config import config -import cv2 def bbox_overlaps(bboxes1, bboxes2, mode='iou'): """Calculate the ious between each bbox of bboxes1 and bboxes2. diff --git a/model_zoo/official/cv/maskrcnn/src/util.py b/model_zoo/official/cv/maskrcnn/src/util.py index 49e2f696899..9d1d02fb9f2 100644 --- a/model_zoo/official/cv/maskrcnn/src/util.py +++ b/model_zoo/official/cv/maskrcnn/src/util.py @@ -15,10 +15,10 @@ """coco eval for maskrcnn""" import json import numpy as np +import mmcv from pycocotools.coco import COCO from pycocotools.cocoeval import COCOeval from pycocotools import mask as maskUtils -import mmcv from src.config import config diff --git a/model_zoo/official/cv/maskrcnn_mobilenetv1/src/dataset.py b/model_zoo/official/cv/maskrcnn_mobilenetv1/src/dataset.py index ddc294b44f0..ed8dedcc201 100644 --- a/model_zoo/official/cv/maskrcnn_mobilenetv1/src/dataset.py +++ b/model_zoo/official/cv/maskrcnn_mobilenetv1/src/dataset.py @@ -21,6 +21,7 @@ import mmcv import cv2 import numpy as np from numpy import random + import mindspore.dataset as de import mindspore.dataset.vision.c_transforms as C from mindspore.mindrecord import FileWriter diff --git a/model_zoo/official/cv/openpose/eval.py b/model_zoo/official/cv/openpose/eval.py index 1bde802d8d4..f3ec749bcab 100644 --- a/model_zoo/official/cv/openpose/eval.py +++ b/model_zoo/official/cv/openpose/eval.py @@ -18,9 +18,9 @@ import argparse import warnings import sys import numpy as np -from tqdm import tqdm import cv2 from scipy.ndimage.filters import gaussian_filter +from tqdm import tqdm from pycocotools.coco import COCO as LoadAnn from pycocotools.cocoeval import COCOeval as MapEval diff --git a/model_zoo/official/cv/psenet/src/ETSNET/pse/adaptor.cpp b/model_zoo/official/cv/psenet/src/ETSNET/pse/adaptor.cpp index 6d9897c80d6..8885e848fec 100644 --- a/model_zoo/official/cv/psenet/src/ETSNET/pse/adaptor.cpp +++ b/model_zoo/official/cv/psenet/src/ETSNET/pse/adaptor.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -76,7 +77,7 @@ namespace pse_adaptor { int dx[] = {-1, 1, 0, 0}; int dy[] = {0, 0, -1, 1}; - for (int kernal_id = kernels.size() - 2; kernal_id >= 0; --kernal_id) { + for (int kernel_id = kernels.size() - 2; kernel_id >= 0; --kernel_id) { while (!queue.empty()) { Point point = queue.front(); queue.pop(); @@ -90,7 +91,7 @@ namespace pse_adaptor { if (tmp_x < 0 || tmp_x >= static_cast(text_line->size())) continue; if (tmp_y < 0 || tmp_y >= static_cast(text_line->at(1).size())) continue; - if (kernels[kernal_id].at(tmp_x, tmp_y) == 0) continue; + if (kernels[kernel_id].at(tmp_x, tmp_y) == 0) continue; if (text_line->at(tmp_x)[tmp_y] > 0) continue; Point point_tmp(tmp_x, tmp_y); diff --git a/model_zoo/official/cv/psenet/src/dataset.py b/model_zoo/official/cv/psenet/src/dataset.py index d89f887b0a8..9585d8d46a0 100644 --- a/model_zoo/official/cv/psenet/src/dataset.py +++ b/model_zoo/official/cv/psenet/src/dataset.py @@ -17,17 +17,17 @@ import math import os import random - -import Polygon as plg import cv2 -import numpy as np -import pyclipper from PIL import Image -from src.config import config +import numpy as np +import Polygon as plg +import pyclipper import mindspore.dataset as ds import mindspore.dataset.vision.py_transforms as py_transforms +from src.config import config + __all__ = ['train_dataset_creator', 'test_dataset_creator'] diff --git a/model_zoo/official/cv/resnet/src/resnet.py b/model_zoo/official/cv/resnet/src/resnet.py index 0141a35a253..c160f48d981 100755 --- a/model_zoo/official/cv/resnet/src/resnet.py +++ b/model_zoo/official/cv/resnet/src/resnet.py @@ -15,12 +15,12 @@ """ResNet.""" import math import numpy as np +from scipy.stats import truncnorm import mindspore.nn as nn import mindspore.common.dtype as mstype from mindspore.ops import operations as P from mindspore.ops import functional as F from mindspore.common.tensor import Tensor -from scipy.stats import truncnorm def _conv_variance_scaling_initializer(in_channel, out_channel, kernel_size): diff --git a/model_zoo/official/cv/resnet/src/resnet_gpu_benchmark.py b/model_zoo/official/cv/resnet/src/resnet_gpu_benchmark.py index a164473cf59..03f1d750100 100644 --- a/model_zoo/official/cv/resnet/src/resnet_gpu_benchmark.py +++ b/model_zoo/official/cv/resnet/src/resnet_gpu_benchmark.py @@ -14,11 +14,11 @@ # ============================================================================ """ResNet.""" import numpy as np +from scipy.stats import truncnorm import mindspore.nn as nn import mindspore.common.dtype as mstype from mindspore.ops import operations as P from mindspore.common.tensor import Tensor -from scipy.stats import truncnorm format_ = "NHWC" # tranpose shape to NCHW, default init is NHWC. diff --git a/model_zoo/official/cv/resnet152/scripts/run_distribute_train.sh b/model_zoo/official/cv/resnet152/scripts/run_distribute_train.sh index dc0afaf6369..d7567e06315 100644 --- a/model_zoo/official/cv/resnet152/scripts/run_distribute_train.sh +++ b/model_zoo/official/cv/resnet152/scripts/run_distribute_train.sh @@ -69,7 +69,7 @@ do cp ../*.py ./device$i cp *.sh ./device$i cp -r ../src ./device$i - cd ./device$i + cd ./device$i || exit export DEVICE_ID=$i export RANK_ID=$i echo "start training for device $i" diff --git a/model_zoo/official/cv/resnet152/scripts/run_standalone_train.sh b/model_zoo/official/cv/resnet152/scripts/run_standalone_train.sh index 7f09d5bd244..725d478f79c 100644 --- a/model_zoo/official/cv/resnet152/scripts/run_standalone_train.sh +++ b/model_zoo/official/cv/resnet152/scripts/run_standalone_train.sh @@ -60,7 +60,7 @@ mkdir ./train cp ../*.py ./train cp *.sh ./train cp -r ../src ./train -cd ./train +cd ./train || exit echo "start training for device $DEVICE_ID" env > env.log if [ $# == 1 ] diff --git a/model_zoo/official/cv/resnet152/src/resnet.py b/model_zoo/official/cv/resnet152/src/resnet.py index 237bc5b32e8..fc8f91bf1d9 100644 --- a/model_zoo/official/cv/resnet152/src/resnet.py +++ b/model_zoo/official/cv/resnet152/src/resnet.py @@ -1,12 +1,12 @@ """ResNet""" import numpy as np +from scipy.stats import truncnorm import mindspore.nn as nn import mindspore.common.dtype as mstype from mindspore.ops import operations as P from mindspore.ops import functional as F from mindspore.common.tensor import Tensor -from scipy.stats import truncnorm def _conv_variance_scaling_initializer(in_channel, out_channel, kernel_size): diff --git a/model_zoo/official/cv/resnext101/src/dataset.py b/model_zoo/official/cv/resnext101/src/dataset.py index b577fdccef5..4ce7b43c00e 100644 --- a/model_zoo/official/cv/resnext101/src/dataset.py +++ b/model_zoo/official/cv/resnext101/src/dataset.py @@ -16,11 +16,11 @@ dataset processing. """ import os +from PIL import Image, ImageFile from mindspore.common import dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as C import mindspore.dataset.vision.c_transforms as V_C -from PIL import Image, ImageFile from src.utils.sampler import DistributedSampler ImageFile.LOAD_TRUNCATED_IMAGES = True diff --git a/model_zoo/official/cv/resnext50/src/dataset.py b/model_zoo/official/cv/resnext50/src/dataset.py index 474d750b424..d7f5b4678e8 100644 --- a/model_zoo/official/cv/resnext50/src/dataset.py +++ b/model_zoo/official/cv/resnext50/src/dataset.py @@ -16,11 +16,11 @@ dataset processing. """ import os +from PIL import Image, ImageFile from mindspore.common import dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as C import mindspore.dataset.vision.c_transforms as V_C -from PIL import Image, ImageFile from src.utils.sampler import DistributedSampler ImageFile.LOAD_TRUNCATED_IMAGES = True diff --git a/model_zoo/official/cv/ssd/ascend310_infer/build.sh b/model_zoo/official/cv/ssd/ascend310_infer/build.sh index 76edaa8ac3b..285514e19f2 100644 --- a/model_zoo/official/cv/ssd/ascend310_infer/build.sh +++ b/model_zoo/official/cv/ssd/ascend310_infer/build.sh @@ -17,7 +17,8 @@ if [ -d out ]; then rm -rf out fi -mkdir out && cd out +mkdir out +cd out || exit if [ -f "Makefile" ]; then make clean diff --git a/model_zoo/official/cv/ssd/scripts/run_infer_310.sh b/model_zoo/official/cv/ssd/scripts/run_infer_310.sh index 998a16140f2..1679381a48b 100644 --- a/model_zoo/official/cv/ssd/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/ssd/scripts/run_infer_310.sh @@ -58,13 +58,13 @@ fi function compile_app() { - cd ../ascend310_infer + cd ../ascend310_infer || exit bash build.sh &> build.log } function infer() { - cd - + cd - || exit if [ -d result_Files ]; then rm -rf ./result_Files fi diff --git a/model_zoo/official/cv/tinydarknet/scripts/run_standalone_train.sh b/model_zoo/official/cv/tinydarknet/scripts/run_standalone_train.sh index d91521ce484..d789a94d29c 100644 --- a/model_zoo/official/cv/tinydarknet/scripts/run_standalone_train.sh +++ b/model_zoo/official/cv/tinydarknet/scripts/run_standalone_train.sh @@ -19,5 +19,5 @@ rm -rf ./train_single mkdir ./train_single cp -r ./src ./train_single cp ./train.py ./train_single -cd ./train_single +cd ./train_single || exit python ./train.py --device_id=$DEVICE_ID > ./train.log 2>&1 & diff --git a/model_zoo/official/cv/unet/postprocess.py b/model_zoo/official/cv/unet/postprocess.py index 530d3ae19e0..47aa39f66bc 100644 --- a/model_zoo/official/cv/unet/postprocess.py +++ b/model_zoo/official/cv/unet/postprocess.py @@ -21,7 +21,6 @@ import numpy as np from src.data_loader import create_dataset, create_cell_nuclei_dataset from src.config import cfg_unet - class dice_coeff(): def __init__(self): self.clear() diff --git a/model_zoo/official/cv/unet/scripts/run_infer_310.sh b/model_zoo/official/cv/unet/scripts/run_infer_310.sh index 3df2bfcc12a..7b4e54fa752 100644 --- a/model_zoo/official/cv/unet/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/unet/scripts/run_infer_310.sh @@ -79,7 +79,7 @@ function compile_app() function infer() { - cd - + cd - || exit if [ -d result_Files ]; then rm -rf ./result_Files fi diff --git a/model_zoo/official/cv/unet3d/scripts/run_standalone_eval.sh b/model_zoo/official/cv/unet3d/scripts/run_standalone_eval.sh index dcea3ca1a69..aaf83fe1df1 100644 --- a/model_zoo/official/cv/unet3d/scripts/run_standalone_eval.sh +++ b/model_zoo/official/cv/unet3d/scripts/run_standalone_eval.sh @@ -75,7 +75,7 @@ mkdir ./eval cp ../*.py ./eval cp *.sh ./eval cp -r ../src ./eval -cd ./eval +cd ./eval || exit echo "start eval for checkpoint file: ${CHECKPOINT_FILE_PATH}" python eval.py --data_url=$IMAGE_PATH --seg_url=$SEG_PATH --ckpt_path=$CHECKPOINT_FILE_PATH > eval.log 2>&1 & echo "end eval for checkpoint file: ${CHECKPOINT_FILE_PATH}" diff --git a/model_zoo/official/cv/vgg16/src/dataset.py b/model_zoo/official/cv/vgg16/src/dataset.py index 12fa5582f52..4a7b8ccb63e 100644 --- a/model_zoo/official/cv/vgg16/src/dataset.py +++ b/model_zoo/official/cv/vgg16/src/dataset.py @@ -16,11 +16,11 @@ dataset processing. """ import os +from PIL import Image, ImageFile from mindspore.common import dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as C import mindspore.dataset.vision.c_transforms as vision -from PIL import Image, ImageFile from src.utils.sampler import DistributedSampler ImageFile.LOAD_TRUNCATED_IMAGES = True diff --git a/model_zoo/official/cv/warpctc/src/dataset.py b/model_zoo/official/cv/warpctc/src/dataset.py index 98a91559e1c..530c5b61149 100755 --- a/model_zoo/official/cv/warpctc/src/dataset.py +++ b/model_zoo/official/cv/warpctc/src/dataset.py @@ -16,11 +16,11 @@ import os import math as m import numpy as np +from PIL import Image import mindspore.common.dtype as mstype import mindspore.dataset as ds import mindspore.dataset.transforms.c_transforms as c import mindspore.dataset.vision.c_transforms as vc -from PIL import Image from src.config import config as cf diff --git a/model_zoo/official/cv/yolov4/scripts/run_infer_310.sh b/model_zoo/official/cv/yolov4/scripts/run_infer_310.sh index 9e16530bf19..c23c0c71468 100644 --- a/model_zoo/official/cv/yolov4/scripts/run_infer_310.sh +++ b/model_zoo/official/cv/yolov4/scripts/run_infer_310.sh @@ -69,7 +69,7 @@ function compile_app() function infer() { - cd - + cd - || exit if [ -d result_Files ]; then rm -rf ./result_Files fi diff --git a/model_zoo/official/nlp/fasttext/scripts/run_distribute_train_8p.sh b/model_zoo/official/nlp/fasttext/scripts/run_distribute_train_8p.sh index 5d7078efa00..d534deaadfd 100644 --- a/model_zoo/official/nlp/fasttext/scripts/run_distribute_train_8p.sh +++ b/model_zoo/official/nlp/fasttext/scripts/run_distribute_train_8p.sh @@ -53,7 +53,7 @@ for((i=0;i<=7;i++)); do rm -rf ${current_exec_path}/device$i mkdir ${current_exec_path}/device$i - cd ${current_exec_path}/device$i + cd ${current_exec_path}/device$i || exit cp ../../*.py ./ cp -r ../../src ./ cp -r ../*.sh ./ @@ -61,6 +61,6 @@ do export DEVICE_ID=$i echo "start training for rank $i, device $DEVICE_ID" python ../../train.py --data_path $DATASET --data_name $DATANAME > log_fasttext.log 2>&1 & - cd ${current_exec_path} + cd ${current_exec_path} || exit done -cd ${current_exec_path} +cd ${current_exec_path} || exit diff --git a/model_zoo/official/nlp/gru/src/dataset.py b/model_zoo/official/nlp/gru/src/dataset.py index 18d2d95edc4..153c269a55c 100644 --- a/model_zoo/official/nlp/gru/src/dataset.py +++ b/model_zoo/official/nlp/gru/src/dataset.py @@ -14,11 +14,12 @@ # ============================================================================ """Data operations, will be used in train.py.""" +import numpy as np import mindspore.common.dtype as mstype import mindspore.dataset as de import mindspore.dataset.transforms.c_transforms as deC from src.config import config -import numpy as np + de.config.set_seed(1) def random_teacher_force(source_ids, target_ids, target_mask): diff --git a/model_zoo/official/nlp/lstm/script/run_eval_ascend.sh b/model_zoo/official/nlp/lstm/script/run_eval_ascend.sh index 23f752cd16c..5131f8a7553 100644 --- a/model_zoo/official/nlp/lstm/script/run_eval_ascend.sh +++ b/model_zoo/official/nlp/lstm/script/run_eval_ascend.sh @@ -26,7 +26,7 @@ CKPT_FILE=$3 rm -rf eval mkdir -p eval -cd eval +cd eval || exit mkdir -p ms_log CUR_DIR=`pwd` export GLOG_log_dir=${CUR_DIR}/ms_log diff --git a/model_zoo/official/nlp/lstm/script/run_train_ascend.sh b/model_zoo/official/nlp/lstm/script/run_train_ascend.sh index 9a52f24d937..43ef5738683 100644 --- a/model_zoo/official/nlp/lstm/script/run_train_ascend.sh +++ b/model_zoo/official/nlp/lstm/script/run_train_ascend.sh @@ -25,7 +25,7 @@ ACLIMDB_DIR=$2 GLOVE_DIR=$3 mkdir -p train -cd train +cd train || exit mkdir -p ms_log CUR_DIR=`pwd` export GLOG_log_dir=${CUR_DIR}/ms_log diff --git a/model_zoo/official/recommend/naml/ascend310_infer/build.sh b/model_zoo/official/recommend/naml/ascend310_infer/build.sh index 4ded7239596..595d13821b2 100644 --- a/model_zoo/official/recommend/naml/ascend310_infer/build.sh +++ b/model_zoo/official/recommend/naml/ascend310_infer/build.sh @@ -17,7 +17,7 @@ if [ ! -d out ]; then mkdir out fi -cd out +cd out || exit export CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 cmake .. -DCMAKE_CXX_COMPILER=g++ -DCMAKE_SKIP_RPATH=TRUE make diff --git a/model_zoo/official/recommend/naml/script/run_infer_310.sh b/model_zoo/official/recommend/naml/script/run_infer_310.sh index 5e0d8537c71..a56efcda823 100755 --- a/model_zoo/official/recommend/naml/script/run_infer_310.sh +++ b/model_zoo/official/recommend/naml/script/run_infer_310.sh @@ -78,7 +78,7 @@ function air_to_om() function compile_app() { - cd ../ascend310_infer + cd ../ascend310_infer || exit if [ -f "Makefile" ]; then make clean fi @@ -88,7 +88,7 @@ function compile_app() echo "compile app code failed" exit 1 fi - cd - + cd - || exit } function infer() diff --git a/model_zoo/research/audio/deepspeech2/src/callback.py b/model_zoo/research/audio/deepspeech2/src/callback.py index ec7676634ca..868e7b001a4 100644 --- a/model_zoo/research/audio/deepspeech2/src/callback.py +++ b/model_zoo/research/audio/deepspeech2/src/callback.py @@ -17,9 +17,9 @@ Defined callback for DeepSpeech. """ import time +import numpy as np from mindspore.train.callback import Callback from mindspore import Tensor -import numpy as np class TimeMonitor(Callback): diff --git a/model_zoo/research/audio/wavenet/evaluate.py b/model_zoo/research/audio/wavenet/evaluate.py index 9043c28c762..c5923701850 100644 --- a/model_zoo/research/audio/wavenet/evaluate.py +++ b/model_zoo/research/audio/wavenet/evaluate.py @@ -17,10 +17,10 @@ import os from os.path import join import argparse import glob -from hparams import hparams, hparams_debug_string -import audio import numpy as np from scipy.io import wavfile +from hparams import hparams, hparams_debug_string +import audio from tqdm import tqdm from mindspore import context, Tensor from mindspore.train.serialization import load_checkpoint, load_param_into_net diff --git a/model_zoo/research/audio/wavenet/export.py b/model_zoo/research/audio/wavenet/export.py index b6f090b9a58..943eb5916d7 100644 --- a/model_zoo/research/audio/wavenet/export.py +++ b/model_zoo/research/audio/wavenet/export.py @@ -17,12 +17,12 @@ import json from os.path import join import argparse from warnings import warn +import numpy as np from hparams import hparams, hparams_debug_string from mindspore import context, Tensor from mindspore.train.serialization import load_checkpoint, load_param_into_net, export from wavenet_vocoder import WaveNet from wavenet_vocoder.util import is_mulaw_quantize, is_scalar_input -import numpy as np from src.loss import PredictNet parser = argparse.ArgumentParser(description='TTS training') diff --git a/model_zoo/research/audio/wavenet/src/callback.py b/model_zoo/research/audio/wavenet/src/callback.py index 9ab9d54bf45..33f140cafbd 100644 --- a/model_zoo/research/audio/wavenet/src/callback.py +++ b/model_zoo/research/audio/wavenet/src/callback.py @@ -15,9 +15,9 @@ Defined callback for DeepFM. """ import time +import numpy as np from mindspore.train.callback import Callback from mindspore import Tensor -import numpy as np class TimeMonitor(Callback): diff --git a/model_zoo/research/audio/wavenet/wavenet_vocoder/conv.py b/model_zoo/research/audio/wavenet/wavenet_vocoder/conv.py index e57bf68e074..dbc891a0309 100644 --- a/model_zoo/research/audio/wavenet/wavenet_vocoder/conv.py +++ b/model_zoo/research/audio/wavenet/wavenet_vocoder/conv.py @@ -15,11 +15,11 @@ """Extended Conv1D.""" import math +import numpy as np from mindspore import nn, Tensor from mindspore.ops import operations as P import mindspore.common.dtype as mstype from mindspore import context -import numpy as np class Conv1d(nn.Conv1d): """ diff --git a/model_zoo/research/cv/FaceDetection/scripts/run_distribute_train.sh b/model_zoo/research/cv/FaceDetection/scripts/run_distribute_train.sh index a025cfbb2ee..7ace6610d13 100644 --- a/model_zoo/research/cv/FaceDetection/scripts/run_distribute_train.sh +++ b/model_zoo/research/cv/FaceDetection/scripts/run_distribute_train.sh @@ -69,7 +69,7 @@ for((i=0;i<=$RANK_SIZE-1;i++)); do echo 'start rank '$i mkdir ${current_exec_path}/device$i - cd ${current_exec_path}/device$i + cd ${current_exec_path}/device$i || exit export RANK_ID=$i dev=`expr $i + 0` export DEVICE_ID=$dev diff --git a/model_zoo/research/cv/FaceDetection/scripts/run_eval.sh b/model_zoo/research/cv/FaceDetection/scripts/run_eval.sh index c050db29a13..c772187d78e 100644 --- a/model_zoo/research/cv/FaceDetection/scripts/run_eval.sh +++ b/model_zoo/research/cv/FaceDetection/scripts/run_eval.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceDetection/scripts/run_export.sh b/model_zoo/research/cv/FaceDetection/scripts/run_export.sh index a69475a6a77..8176a0c31b0 100644 --- a/model_zoo/research/cv/FaceDetection/scripts/run_export.sh +++ b/model_zoo/research/cv/FaceDetection/scripts/run_export.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceDetection/scripts/run_standalone_train.sh b/model_zoo/research/cv/FaceDetection/scripts/run_standalone_train.sh index da388e3f858..edf618a3be5 100644 --- a/model_zoo/research/cv/FaceDetection/scripts/run_standalone_train.sh +++ b/model_zoo/research/cv/FaceDetection/scripts/run_standalone_train.sh @@ -66,7 +66,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceQualityAssessment/eval.py b/model_zoo/research/cv/FaceQualityAssessment/eval.py index fa62660a05b..c936822ae98 100644 --- a/model_zoo/research/cv/FaceQualityAssessment/eval.py +++ b/model_zoo/research/cv/FaceQualityAssessment/eval.py @@ -17,8 +17,8 @@ import os import warnings import argparse import numpy as np -from tqdm import tqdm import cv2 +from tqdm import tqdm import mindspore.nn as nn from mindspore import Tensor diff --git a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_distribute_train.sh b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_distribute_train.sh index d7451863068..6286e7ff232 100644 --- a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_distribute_train.sh +++ b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_distribute_train.sh @@ -75,7 +75,7 @@ for((i=0;i<=$RANK_SIZE-1;i++)); do echo 'start rank '$i mkdir ${current_exec_path}/device$i - cd ${current_exec_path}/device$i + cd ${current_exec_path}/device$i || exit export RANK_ID=$i dev=`expr $i + 0` export DEVICE_ID=$dev diff --git a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_export.sh b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_export.sh index a69475a6a77..8176a0c31b0 100644 --- a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_export.sh +++ b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_export.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_standalone_train.sh b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_standalone_train.sh index 682ea451092..4463e18d7f5 100644 --- a/model_zoo/research/cv/FaceQualityAssessment/scripts/run_standalone_train.sh +++ b/model_zoo/research/cv/FaceQualityAssessment/scripts/run_standalone_train.sh @@ -72,7 +72,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceQualityAssessment/train.py b/model_zoo/research/cv/FaceQualityAssessment/train.py index 545f2dd360a..47db3843bb1 100644 --- a/model_zoo/research/cv/FaceQualityAssessment/train.py +++ b/model_zoo/research/cv/FaceQualityAssessment/train.py @@ -102,7 +102,7 @@ def main(args): else: param_dict_new[key] = values load_param_into_net(network, param_dict_new) - cfg.logger.info('load model {} success'.format(cfg.pretrained)) + cfg.logger.info('load model %s success' % str(cfg.pretrained)) # optimizer and lr scheduler lr = warmup_step(cfg, gamma=0.9) diff --git a/model_zoo/research/cv/FaceRecognition/eval.py b/model_zoo/research/cv/FaceRecognition/eval.py index 52d3f242f31..003da916b2a 100644 --- a/model_zoo/research/cv/FaceRecognition/eval.py +++ b/model_zoo/research/cv/FaceRecognition/eval.py @@ -328,6 +328,6 @@ if __name__ == '__main__': log_path = os.path.join(arg.ckpt_path, 'logs') arg.logger = get_logger(log_path, arg.local_rank) - arg.logger.info('Config\n\n%s\n' % pformat(arg)) + arg.logger.info('Config\n\n%s\n' % str(pformat(arg))) main(arg) diff --git a/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_base.sh b/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_base.sh index 5527af284ca..a69fbf15808 100644 --- a/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_base.sh +++ b/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_base.sh @@ -42,7 +42,7 @@ export RANK_SIZE=8 export RANK_TABLE_FILE=$PATH1 EXECUTE_PATH=$(pwd) -echo *******************EXECUTE_PATH= $EXECUTE_PATH +echo *******************EXECUTE_PATH=$EXECUTE_PATH if [ -d "${EXECUTE_PATH}/log_parallel_graph" ]; then echo "[INFO] Delete old data_parallel log files" rm -rf ${EXECUTE_PATH}/log_parallel_graph @@ -53,7 +53,7 @@ for((i=0;i<=7;i++)); do rm -rf ${EXECUTE_PATH}/data_parallel_log_$i mkdir -p ${EXECUTE_PATH}/data_parallel_log_$i - cd ${EXECUTE_PATH}/data_parallel_log_$i + cd ${EXECUTE_PATH}/data_parallel_log_$i || exit export RANK_ID=$i export DEVICE_ID=$i echo "start training for rank $RANK_ID, device $DEVICE_ID" diff --git a/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_beta.sh b/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_beta.sh index 251938d6fab..3f62fb55364 100644 --- a/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_beta.sh +++ b/model_zoo/research/cv/FaceRecognition/scripts/run_distribute_train_beta.sh @@ -42,7 +42,7 @@ export RANK_SIZE=8 export RANK_TABLE_FILE=$PATH1 EXECUTE_PATH=$(pwd) -echo *******************EXECUTE_PATH= $EXECUTE_PATH +echo *******************EXECUTE_PATH=$EXECUTE_PATH if [ -d "${EXECUTE_PATH}/log_parallel_graph" ]; then echo "[INFO] Delete old data_parallel log files" rm -rf ${EXECUTE_PATH}/log_parallel_graph @@ -53,7 +53,7 @@ for((i=0;i<=7;i++)); do rm -rf ${EXECUTE_PATH}/data_parallel_log_$i mkdir -p ${EXECUTE_PATH}/data_parallel_log_$i - cd ${EXECUTE_PATH}/data_parallel_log_$i + cd ${EXECUTE_PATH}/data_parallel_log_$i || exit export RANK_ID=$i export DEVICE_ID=$i echo "start training for rank $RANK_ID, device $DEVICE_ID" diff --git a/model_zoo/research/cv/FaceRecognition/scripts/run_eval.sh b/model_zoo/research/cv/FaceRecognition/scripts/run_eval.sh index 87539fb27e7..0f599d43882 100644 --- a/model_zoo/research/cv/FaceRecognition/scripts/run_eval.sh +++ b/model_zoo/research/cv/FaceRecognition/scripts/run_eval.sh @@ -39,7 +39,7 @@ if [ -d "${EXECUTE_PATH}/log_inference" ]; then fi mkdir ${EXECUTE_PATH}/log_inference -cd ${EXECUTE_PATH}/log_inference +cd ${EXECUTE_PATH}/log_inference || exit env > ${EXECUTE_PATH}/log_inference/face_recognition.log python ${EXECUTE_PATH}/../eval.py &> ${EXECUTE_PATH}/log_inference/face_recognition.log & diff --git a/model_zoo/research/cv/FaceRecognition/scripts/run_export.sh b/model_zoo/research/cv/FaceRecognition/scripts/run_export.sh index d3b43789cf3..7c70371fcce 100644 --- a/model_zoo/research/cv/FaceRecognition/scripts/run_export.sh +++ b/model_zoo/research/cv/FaceRecognition/scripts/run_export.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_distribute_train.sh b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_distribute_train.sh index b20251e25b2..af12cfaf4fa 100644 --- a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_distribute_train.sh +++ b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_distribute_train.sh @@ -75,7 +75,7 @@ for((i=0;i<=$RANK_SIZE-1;i++)); do echo 'start rank '$i mkdir ${current_exec_path}/device$i - cd ${current_exec_path}/device$i + cd ${current_exec_path}/device$i || exit export RANK_ID=$i dev=`expr $i + 0` export DEVICE_ID=$dev diff --git a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_eval.sh b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_eval.sh index c4f14e89b7f..3ec0aa40399 100644 --- a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_eval.sh +++ b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_eval.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_export.sh b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_export.sh index 2f8a55d0062..a70a10590a9 100644 --- a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_export.sh +++ b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_export.sh @@ -61,7 +61,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_standalone_train.sh b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_standalone_train.sh index c8c4b45d544..c0d54513745 100644 --- a/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_standalone_train.sh +++ b/model_zoo/research/cv/FaceRecognitionForTracking/scripts/run_standalone_train.sh @@ -72,7 +72,7 @@ export RANK_ID=0 rm -rf ${current_exec_path}/device$USE_DEVICE_ID echo 'start device '$USE_DEVICE_ID mkdir ${current_exec_path}/device$USE_DEVICE_ID -cd ${current_exec_path}/device$USE_DEVICE_ID +cd ${current_exec_path}/device$USE_DEVICE_ID || exit dev=`expr $USE_DEVICE_ID + 0` export DEVICE_ID=$dev python ${dirname_path}/${SCRIPT_NAME} \ diff --git a/model_zoo/research/cv/IPT/src/data/srdata.py b/model_zoo/research/cv/IPT/src/data/srdata.py index ab31718d0a1..78b6a70dce4 100755 --- a/model_zoo/research/cv/IPT/src/data/srdata.py +++ b/model_zoo/research/cv/IPT/src/data/srdata.py @@ -17,11 +17,9 @@ import os import glob import random import pickle - -from src.data import common - import numpy as np import imageio +from src.data import common def search(root, target="JPEG"): diff --git a/model_zoo/research/cv/IPT/src/metrics.py b/model_zoo/research/cv/IPT/src/metrics.py index 3fe8b70e287..950fada0468 100755 --- a/model_zoo/research/cv/IPT/src/metrics.py +++ b/model_zoo/research/cv/IPT/src/metrics.py @@ -34,7 +34,7 @@ def calc_psnr(sr, hr, scale, rgb_range, y_only=False, dataset=None): gray_coeffs = np.array([65.738, 129.057, 25.064] ).reshape((1, 3, 1, 1)) / 256 diff = np.multiply(diff, gray_coeffs).sum(1) - if hr.size == 1: + if np.size(hr) == 1: return 0 if scale != 1: shave = scale diff --git a/model_zoo/research/cv/centernet/scripts/run_standalone_eval_ascend.sh b/model_zoo/research/cv/centernet/scripts/run_standalone_eval_ascend.sh index 17e28ce1b15..7b371f43532 100644 --- a/model_zoo/research/cv/centernet/scripts/run_standalone_eval_ascend.sh +++ b/model_zoo/research/cv/centernet/scripts/run_standalone_eval_ascend.sh @@ -37,10 +37,10 @@ then else echo "NMS module was not found, install it now..." git clone https://github.com/xingyizhou/CenterNet.git - cd CenterNet/src/lib/external/ + cd CenterNet/src/lib/external/ || exit make python setup.py install - cd - + cd - || exit rm -rf CenterNet fi diff --git a/model_zoo/research/cv/centernet/scripts/run_standalone_eval_cpu.sh b/model_zoo/research/cv/centernet/scripts/run_standalone_eval_cpu.sh index dcc0404b110..ccbef46350a 100644 --- a/model_zoo/research/cv/centernet/scripts/run_standalone_eval_cpu.sh +++ b/model_zoo/research/cv/centernet/scripts/run_standalone_eval_cpu.sh @@ -36,10 +36,10 @@ then else echo "NMS module was not found, install it now..." git clone https://github.com/xingyizhou/CenterNet.git - cd CenterNet/src/lib/external/ + cd CenterNet/src/lib/external/ || exit make python setup.py install - cd - + cd - || exit rm -rf CenterNet fi diff --git a/model_zoo/research/cv/resnet50_adv_pruning/mindpsore_hub_conf.py b/model_zoo/research/cv/resnet50_adv_pruning/mindpsore_hub_conf.py index 9dd975ab939..aa5d6798db0 100644 --- a/model_zoo/research/cv/resnet50_adv_pruning/mindpsore_hub_conf.py +++ b/model_zoo/research/cv/resnet50_adv_pruning/mindpsore_hub_conf.py @@ -13,9 +13,9 @@ # limitations under the License. # ============================================================================ """hub config.""" -from src.resnet_imgnet import resnet50 -from mindspore import Tensor import numpy as np +from mindspore import Tensor +from src.resnet_imgnet import resnet50 def get_index(filename): diff --git a/model_zoo/research/nlp/ternarybert/scripts/run_eval.sh b/model_zoo/research/nlp/ternarybert/scripts/run_eval.sh index ba3b8eceaec..082cf82845c 100644 --- a/model_zoo/research/nlp/ternarybert/scripts/run_eval.sh +++ b/model_zoo/research/nlp/ternarybert/scripts/run_eval.sh @@ -15,7 +15,7 @@ # ============================================================================ mkdir -p ms_log -PROJECT_DIR=$(cd "$(dirname "$0")"; pwd) +PROJECT_DIR=$(cd "$(dirname "$0")" || exit; pwd) CUR_DIR=`pwd` export GLOG_log_dir=${CUR_DIR}/ms_log export GLOG_logtostderr=0 diff --git a/model_zoo/research/nlp/ternarybert/src/config.py b/model_zoo/research/nlp/ternarybert/src/config.py index ac2bd3e00d6..649cc6e5a1a 100644 --- a/model_zoo/research/nlp/ternarybert/src/config.py +++ b/model_zoo/research/nlp/ternarybert/src/config.py @@ -15,8 +15,8 @@ """config script""" -import mindspore.common.dtype as mstype from easydict import EasyDict as edict +import mindspore.common.dtype as mstype from .tinybert_model import BertConfig from .assessment_method import Accuracy, F1, Pearsonr, Matthews diff --git a/model_zoo/research/nlp/textrcnn/src/dataset.py b/model_zoo/research/nlp/textrcnn/src/dataset.py index 6679039547b..57921736367 100644 --- a/model_zoo/research/nlp/textrcnn/src/dataset.py +++ b/model_zoo/research/nlp/textrcnn/src/dataset.py @@ -15,8 +15,8 @@ """dataset api""" import os from itertools import chain -import gensim import numpy as np +import gensim from mindspore.mindrecord import FileWriter import mindspore.dataset as ds diff --git a/model_zoo/research/nlp/tprr/src/reader_eval.py b/model_zoo/research/nlp/tprr/src/reader_eval.py index e39a9055fb2..d993565c65f 100644 --- a/model_zoo/research/nlp/tprr/src/reader_eval.py +++ b/model_zoo/research/nlp/tprr/src/reader_eval.py @@ -18,8 +18,8 @@ from collections import defaultdict import random from time import time import json -from tqdm import tqdm import numpy as np +from tqdm import tqdm from transformers import AlbertTokenizer diff --git a/model_zoo/research/nlp/tprr/src/rerank_and_reader_utils.py b/model_zoo/research/nlp/tprr/src/rerank_and_reader_utils.py index bd4dba37629..b0ecaa01657 100644 --- a/model_zoo/research/nlp/tprr/src/rerank_and_reader_utils.py +++ b/model_zoo/research/nlp/tprr/src/rerank_and_reader_utils.py @@ -26,9 +26,9 @@ import gzip import string import pickle import sqlite3 +import numpy as np from tqdm import tqdm -import numpy as np from transformers import BasicTokenizer diff --git a/model_zoo/research/nlp/tprr/src/reranker_eval.py b/model_zoo/research/nlp/tprr/src/reranker_eval.py index 4c2d89451dc..0d77ebe8b45 100644 --- a/model_zoo/research/nlp/tprr/src/reranker_eval.py +++ b/model_zoo/research/nlp/tprr/src/reranker_eval.py @@ -18,8 +18,8 @@ import json import random from collections import defaultdict from time import time -from tqdm import tqdm import numpy as np +from tqdm import tqdm from mindspore import Tensor, ops from mindspore import dtype as mstype