From a9f5747322511bc098abe2cf2e9e1452d44e0556 Mon Sep 17 00:00:00 2001
From: GongLiyao <gongliyao@huawei.com>
Date: Sat, 21 May 2022 11:10:24 +0800
Subject: [PATCH] change export default to MINDIR.
---
benchmark/ascend/resnet/README.md | 6 +++---
benchmark/ascend/resnet/README_CN.md | 4 ++--
official/cv/alexnet/README.md | 4 ++--
official/cv/alexnet/README_CN.md | 4 ++--
official/cv/brdnet/export.py | 2 +-
official/cv/brdnet/infer/README_CN.md | 2 +-
official/cv/centerface/README.md | 4 ++--
official/cv/deeplabv3/README.md | 4 ++--
official/cv/deeplabv3/README_CN.md | 4 ++--
official/cv/deeplabv3plus/export.py | 2 +-
official/cv/depthnet/export.py | 4 ++--
official/cv/east/export.py | 2 +-
official/cv/east/infer/README_CN.md | 2 +-
official/cv/faster_rcnn/README.md | 4 ++--
official/cv/faster_rcnn/README_CN.md | 4 ++--
official/cv/fastscnn/infer/README_CN.md | 2 +-
official/cv/inceptionv3/README.md | 4 ++--
official/cv/inceptionv3/README_CN.md | 4 ++--
official/cv/lenet/README.md | 4 ++--
official/cv/lenet/README_CN.md | 4 ++--
official/cv/maskrcnn/README.md | 4 ++--
official/cv/maskrcnn/README_CN.md | 4 ++--
official/cv/maskrcnn_mobilenetv1/README.md | 4 ++--
official/cv/mobilenetv2/README.md | 4 ++--
official/cv/mobilenetv2/README_CN.md | 4 ++--
official/cv/nasnet/modelarts/train_start.py | 2 +-
official/cv/resnet/README.md | 4 ++--
official/cv/resnet/README_CN.md | 4 ++--
official/cv/resnet_thor/README_CN.md | 2 +-
official/cv/shufflenetv2/modelarts/train_start.py | 2 +-
official/cv/vgg16/README.md | 4 ++--
official/cv/vgg16/README_CN.md | 4 ++--
official/cv/yolov4/README_CN.md | 2 +-
official/gnn/bgcf/README.md | 2 +-
official/gnn/bgcf/README_CN.md | 2 +-
official/nlp/emotect/export.py | 2 +-
official/nlp/ernie/export.py | 2 +-
official/nlp/mass/README.md | 4 ++--
official/nlp/mass/README_CN.md | 4 ++--
research/audio/fcn-4/README.md | 4 ++--
research/cv/CycleGAN/src/utils/args.py | 2 +-
research/cv/FaceDetection/README.md | 4 ++--
research/cv/IRN/export.py | 2 +-
research/cv/SinGAN/train_modelarts.py | 2 +-
research/cv/VehicleNet/export.py | 2 +-
research/cv/autoaugment/export.py | 2 +-
research/cv/centernet_det/default_config.yaml | 2 +-
research/cv/r2plus1d/infer/README_CN.md | 2 +-
research/cv/res2net/README.md | 4 ++--
research/cv/squeezenet/export.py | 2 +-
research/cv/ssd_mobilenetV2/modelart/start.py | 2 +-
.../config/ssdlite_mobilenetv2-fpn.yaml | 4 ++--
research/cv/vgg19/README.md | 4 ++--
research/cv/vgg19/README_CN.md | 4 ++--
research/cv/wgan/src/args.py | 2 +-
research/nlp/gpt2/export.py | 2 +-
research/recommend/EDCN/README.md | 6 +++---
research/recommend/autodis/README.md | 4 ++--
research/recommend/autodis/default_config.yaml | 2 +-
59 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/benchmark/ascend/resnet/README.md b/benchmark/ascend/resnet/README.md
index f8d916c77..2ba337d61 100644
--- a/benchmark/ascend/resnet/README.md
+++ b/benchmark/ascend/resnet/README.md
@@ -454,13 +454,13 @@ Export on ModelArts (If you want to run in modelarts, please check the official
# Set "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on default_config.yaml file.
# Set "checkpoint_url='s3://dir_to_trained_ckpt/'" on default_config.yaml file.
# Set "file_name='./resnet'" on default_config.yaml file.
-# Set "file_format='AIR'" on default_config.yaml file.
+# Set "file_format='MINDIR'" on default_config.yaml file.
# Set other parameters on default_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add "checkpoint_url='s3://dir_to_trained_ckpt/'" on the website UI interface.
# Add "file_name='./resnet'" on the website UI interface.
-# Add "file_format='AIR'" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add other parameters on the website UI interface.
# (4) Set the code directory to "/path/resnet" on the website UI interface.
# (5) Set the startup file to "export.py" on the website UI interface.
@@ -590,4 +590,4 @@ Refer to the [ModelZoo FAQ](https://gitee.com/mindspore/models#FAQ) for some com
- **Q: How to use `boost` to get the best performance?**
- **A**: We provide the `boost_level` in the `Model` interface, when you set it to `O1` or `O2` mode, the network will automatically speed up. The high-performance mode has been fully verified on resnet50, you can use the `resnet50_imagenet2012_Boost_config.yaml` to experience this mode. Meanwhile, in `O1` or `O2` mode, it is recommended to set the following environment variables: ` export ENV_FUSION_CLEAR=1; export DATASET_ENABLE_NUMA=True; export ENV_SINGLE_EVAL=1; export SKT_ENABLE=1;`.
\ No newline at end of file
+ **A**: We provide the `boost_level` in the `Model` interface, when you set it to `O1` or `O2` mode, the network will automatically speed up. The high-performance mode has been fully verified on resnet50, you can use the `resnet50_imagenet2012_Boost_config.yaml` to experience this mode. Meanwhile, in `O1` or `O2` mode, it is recommended to set the following environment variables: ` export ENV_FUSION_CLEAR=1; export DATASET_ENABLE_NUMA=True; export ENV_SINGLE_EVAL=1; export SKT_ENABLE=1;`.
diff --git a/benchmark/ascend/resnet/README_CN.md b/benchmark/ascend/resnet/README_CN.md
index 3df9996ec..5fa688b2c 100644
--- a/benchmark/ascend/resnet/README_CN.md
+++ b/benchmark/ascend/resnet/README_CN.md
@@ -680,12 +680,12 @@ ModelArts导出mindir
# 设置 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt" 在 yaml 文件。
# 设置 "checkpoint_url=/The path of checkpoint in S3/" 在 yaml 文件。
# 设置 "file_name='./resnet'"参数在yaml文件。
-# 设置 "file_format='AIR'" 参数在yaml文件。
+# 设置 "file_format='MINDIR'" 参数在yaml文件。
# b. 增加 "enable_modelarts=True" 参数在modearts的界面上。
# 增加 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" 参数在modearts的界面上。
# 增加 "checkpoint_url=/The path of checkpoint in S3/" 参数在modearts的界面上。
# 设置 "file_name='./resnet'"参数在modearts的界面上。
-# 设置 "file_format='AIR'" 参数在modearts的界面上。
+# 设置 "file_format='MINDIR'" 参数在modearts的界面上。
# (4) 在modelarts的界面上设置代码的路径 "/path/resnet"。
# (5) 在modelarts的界面上设置模型的启动文件 "export.py" 。
# 模型的输出路径"Output file path" 和模型的日志路径 "Job log path" 。
diff --git a/official/cv/alexnet/README.md b/official/cv/alexnet/README.md
index 69e1d87b4..45d6ad670 100644
--- a/official/cv/alexnet/README.md
+++ b/official/cv/alexnet/README.md
@@ -163,13 +163,13 @@ bash run_standalone_eval_ascend.sh [cifar10|imagenet] [DATA_PATH] [CKPT_NAME] [D
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='alexnet'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='alexnet'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/alexnet/README_CN.md b/official/cv/alexnet/README_CN.md
index c284782bc..cdf4289c0 100644
--- a/official/cv/alexnet/README_CN.md
+++ b/official/cv/alexnet/README_CN.md
@@ -152,13 +152,13 @@ bash run_standalone_eval_ascend.sh [cifar10|imagenet] [DATA_PATH] [CKPT_NAME] [D
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='alexnet'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='alexnet'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/brdnet/export.py b/official/cv/brdnet/export.py
index 32c92bdc7..569915f98 100644
--- a/official/cv/brdnet/export.py
+++ b/official/cv/brdnet/export.py
@@ -35,7 +35,7 @@ parser.add_argument("--image_height", type=int, default=500, help="Image height.
parser.add_argument("--image_width", type=int, default=500, help="Image width.")
parser.add_argument("--ckpt_file", type=str, required=True, help="Checkpoint file path.")
parser.add_argument("--file_name", type=str, default="brdnet", help="output file 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", "MINDIR"], default="MINDIR", help="file format")
parser.add_argument('--device_target', type=str, default='Ascend'
, help='device where the code will be implemented. (Default: Ascend)')
parser.add_argument("--device_id", type=int, default=0, help="Device id")
diff --git a/official/cv/brdnet/infer/README_CN.md b/official/cv/brdnet/infer/README_CN.md
index c53939851..2d5293ca3 100644
--- a/official/cv/brdnet/infer/README_CN.md
+++ b/official/cv/brdnet/infer/README_CN.md
@@ -50,7 +50,7 @@ python export.py \
--image_width=500 \
--ckpt_file=xxx/brdnet.ckpt \
--file_name=brdnet \
---file_format=AIR \
+--file_format='AIR' \
--device_target=Ascend \
--device_id=0 \
```
diff --git a/official/cv/centerface/README.md b/official/cv/centerface/README.md
index a80ffa5f0..5c4824aeb 100644
--- a/official/cv/centerface/README.md
+++ b/official/cv/centerface/README.md
@@ -286,13 +286,13 @@ bash eval_all.sh [GROUND_TRUTH_PATH] [FILTER_EASY](optional) [FILTER_MEDIUM](opt
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='centerface'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='centerface'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/deeplabv3/README.md b/official/cv/deeplabv3/README.md
index 4f55129f7..ee4c417dd 100644
--- a/official/cv/deeplabv3/README.md
+++ b/official/cv/deeplabv3/README.md
@@ -445,7 +445,7 @@ bash run_eval_s8_multiscale_flip.sh
# Set "export_model='deeplab_v3_s8'" on base_config.yaml file.
# Set "export_batch_size=1" on base_config.yaml file.
# Set "file_name='deeplabv3'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
@@ -453,7 +453,7 @@ bash run_eval_s8_multiscale_flip.sh
# Add "export_model='deeplab_v3_s8'" on the website UI interface.
# Add "export_batch_size=1" on the website UI interface.
# Add "file_name='deeplabv3'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/deeplabv3/README_CN.md b/official/cv/deeplabv3/README_CN.md
index 63b111ea4..a0e9cafb2 100644
--- a/official/cv/deeplabv3/README_CN.md
+++ b/official/cv/deeplabv3/README_CN.md
@@ -446,7 +446,7 @@ bash run_eval_s8_multiscale_flip.sh
# 在 base_config.yaml 文件中设置 "export_model='deeplab_v3_s8'"
# 在 base_config.yaml 文件中设置 "export_batch_size=1"
# 在 base_config.yaml 文件中设置 "file_name='deeplabv3'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
@@ -454,7 +454,7 @@ bash run_eval_s8_multiscale_flip.sh
# 在网页上设置 "export_model='deeplab_v3_s8'"
# 在网页上设置 "export_batch_size=1"
# 在网页上设置 "file_name='deeplabv3'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/deeplabv3plus/export.py b/official/cv/deeplabv3plus/export.py
index 2bae359da..90e5808d8 100644
--- a/official/cv/deeplabv3plus/export.py
+++ b/official/cv/deeplabv3plus/export.py
@@ -24,4 +24,4 @@ if __name__ == '__main__':
# load the parameter into net
load_param_into_net(network, param_dict)
input_data = np.random.uniform(0.0, 1.0, size=[32, 3, 513, 513]).astype(np.float32)
- export(network, Tensor(input_data), file_name=args.model + '-300_11.air', file_format='AIR')
+ export(network, Tensor(input_data), file_name=args.model + '-300_11.air', file_format='MINDIR')
diff --git a/official/cv/depthnet/export.py b/official/cv/depthnet/export.py
index 8fb236982..017bd24cb 100644
--- a/official/cv/depthnet/export.py
+++ b/official/cv/depthnet/export.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
export(coarse_net, Tensor(input_rgb_coarsenet), file_name=os.path.join(mindir_dir, "FinalCoarseNet"),
file_format='MINDIR')
export(coarse_net, Tensor(input_rgb_coarsenet), file_name=os.path.join(air_dir, "FinalCoarseNet"),
- file_format='AIR')
+ file_format='MINDIR')
else:
fine_net = FineNet()
fine_net_file_name = os.path.join(ckpt_dir, "FinalFineNet.ckpt")
@@ -68,4 +68,4 @@ if __name__ == "__main__":
export(fine_net, Tensor(input_rgb_finenet), Tensor(input_coarse_depth),
file_name=os.path.join(mindir_dir, "FinalFineNet"), file_format='MINDIR')
export(fine_net, Tensor(input_rgb_finenet), Tensor(input_coarse_depth),
- file_name=os.path.join(air_dir, "FinalFineNet"), file_format='AIR')
+ file_name=os.path.join(air_dir, "FinalFineNet"), file_format='MINDIR')
diff --git a/official/cv/east/export.py b/official/cv/east/export.py
index aeaeecd41..eff2a0c5f 100644
--- a/official/cv/east/export.py
+++ b/official/cv/east/export.py
@@ -57,7 +57,7 @@ parser.add_argument(
"AIR",
"ONNX",
"MINDIR"],
- default="AIR",
+ default='MINDIR',
help="file format")
args_opt = parser.parse_args()
diff --git a/official/cv/east/infer/README_CN.md b/official/cv/east/infer/README_CN.md
index 3995bab91..28acf9252 100644
--- a/official/cv/east/infer/README_CN.md
+++ b/official/cv/east/infer/README_CN.md
@@ -95,7 +95,7 @@ python export.py \
--image_width=1280 \
--ckpt_file=xxx/east.ckpt \
--file_name=east \
---file_format=AIR \
+--file_format='MINDIR' \
--device_target=Ascend \
--device_id=0 \
```
diff --git a/official/cv/faster_rcnn/README.md b/official/cv/faster_rcnn/README.md
index 21f3209cc..b8401aba5 100644
--- a/official/cv/faster_rcnn/README.md
+++ b/official/cv/faster_rcnn/README.md
@@ -268,13 +268,13 @@ bash run_infer_310.sh [MINDIR_PATH] [DATA_PATH] [ANN_FILE] [IMAGE_WIDTH](optiona
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='faster_rcnn'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='faster_rcnn'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/faster_rcnn/README_CN.md b/official/cv/faster_rcnn/README_CN.md
index 911d85070..b234fb61e 100644
--- a/official/cv/faster_rcnn/README_CN.md
+++ b/official/cv/faster_rcnn/README_CN.md
@@ -268,13 +268,13 @@ bash run_infer_310.sh [MINDIR_PATH] [DATA_PATH] [ANN_FILE] [IMAGE_WIDTH](optiona
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='faster_rcnn'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='faster_rcnn'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/fastscnn/infer/README_CN.md b/official/cv/fastscnn/infer/README_CN.md
index e294cba02..b8535fb95 100644
--- a/official/cv/fastscnn/infer/README_CN.md
+++ b/official/cv/fastscnn/infer/README_CN.md
@@ -49,7 +49,7 @@ python export.py \
--image_width=768 \
--ckpt_file=xxx/fastscnn.ckpt \
--file_name=fastscnn \
---file_format=AIR \
+--file_format='MINDIR' \
--device_target=Ascend \
--device_id=0 \
diff --git a/official/cv/inceptionv3/README.md b/official/cv/inceptionv3/README.md
index e445e7022..492267366 100644
--- a/official/cv/inceptionv3/README.md
+++ b/official/cv/inceptionv3/README.md
@@ -179,13 +179,13 @@ For FP16 operators, if the input data type is FP32, the backend of MindSpore wil
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='inceptionv3'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='inceptionv3'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/inceptionv3/README_CN.md b/official/cv/inceptionv3/README_CN.md
index cb1910b17..cbfee9000 100644
--- a/official/cv/inceptionv3/README_CN.md
+++ b/official/cv/inceptionv3/README_CN.md
@@ -183,13 +183,13 @@ InceptionV3的总体网络架构如下：
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='inceptionv3'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='inceptionv3'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/lenet/README.md b/official/cv/lenet/README.md
index 0fec01ff4..db1b73047 100644
--- a/official/cv/lenet/README.md
+++ b/official/cv/lenet/README.md
@@ -135,13 +135,13 @@ bash run_standalone_eval_ascend.sh [DATA_PATH] [CKPT_NAME]
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='lenet'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='lenet'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/lenet/README_CN.md b/official/cv/lenet/README_CN.md
index 769d424d0..aacfccf33 100644
--- a/official/cv/lenet/README_CN.md
+++ b/official/cv/lenet/README_CN.md
@@ -135,13 +135,13 @@ bash run_standalone_eval_ascend.sh [DATA_PATH] [CKPT_NAME]
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='/cache/train/lenet'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='/cache/train/lenet'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/maskrcnn/README.md b/official/cv/maskrcnn/README.md
index bd70672b1..790cd660f 100644
--- a/official/cv/maskrcnn/README.md
+++ b/official/cv/maskrcnn/README.md
@@ -310,13 +310,13 @@ bash run_eval.sh [VALIDATION_JSON_FILE] [CHECKPOINT_PATH] [DATA_PATH]
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='maskrcnn'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='maskrcnn'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/maskrcnn/README_CN.md b/official/cv/maskrcnn/README_CN.md
index 2e37e9c03..1bbee945c 100644
--- a/official/cv/maskrcnn/README_CN.md
+++ b/official/cv/maskrcnn/README_CN.md
@@ -295,13 +295,13 @@ bash run_eval.sh [VALIDATION_JSON_FILE] [CHECKPOINT_PATH] [DATA_PATH]
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='maskrcnn'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='maskrcnn'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/maskrcnn_mobilenetv1/README.md b/official/cv/maskrcnn_mobilenetv1/README.md
index 3d8b11269..166e8c963 100644
--- a/official/cv/maskrcnn_mobilenetv1/README.md
+++ b/official/cv/maskrcnn_mobilenetv1/README.md
@@ -284,13 +284,13 @@ pip install mmcv=0.2.14
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='maskrcnn_mobilenetv1'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='maskrcnn_mobilenetv1'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/mobilenetv2/README.md b/official/cv/mobilenetv2/README.md
index e7b2b046a..47df32929 100644
--- a/official/cv/mobilenetv2/README.md
+++ b/official/cv/mobilenetv2/README.md
@@ -170,13 +170,13 @@ For FP16 operators, if the input data type is FP32, the backend of MindSpore wil
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='mobilenetv2'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='mobilenetv2'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/mobilenetv2/README_CN.md b/official/cv/mobilenetv2/README_CN.md
index 88caa2261..52285ae0f 100644
--- a/official/cv/mobilenetv2/README_CN.md
+++ b/official/cv/mobilenetv2/README_CN.md
@@ -166,13 +166,13 @@ MobileNetV2总体网络架构如下：
# (1) 执行 a 或者 b.
# a. 在 base_config.yaml 文件中设置 "enable_modelarts=True"
# 在 base_config.yaml 文件中设置 "file_name='mobilenetv2'"
- # 在 base_config.yaml 文件中设置 "file_format='AIR'"
+ # 在 base_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 base_config.yaml 文件中设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在 base_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 base_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name='mobilenetv2'"
- # 在网页上设置 "file_format='AIR'"
+ # 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url='/The path of checkpoint in S3/'"
# 在网页上设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在网页上设置 其他参数
diff --git a/official/cv/nasnet/modelarts/train_start.py b/official/cv/nasnet/modelarts/train_start.py
index e0eddf012..0aaef1992 100755
--- a/official/cv/nasnet/modelarts/train_start.py
+++ b/official/cv/nasnet/modelarts/train_start.py
@@ -64,7 +64,7 @@ def export_models(checkpoint_path):
input_data = Tensor(np.zeros([1, 3, 224, 224]), mstype.float32)
if args_opt.export_mindir_model:
- export(net, input_data, file_name=output_file, file_format="MINDIR")
+ export(net, input_data, file_name=output_file, file_format="AIR")
if args_opt.export_air_model and context.get_context("device_target") == "Ascend":
export(net, input_data, file_name=output_file, file_format="AIR")
if args_opt.export_onnx_model:
diff --git a/official/cv/resnet/README.md b/official/cv/resnet/README.md
index 0a6627809..000e75673 100644
--- a/official/cv/resnet/README.md
+++ b/official/cv/resnet/README.md
@@ -719,13 +719,13 @@ Export on ModelArts (If you want to run in modelarts, please check the official
# Set "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on default_config.yaml file.
# Set "checkpoint_url='s3://dir_to_trained_ckpt/'" on default_config.yaml file.
# Set "file_name='./resnet'" on default_config.yaml file.
-# Set "file_format='AIR'" on default_config.yaml file.
+# Set "file_format='MINDIR'" on default_config.yaml file.
# Set other parameters on default_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add "checkpoint_url='s3://dir_to_trained_ckpt/'" on the website UI interface.
# Add "file_name='./resnet'" on the website UI interface.
-# Add "file_format='AIR'" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add other parameters on the website UI interface.
# (4) Set the code directory to "/path/resnet" on the website UI interface.
# (5) Set the startup file to "export.py" on the website UI interface.
diff --git a/official/cv/resnet/README_CN.md b/official/cv/resnet/README_CN.md
index 3df9996ec..5fa688b2c 100644
--- a/official/cv/resnet/README_CN.md
+++ b/official/cv/resnet/README_CN.md
@@ -680,12 +680,12 @@ ModelArts导出mindir
# 设置 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt" 在 yaml 文件。
# 设置 "checkpoint_url=/The path of checkpoint in S3/" 在 yaml 文件。
# 设置 "file_name='./resnet'"参数在yaml文件。
-# 设置 "file_format='AIR'" 参数在yaml文件。
+# 设置 "file_format='MINDIR'" 参数在yaml文件。
# b. 增加 "enable_modelarts=True" 参数在modearts的界面上。
# 增加 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" 参数在modearts的界面上。
# 增加 "checkpoint_url=/The path of checkpoint in S3/" 参数在modearts的界面上。
# 设置 "file_name='./resnet'"参数在modearts的界面上。
-# 设置 "file_format='AIR'" 参数在modearts的界面上。
+# 设置 "file_format='MINDIR'" 参数在modearts的界面上。
# (4) 在modelarts的界面上设置代码的路径 "/path/resnet"。
# (5) 在modelarts的界面上设置模型的启动文件 "export.py" 。
# 模型的输出路径"Output file path" 和模型的日志路径 "Job log path" 。
diff --git a/official/cv/resnet_thor/README_CN.md b/official/cv/resnet_thor/README_CN.md
index 30972e4c8..5bfb88e09 100644
--- a/official/cv/resnet_thor/README_CN.md
+++ b/official/cv/resnet_thor/README_CN.md
@@ -120,7 +120,7 @@ bash run_eval_gpu.sh [DATASET_PATH] [CHECKPOINT_PATH]
│ └── dataset.py # 数据预处理
├── eval.py # 推理脚本
├── train.py # 训练脚本
- ├── export.py # 将checkpoint文件导出为AIR文件
+ ├── export.py # 将checkpoint文件导出为MINDIR,AIR文件
└── mindspore_hub_conf.py # MinSpore Hub仓库的配置文件
```
diff --git a/official/cv/shufflenetv2/modelarts/train_start.py b/official/cv/shufflenetv2/modelarts/train_start.py
index 5e036baef..592709420 100755
--- a/official/cv/shufflenetv2/modelarts/train_start.py
+++ b/official/cv/shufflenetv2/modelarts/train_start.py
@@ -59,7 +59,7 @@ def export_models(checkpoint_path):
input_data = Tensor(np.zeros([1, 3, 224, 224]), mstype.float32)
if args_opt.export_mindir_model:
- export(network, input_data, file_name=output_file, file_format="MINDIR")
+ export(network, input_data, file_name=output_file, file_format="AIR")
if args_opt.export_air_model and context.get_context("device_target") == "Ascend":
export(network, input_data, file_name=output_file, file_format="AIR")
if args_opt.export_onnx_model:
diff --git a/official/cv/vgg16/README.md b/official/cv/vgg16/README.md
index a2431e540..93153c227 100644
--- a/official/cv/vgg16/README.md
+++ b/official/cv/vgg16/README.md
@@ -250,13 +250,13 @@ python eval.py --config_path=[YAML_CONFIG_PATH] --device_target="GPU" --dataset=
# (2) Perform a or b.
# a. Set "enable_modelarts=True" on imagenet2012_config.yaml file.
# Set "file_name='vgg16'" on imagenet2012_config.yaml file.
-# Set "file_format='AIR'" on imagenet2012_config.yaml file.
+# Set "file_format='MINDIR'" on imagenet2012_config.yaml file.
# Set "checkpoint_url='s3://dir_to_your_trained_model/'" on imagenet2012_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on imagenet2012_config.yaml file.
# Set other parameters on imagenet2012_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name=vgg16" on the website UI interface.
-# Add "file_format=AIR" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url=s3://dir_to_your_trained_model/" on the website UI interface.
# Add "ckpt_file=/cache/checkpoint_path/model.ckpt" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/official/cv/vgg16/README_CN.md b/official/cv/vgg16/README_CN.md
index 46b4e6f51..82602cc9b 100644
--- a/official/cv/vgg16/README_CN.md
+++ b/official/cv/vgg16/README_CN.md
@@ -251,13 +251,13 @@ python eval.py --config_path=[YAML_CONFIG_PATH] --device_target="GPU" --dataset=
# (2) 执行a或者b
# a. 在 imagenet2012_config.yaml 文件中设置 "enable_modelarts=True"
# 在 imagenet2012_config.yaml 文件中设置 "file_name='vgg16'"
-# 在 imagenet2012_config.yaml 文件中设置 "file_format='AIR'"
+# 在 imagenet2012_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 imagenet2012_config.yaml 文件中设置 "checkpoint_url='s3://dir_to_your_trained_model/'"
# 在 imagenet2012_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 imagenet2012_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name=vgg16"
-# 在网页上设置 "file_format=AIR"
+# 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url=s3://dir_to_your_trained_model/"
# 在网页上设置 "ckpt_file=/cache/checkpoint_path/model.ckpt"
# 在网页上设置 其他参数
diff --git a/official/cv/yolov4/README_CN.md b/official/cv/yolov4/README_CN.md
index 9baa09db3..9a3a6e2d9 100644
--- a/official/cv/yolov4/README_CN.md
+++ b/official/cv/yolov4/README_CN.md
@@ -258,7 +258,7 @@ YOLOv4需要CSPDarknet53主干来提取图像特征进行检测。 您可以从[
├─config.py # 参数配置
├─cspdarknet53.py # 网络主干
├─distributed_sampler.py # 数据集迭代器
- ├─export.py # 将MindSpore模型转换为AIR模型
+ ├─export.py # 将MindSpore模型转换为MINDIR,AIR模型
├─initializer.py # 参数初始化器
├─logger.py # 日志函数
├─loss.py # 损失函数
diff --git a/official/gnn/bgcf/README.md b/official/gnn/bgcf/README.md
index 991c10c42..da7a76500 100644
--- a/official/gnn/bgcf/README.md
+++ b/official/gnn/bgcf/README.md
@@ -185,7 +185,7 @@ After installing MindSpore via the official website and Dataset is correctly gen
# Add "ckpt_file=/cache/checkpoint_path/model.ckpt" on the website UI interface.
# Add "checkpoint_url=s3://dir_to_your_trained_ckpt/" on the website UI interface.
# Add "file_name=bgcf" on the website UI interface.
- # Add "file_format=AIR" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# (options)Add "device_target=GPU" on the website UI interface if run on GPU.
# Add other parameters on the website UI interface.
# (2) Upload or copy your trained model to S3 bucket.
diff --git a/official/gnn/bgcf/README_CN.md b/official/gnn/bgcf/README_CN.md
index 6904dddb4..0514e1663 100644
--- a/official/gnn/bgcf/README_CN.md
+++ b/official/gnn/bgcf/README_CN.md
@@ -196,7 +196,7 @@ BGCF包含两个主要模块。首先是抽样，它生成基于节点复制的
# 在网页上设置 "ckpt_file=/cache/checkpoint_path/model.ckpt"
# 在网页上设置 "checkpoint_url=s3://dir_to_your_trained_ckpt/"
# 在网页上设置 "file_name=bgcf"
- # 在网页上设置 "file_format=AIR"
+ # 在网页上设置 "file_format='MINDIR'"
# (可选)Add "device_target=GPU"
# 在网页上设置 其他参数
# (2) 上传你的预训练模型到 S3 桶上
diff --git a/official/nlp/emotect/export.py b/official/nlp/emotect/export.py
index 2598a83d6..335e21155 100644
--- a/official/nlp/emotect/export.py
+++ b/official/nlp/emotect/export.py
@@ -28,7 +28,7 @@ parser.add_argument("--number_labels", type=int, default=3, help="batch size")
parser.add_argument("--ckpt_file", type=str, required=True, help="Bert ckpt file.")
parser.add_argument("--file_name", type=str, default="emotect", help="bert output air name.")
parser.add_argument("--file_format", type=str, choices=["AIR", "ONNX", "MINDIR"],
- default="AIR", help="file format")
+ default='MINDIR', help="file format")
parser.add_argument("--device_target", type=str, default="Ascend",
choices=["Ascend", "GPU", "CPU"], help="device target (default: Ascend)")
args = parser.parse_args()
diff --git a/official/nlp/ernie/export.py b/official/nlp/ernie/export.py
index 2b1ba81f0..e56a863eb 100644
--- a/official/nlp/ernie/export.py
+++ b/official/nlp/ernie/export.py
@@ -31,7 +31,7 @@ parser.add_argument("--number_labels", type=int, default=3, help="number of labe
parser.add_argument("--ckpt_file", type=str, required=True, help="Ernie ckpt file.")
parser.add_argument("--file_name", type=str, default="ernie_finetune", help="Ernie output air name.")
parser.add_argument("--file_format", type=str, choices=["AIR", "ONNX", "MINDIR"],
- default="AIR", help="file format")
+ default='MINDIR', help="file format")
parser.add_argument("--device_target", type=str, default="Ascend",
choices=["Ascend", "GPU", "CPU"], help="device target (default: Ascend)")
args = parser.parse_args()
diff --git a/official/nlp/mass/README.md b/official/nlp/mass/README.md
index d421207e6..25aaf1120 100644
--- a/official/nlp/mass/README.md
+++ b/official/nlp/mass/README.md
@@ -603,13 +603,13 @@ Export on ModelArts (If you want to run in modelarts, please check the official
# Set "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on default_config.yaml file.
# Set "checkpoint_url='s3://dir_to_trained_ckpt/'" on default_config.yaml file.
# Set "file_name='./mass'" on default_config.yaml file.
-# Set "file_format='AIR'" on default_config.yaml file.
+# Set "file_format='MINDIR'" on default_config.yaml file.
# Set other parameters on default_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add "checkpoint_url='s3://dir_to_trained_ckpt/'" on the website UI interface.
# Add "file_name='./mass'" on the website UI interface.
-# Add "file_format='AIR'" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add other parameters on the website UI interface.
# (2) Set the code directory to "/path/mass" on the website UI interface.
# (3) Set the startup file to "export.py" on the website UI interface.
diff --git a/official/nlp/mass/README_CN.md b/official/nlp/mass/README_CN.md
index fc8f203e7..673e20e91 100644
--- a/official/nlp/mass/README_CN.md
+++ b/official/nlp/mass/README_CN.md
@@ -609,12 +609,12 @@ ModelArts导出mindir
# 设置 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt" 在 yaml 文件。
# 设置 "checkpoint_url=/The path of checkpoint in S3/" 在 yaml 文件。
# 设置 "file_name='./mass'"参数在yaml文件。
-# 设置 "file_format='AIR'" 参数在yaml文件。
+# 设置 "file_format='MINDIR'" 参数在yaml文件。
# b. 增加 "enable_modelarts=True" 参数在modearts的界面上。
# 增加 "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" 参数在modearts的界面上。
# 增加 "checkpoint_url=/The path of checkpoint in S3/" 参数在modearts的界面上。
# 设置 "file_name='./mass'"参数在modearts的界面上。
-# 设置 "file_format='AIR'" 参数在modearts的界面上。
+# 设置 "file_format='MINDIR'" 参数在modearts的界面上。
# (3) 在modelarts的界面上设置代码的路径 "/path/mass"。
# (4) 在modelarts的界面上设置模型的启动文件 "export.py" 。
# 模型的输出路径"Output file path" 和模型的日志路径 "Job log path" 。
diff --git a/research/audio/fcn-4/README.md b/research/audio/fcn-4/README.md
index 34e07d0c6..10b81360b 100644
--- a/research/audio/fcn-4/README.md
+++ b/research/audio/fcn-4/README.md
@@ -158,13 +158,13 @@ SLOG_PRINT_TO_STDOUT=1 python eval.py --device_id 0
# (1) Perform a or b.
# a. Set "enable_modelarts=True" on base_config.yaml file.
# Set "file_name='fcn-4'" on base_config.yaml file.
- # Set "file_format='AIR'" on base_config.yaml file.
+ # Set "file_format='MINDIR'" on base_config.yaml file.
# Set "checkpoint_url='/The path of checkpoint in S3/'" on beta_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on base_config.yaml file.
# Set other parameters on base_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name='fcn-4'" on the website UI interface.
- # Add "file_format='AIR'" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url='/The path of checkpoint in S3/'" on the website UI interface.
# Add "ckpt_file='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/research/cv/CycleGAN/src/utils/args.py b/research/cv/CycleGAN/src/utils/args.py
index 8bb0d59f0..0fad81a8f 100644
--- a/research/cv/CycleGAN/src/utils/args.py
+++ b/research/cv/CycleGAN/src/utils/args.py
@@ -112,7 +112,7 @@ parser.add_argument("--export_batch_size", type=int, default=1, \
parser.add_argument("--export_file_name", type=str, default="CycleGAN", \
help="output file name.")
parser.add_argument("--export_file_format", type=str, choices=["AIR", "ONNX", "MINDIR"], \
- default="AIR", help="file format")
+ default='MINDIR', help="file format")
args = parser.parse_args()
diff --git a/research/cv/FaceDetection/README.md b/research/cv/FaceDetection/README.md
index a53b1a3c4..a225a2802 100644
--- a/research/cv/FaceDetection/README.md
+++ b/research/cv/FaceDetection/README.md
@@ -285,14 +285,14 @@ The entire code structure is as following:
# Set "checkpoint_url='s3://dir_to_your_pretrain/'" on default_config.yaml file.
# Set "pretrained='/cache/checkpoint_path/model.ckpt'" on default_config.yaml file.
# Set "batch_size=1" on default_config.yaml file.
- # Set "file_format='AIR'" on default_config.yaml file.
+ # Set "file_format='MINDIR'" on default_config.yaml file.
# Set "file_name='FaceDetection'" on default_config.yaml file.
# Set other parameters on default_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "checkpoint_url=s3://dir_to_your_pretrain/" on the website UI interface.
# Add "pretrained=/cache/checkpoint_path/model.ckpt" on the website UI interface.
# Add "batch_size=1" on the website UI interface.
- # Add "file_format=AIR" on the website UI interface.
+ # Add "file_format='MINDIR'" on the website UI interface.
# Add "file_name=FaceDetection" on the website UI interface.
# Add other parameters on the website UI interface.
# (3) Upload or copy your trained model to S3 bucket.
diff --git a/research/cv/IRN/export.py b/research/cv/IRN/export.py
index c2d59ad0d..b496f3b8c 100644
--- a/research/cv/IRN/export.py
+++ b/research/cv/IRN/export.py
@@ -45,7 +45,7 @@ parser.add_argument('--file_name', type=str,
default='wrn-autoaugment', help='Output file name.',)
parser.add_argument(
'--file_format', type=str, choices=['AIR', 'ONNX', 'MINDIR'],
- default='AIR', help='Export format.',
+ default='MINDIR', help='Export format.',
)
parser.add_argument(
'--device_target', type=str, choices=['Ascend', 'GPU', 'CPU'],
diff --git a/research/cv/SinGAN/train_modelarts.py b/research/cv/SinGAN/train_modelarts.py
index 0c753e434..ea9dd1024 100644
--- a/research/cv/SinGAN/train_modelarts.py
+++ b/research/cv/SinGAN/train_modelarts.py
@@ -114,7 +114,7 @@ def export_AIR(opt, reals):
G_curr.set_train(False)
x = Tensor(functions.generate_noise([opt.nc_z, opt.nzx, opt.nzy]))
y = Tensor(functions.generate_noise([opt.nc_z, opt.nzx, opt.nzy]))
- export(G_curr, x, y, file_name='%s/SinGAN' % (opt.out_mindir), file_format="MINDIR")
+ export(G_curr, x, y, file_name='%s/SinGAN' % (opt.out_mindir), file_format="AIR")
scale_num += 1
print("SinGAN exported")
diff --git a/research/cv/VehicleNet/export.py b/research/cv/VehicleNet/export.py
index caefa0723..e487c1312 100644
--- a/research/cv/VehicleNet/export.py
+++ b/research/cv/VehicleNet/export.py
@@ -30,7 +30,7 @@ if __name__ == '__main__':
parser.add_argument("--ckpt_url", type=str, required=True, help="Checkpoint file path.")
parser.add_argument("--file_name", type=str, default="vehiclenet", help="output file name.")
parser.add_argument('--file_format', type=str, choices=["AIR", "ONNX", "MINDIR"],
- default='AIR', help='file format')
+ default='MINDIR', help='file format')
args = parser.parse_args()
context.set_context(mode=context.GRAPH_MODE, device_target=args.device_target)
diff --git a/research/cv/autoaugment/export.py b/research/cv/autoaugment/export.py
index 074cb6846..56b789cc7 100644
--- a/research/cv/autoaugment/export.py
+++ b/research/cv/autoaugment/export.py
@@ -44,7 +44,7 @@ parser.add_argument(
)
parser.add_argument(
'--file_format', type=str, choices=['AIR', 'ONNX', 'MINDIR'],
- default='AIR', help='Export format.',
+ default='MINDIR', help='Export format.',
)
parser.add_argument(
'--device_target', type=str, choices=['Ascend', 'GPU', 'CPU'],
diff --git a/research/cv/centernet_det/default_config.yaml b/research/cv/centernet_det/default_config.yaml
index bd125cc16..184d0b98b 100644
--- a/research/cv/centernet_det/default_config.yaml
+++ b/research/cv/centernet_det/default_config.yaml
@@ -235,7 +235,7 @@ eval_config:
export_config:
input_res: dataset_config.input_res
ckpt_file: "./ckpt_file.ckpt"
- export_format: "AIR"
+ export_format: "MINDIR"
export_name: "CenterNet_Hourglass"
---
diff --git a/research/cv/r2plus1d/infer/README_CN.md b/research/cv/r2plus1d/infer/README_CN.md
index b8046557c..41e90c272 100644
--- a/research/cv/r2plus1d/infer/README_CN.md
+++ b/research/cv/r2plus1d/infer/README_CN.md
@@ -92,7 +92,7 @@ python export.py \
--image_width=112 \
--ckpt_file=xxx/r2plus1d_best_map.ckpt \
--file_name=r2plus1d \
---file_format=AIR \
+--file_format='MINDIR' \
--device_target=Ascend
```
diff --git a/research/cv/res2net/README.md b/research/cv/res2net/README.md
index 199f6fa24..48d7e1033 100644
--- a/research/cv/res2net/README.md
+++ b/research/cv/res2net/README.md
@@ -489,13 +489,13 @@ Export on ModelArts (If you want to run in modelarts, please check the official
# Set "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on default_config.yaml file.
# Set "checkpoint_url='s3://dir_to_trained_ckpt/'" on default_config.yaml file.
# Set "file_name='./res2net'" on default_config.yaml file.
-# Set "file_format='AIR'" on default_config.yaml file.
+# Set "file_format='MINDIR'" on default_config.yaml file.
# Set other parameters on default_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "checkpoint_file_path='/cache/checkpoint_path/model.ckpt'" on the website UI interface.
# Add "checkpoint_url='s3://dir_to_trained_ckpt/'" on the website UI interface.
# Add "file_name='./res2net'" on the website UI interface.
-# Add "file_format='AIR'" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add other parameters on the website UI interface.
# (2) Set the config_path="/path/yaml file" on the website UI interface.
# (3) Set the code directory to "/path/res2net" on the website UI interface.
diff --git a/research/cv/squeezenet/export.py b/research/cv/squeezenet/export.py
index b3d83d730..f93d07118 100644
--- a/research/cv/squeezenet/export.py
+++ b/research/cv/squeezenet/export.py
@@ -51,4 +51,4 @@ if __name__ == '__main__':
input_arr = Tensor(np.zeros([1, 3, 227, 227], np.float32))
export(net, input_arr, file_name=onnx_filename, file_format="ONNX")
- export(net, input_arr, file_name=air_filename, file_format="AIR")
+ export(net, input_arr, file_name=air_filename, file_format="MINDIR")
diff --git a/research/cv/ssd_mobilenetV2/modelart/start.py b/research/cv/ssd_mobilenetV2/modelart/start.py
index f5c122021..f1949be25 100644
--- a/research/cv/ssd_mobilenetV2/modelart/start.py
+++ b/research/cv/ssd_mobilenetV2/modelart/start.py
@@ -199,7 +199,7 @@ def get_args():
"AIR",
"ONNX",
"MINDIR"],
- default='AIR',
+ default='MINDIR',
help='file format')
args_opt = parser.parse_args()
diff --git a/research/cv/ssd_mobilenetV2_FPNlite/config/ssdlite_mobilenetv2-fpn.yaml b/research/cv/ssd_mobilenetV2_FPNlite/config/ssdlite_mobilenetv2-fpn.yaml
index e8b0514a5..85e0fc90f 100644
--- a/research/cv/ssd_mobilenetV2_FPNlite/config/ssdlite_mobilenetv2-fpn.yaml
+++ b/research/cv/ssd_mobilenetV2_FPNlite/config/ssdlite_mobilenetv2-fpn.yaml
@@ -137,5 +137,5 @@ exp_device_id: "Device id"
exp_batch_size: "Export batch size"
exp_ckpt_file: "Checkpoint file path."
exp_file_name: "output file name."
-exp_file_format: "file format. choices - 'AIR', 'ONNX', 'MINDIR', default - 'AIR'"
-exp_device_target: "device target. choices - 'Ascend', default = 'Ascend'"
\ No newline at end of file
+exp_file_format: "file format. choices - 'AIR', 'ONNX', 'MINDIR', default - 'MINDIR'"
+exp_device_target: "device target. choices - 'Ascend', default = 'Ascend'"
diff --git a/research/cv/vgg19/README.md b/research/cv/vgg19/README.md
index b48fc9c79..26a375cf3 100644
--- a/research/cv/vgg19/README.md
+++ b/research/cv/vgg19/README.md
@@ -229,13 +229,13 @@ python eval.py --config_path=[YAML_CONFIG_PATH] --device_target="GPU" --dataset=
# (2) Perform a or b.
# a. Set "enable_modelarts=True" on imagenet2012_config.yaml file.
# Set "file_name='vgg19'" on imagenet2012_config.yaml file.
-# Set "file_format='AIR'" on imagenet2012_config.yaml file.
+# Set "file_format='MINDIR'" on imagenet2012_config.yaml file.
# Set "checkpoint_url='s3://dir_to_your_trained_model/'" on imagenet2012_config.yaml file.
# Set "ckpt_file='/cache/checkpoint_path/model.ckpt'" on imagenet2012_config.yaml file.
# Set other parameters on imagenet2012_config.yaml file you need.
# b. Add "enable_modelarts=True" on the website UI interface.
# Add "file_name=vgg19" on the website UI interface.
-# Add "file_format=AIR" on the website UI interface.
+# Add "file_format='MINDIR'" on the website UI interface.
# Add "checkpoint_url=s3://dir_to_your_trained_model/" on the website UI interface.
# Add "ckpt_file=/cache/checkpoint_path/model.ckpt" on the website UI interface.
# Add other parameters on the website UI interface.
diff --git a/research/cv/vgg19/README_CN.md b/research/cv/vgg19/README_CN.md
index 9c99d010a..6eed2a415 100644
--- a/research/cv/vgg19/README_CN.md
+++ b/research/cv/vgg19/README_CN.md
@@ -246,13 +246,13 @@ python eval.py --config_path=[YAML_CONFIG_PATH] --device_target="GPU" --dataset=
# (2) 执行a或者b
# a. 在 imagenet2012_config.yaml 文件中设置 "enable_modelarts=True"
# 在 imagenet2012_config.yaml 文件中设置 "file_name='vgg19'"
-# 在 imagenet2012_config.yaml 文件中设置 "file_format='AIR'"
+# 在 imagenet2012_config.yaml 文件中设置 "file_format='MINDIR'"
# 在 imagenet2012_config.yaml 文件中设置 "checkpoint_url='s3://dir_to_your_trained_model/'"
# 在 imagenet2012_config.yaml 文件中设置 "ckpt_file='/cache/checkpoint_path/model.ckpt'"
# 在 imagenet2012_config.yaml 文件中设置 其他参数
# b. 在网页上设置 "enable_modelarts=True"
# 在网页上设置 "file_name=vgg19"
-# 在网页上设置 "file_format=AIR"
+# 在网页上设置 "file_format='MINDIR'"
# 在网页上设置 "checkpoint_url=s3://dir_to_your_trained_model/"
# 在网页上设置 "ckpt_file=/cache/checkpoint_path/model.ckpt"
# 在网页上设置 其他参数
diff --git a/research/cv/wgan/src/args.py b/research/cv/wgan/src/args.py
index cb702576f..f7bce7b35 100644
--- a/research/cv/wgan/src/args.py
+++ b/research/cv/wgan/src/args.py
@@ -56,7 +56,7 @@ def get_args(phase):
parser.add_argument('--ckpt_file', type=str, required=True, help="Checkpoint file path.")
parser.add_argument('--file_name', type=str, default="WGAN", help="output file name prefix.")
parser.add_argument('--file_format', type=str, choices=["AIR", "ONNX", "MINDIR"], \
- default='AIR', help='file format')
+ default='MINDIR', help='file format')
parser.add_argument('--nimages', required=True, type=int, help="number of images to generate", default=1)
elif phase == 'eval':
diff --git a/research/nlp/gpt2/export.py b/research/nlp/gpt2/export.py
index c694df2a3..617d59b17 100644
--- a/research/nlp/gpt2/export.py
+++ b/research/nlp/gpt2/export.py
@@ -49,5 +49,5 @@ if __name__ == "__main__":
print("==================== Start exporting ==================")
print(" | Ckpt path: {}".format(Load_checkpoint_path))
print(" | Air path: {}".format(save_air_path))
- export(net, *input_data, file_name=os.path.join(save_air_path, 'gpt2'), file_format="AIR")
+ export(net, *input_data, file_name=os.path.join(save_air_path, 'gpt2'), file_format="MINDIR")
print("==================== Exporting finished ==================")
diff --git a/research/recommend/EDCN/README.md b/research/recommend/EDCN/README.md
index 4cb1f1934..58a7ac392 100644
--- a/research/recommend/EDCN/README.md
+++ b/research/recommend/EDCN/README.md
@@ -176,7 +176,7 @@ Parameters for both training and evaluation can be set in `default_config.yaml`
batch_size: 16000 # batch_size for exported model.
ckpt_file: '' # the path of the weight file to be exported relative to the file `export.py`, and the weight file must be included in the code directory.
file_name: "edcn" # output file name.
- file_format: "MINDIR" # output file format, you can choose from AIR or MINDIR, default is AIR"
+ file_format: "MINDIR" # output file format, you can choose from AIR or MINDIR, default is MINDIR"
```
## [Training Process](#contents)
@@ -261,12 +261,12 @@ Parameters for both training and evaluation can be set in `default_config.yaml`
# 1. Set "enable_modelarts: True"
# 2. Set "ckpt_file: ./{path}/*.ckpt"('ckpt_file' indicates the path of the weight file to be exported relative to the file `export.py`, and the weight file must be included in the code directory.)
3. Set "file_name: edcn"
- # 4. Set "file_format='AIR'"(you can choose from AIR or MINDIR)
+ # 4. Set "file_format='MINDIR'"(you can choose from AIR or MINDIR)
# b. adding on the website UI interface.
# 1. Add "enable_modelarts=True"
# 2. Add "ckpt_file=./{path}/*.ckpt"('ckpt_file' indicates the path of the weight file to be exported relative to the file `export.py`, and the weight file must be included in the code directory.)
# 3. Add "file_name=edcn"
- # 4. Add "file_format='AIR'"(you can choose from AIR or MINDIR)
+ # 4. Add "file_format='MINDIR'"(you can choose from AIR or MINDIR)
# (7) Check the "data storage location" on the website UI interface and set the "Dataset path" path (This step is useless, but necessary.).
# (8) Set the "Output file path" and "Job log path" to your path on the website UI interface.
# (9) Under the item "resource pool selection", select the specification of a single card.
diff --git a/research/recommend/autodis/README.md b/research/recommend/autodis/README.md
index d5eb29509..bf17069f5 100644
--- a/research/recommend/autodis/README.md
+++ b/research/recommend/autodis/README.md
@@ -201,7 +201,7 @@ Parameters for both training and evaluation can be set in `default_config.yaml`
batch_size: 16000 # batch_size for exported model.
ckpt_file: '' # the path of the weight file to be exported relative to the file `export.py`, and the weight file must be included in the code directory.
file_name: "autodis" # output file name.
- file_format: "MINDIR" # output file format, you can choose from AIR or MINDIR, default is AIR"
+ file_format: "MINDIR" # output file format, you can choose from AIR or MINDIR, default is MINDIR"
```
## [Training Process](#contents)
@@ -293,7 +293,7 @@ Parameters for both training and evaluation can be set in `default_config.yaml`
# 1. Add ”enable_modelarts=True“
# 2. Add “ckpt_file=./{path}/*.ckpt”('ckpt_file' indicates the path of the weight file to be exported relative to the file `export.py`, and the weight file must be included in the code directory.)
# 3. Add ”file_name=autodis“
- # 4. Add ”file_format=AIR“(you can choose from AIR or MINDIR)
+ # 4. Add ”file_format='MINDIR'“(you can choose from AIR or MINDIR)
# (7) Check the "data storage location" on the website UI interface and set the "Dataset path" path (This step is useless, but necessary.).
# (8) Set the "Output file path" and "Job log path" to your path on the website UI interface.
# (9) Under the item "resource pool selection", select the specification of a single card.
diff --git a/research/recommend/autodis/default_config.yaml b/research/recommend/autodis/default_config.yaml
index 215e9302c..c81d06c61 100644
--- a/research/recommend/autodis/default_config.yaml
+++ b/research/recommend/autodis/default_config.yaml
@@ -99,7 +99,7 @@ test_data_dir: "Test dataset dir, default is None"
checkpoint_path: " Relative path of '*.ckpt' to be evaluated relative to the eval.py"
ckpt_file: "Checkpoint file path."
file_name: "Output file name."
-file_format: "Output file format, you can choose from AIR or MINDIR, default is AIR"
+file_format: "Output file format, you can choose from AIR or MINDIR, default is MINDIR"
---
#Choices
device_target: ["Ascend", "GPU"]
--
GitLab