!11524 modify model_zoo frcnn's import and numpy version rely

From: @changzherui
Reviewed-by: @kingxian,@zh_qh
Signed-off-by: @kingxian
This commit is contained in:
mindspore-ci-bot 2021-01-22 17:33:12 +08:00 committed by Gitee
commit d0f5b092de
2 changed files with 4 additions and 3 deletions

View File

@ -17,7 +17,8 @@ import argparse
import numpy as np
import mindspore as ms
from mindspore import Tensor, load_checkpoint, load_param_into_net, export
from mindspore import Tensor
from mindspore.train.serialization import load_checkpoint, load_param_into_net, export
from src.FasterRcnn.faster_rcnn_r50 import Faster_Rcnn_Resnet50
from src.config import config
@ -25,7 +26,7 @@ from src.config import config
parser = argparse.ArgumentParser(description='fasterrcnn_export')
parser.add_argument('--ckpt_file', type=str, default='', help='fasterrcnn ckpt file.')
parser.add_argument('--output_file', type=str, default='', help='fasterrcnn output air name.')
parser.add_argument('--file_format', type=str, choices=["AIR", "ONNX", "MINDIR"], default='AIR', help='file format')
parser.add_argument('--file_format', type=str, choices=["AIR", "ONNX"], default='AIR', help='file format')
args = parser.parse_args()
if __name__ == '__main__':

View File

@ -109,7 +109,7 @@ def build_dependencies():
build_dependencies()
required_package = [
'numpy >= 1.17.0',
'numpy >= 1.17.0, <= 1.17.5',
'protobuf >= 3.8.0',
'asttokens >= 1.1.13',
'pillow >= 6.2.0',