From 2c19c9b8c9c5d51ce2f04e9f54c4eed8c79b034d Mon Sep 17 00:00:00 2001 From: liangyongxiong Date: Wed, 26 Aug 2020 12:37:26 +0800 Subject: [PATCH] optimize network templates --- mindinsight/wizard/README_CN.md | 8 ++++---- mindinsight/wizard/base/source_file.py | 1 + .../network/alexnet/scripts/run_distribute_train.sh-tpl | 1 - .../alexnet/scripts/run_distribute_train_gpu.sh-tpl | 1 - .../templates/network/alexnet/scripts/run_eval.sh-tpl | 1 - .../templates/network/alexnet/scripts/run_eval_gpu.sh-tpl | 1 - .../network/alexnet/scripts/run_standalone_train.sh-tpl | 1 - .../alexnet/scripts/run_standalone_train_gpu.sh-tpl | 1 - .../conf/templates/network/alexnet/src/config.py-tpl | 2 +- .../network/lenet/scripts/run_distribute_train.sh-tpl | 1 - .../network/lenet/scripts/run_distribute_train_gpu.sh-tpl | 1 - .../conf/templates/network/lenet/scripts/run_eval.sh-tpl | 1 - .../templates/network/lenet/scripts/run_eval_gpu.sh-tpl | 1 - .../network/lenet/scripts/run_standalone_train.sh-tpl | 1 - .../network/lenet/scripts/run_standalone_train_gpu.sh-tpl | 1 - .../wizard/conf/templates/network/lenet/src/config.py-tpl | 2 +- .../network/resnet50/scripts/run_distribute_train.sh-tpl | 1 - .../resnet50/scripts/run_distribute_train_gpu.sh-tpl | 1 - .../templates/network/resnet50/scripts/run_eval.sh-tpl | 1 - .../network/resnet50/scripts/run_eval_gpu.sh-tpl | 1 - .../network/resnet50/scripts/run_standalone_train.sh-tpl | 1 - .../resnet50/scripts/run_standalone_train_gpu.sh-tpl | 1 - .../conf/templates/network/resnet50/src/config.py-tpl | 2 +- mindinsight/wizard/create_project.py | 1 + 24 files changed, 9 insertions(+), 25 deletions(-) diff --git a/mindinsight/wizard/README_CN.md b/mindinsight/wizard/README_CN.md index 4c153be..36ec86b 100644 --- a/mindinsight/wizard/README_CN.md +++ b/mindinsight/wizard/README_CN.md @@ -4,7 +4,7 @@ ## 介绍 -MindWizard是一款快速生成经典网络脚本的工具。工具根据用户选择，组合模型、超参、数据集等网络参数，自动生成目标网络脚本，生成的网络脚本可以在Ascend或GPU等环境上进行训练和推理。 +MindWizard是一款快速生成经典网络脚本的工具。工具根据用户选择，组合模型、超参、数据集等网络参数，自动生成目标网络脚本，生成的网络脚本可以在Ascend或GPU等环境上进行训练和评估。 ## 安装 @@ -33,7 +33,7 @@ optional arguments: 2. 请选择数据集（MNIST / Cifar10 / ImageNet / ...） -生成脚本后，用户可执行训练和推理，详细介绍可参考网络脚本工程中的README。 +生成脚本后，用户可执行训练和评估，详细介绍可参考网络脚本工程中的README。 ## 网络脚本工程结构 @@ -42,14 +42,14 @@ project |- script | |- run_standalone_train.sh # 单卡训练脚本 | |- run_distribute_train.sh # 多卡训练脚本 - | |- run_eval.sh # 推理脚本 + | |- run_eval.sh # 评估脚本 | |- ... |- src | |- config.py # 参数配置 | |- dataset.py # 数据集处理 | |- lenet.py/resent.py/... # 网络定义 | |- ... - |- eval.py # 网络推理 + |- eval.py # 网络评估 |- train.py # 网络训练 |- README.md ``` diff --git a/mindinsight/wizard/base/source_file.py b/mindinsight/wizard/base/source_file.py index edb014f..810c5dd 100644 --- a/mindinsight/wizard/base/source_file.py +++ b/mindinsight/wizard/base/source_file.py @@ -45,6 +45,7 @@ class SourceFile: fp.write(self.content) try: shutil.copymode(self.template_file_path, new_file_path) + os.chmod(new_file_path, stat.S_IRUSR | stat.S_IWUSR) self.set_writeable(new_file_path) if new_file_path.endswith('.sh'): self.set_executable(new_file_path) diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train.sh-tpl index b08fef2..8ddc5ac 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train.sh-tpl @@ -67,7 +67,6 @@ do rm -rf ./train_parallel$i mkdir ./train_parallel$i cp ../*.py ./train_parallel$i - cp *.sh ./train_parallel$i cp -r ../src ./train_parallel$i cd ./train_parallel$i || exit echo "start training for rank $RANK_ID, device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train_gpu.sh-tpl index 8829627..6f5f584 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_distribute_train_gpu.sh-tpl @@ -54,7 +54,6 @@ export RANK_SIZE=$DEVICE_NUM rm -rf ./train_parallel mkdir ./train_parallel cp ../*.py ./train_parallel -cp *.sh ./train_parallel cp -r ../src ./train_parallel cd ./train_parallel || exit echo "start training" diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval.sh-tpl index 7df933f..f0837b0 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval.sh-tpl @@ -56,7 +56,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval_gpu.sh-tpl index 9c0ebfc..1bc43ab 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_eval_gpu.sh-tpl @@ -57,7 +57,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train.sh-tpl index afe7af3..4e892da 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train.sh-tpl @@ -59,7 +59,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit echo "start training for device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train_gpu.sh-tpl index 37664f5..8989ec1 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/scripts/run_standalone_train_gpu.sh-tpl @@ -59,7 +59,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit echo "start training" diff --git a/mindinsight/wizard/conf/templates/network/alexnet/src/config.py-tpl b/mindinsight/wizard/conf/templates/network/alexnet/src/config.py-tpl index c4e3403..bfa8eb0 100644 --- a/mindinsight/wizard/conf/templates/network/alexnet/src/config.py-tpl +++ b/mindinsight/wizard/conf/templates/network/alexnet/src/config.py-tpl @@ -28,7 +28,7 @@ cfg = edict({ 'lr': 0.002, "momentum": 0.9, {% elif optimizer=='SGD' %} - 'lr': 0.1, + 'lr': 0.01, {% else %} 'lr': 0.001, {% endif %} diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train.sh-tpl index da292eb..e5af6d8 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train.sh-tpl @@ -68,7 +68,6 @@ do rm -rf ./train_parallel$i mkdir ./train_parallel$i cp ../*.py ./train_parallel$i - cp *.sh ./train_parallel$i cp -r ../src ./train_parallel$i cd ./train_parallel$i || exit echo "start training for rank $RANK_ID, device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train_gpu.sh-tpl index b88fcdc..443701f 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_distribute_train_gpu.sh-tpl @@ -53,7 +53,6 @@ export RANK_SIZE=$DEVICE_NUM rm -rf ./train_parallel mkdir ./train_parallel cp ../*.py ./train_parallel -cp *.sh ./train_parallel cp -r ../src ./train_parallel cd ./train_parallel || exit diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval.sh-tpl index a9ba602..604779e 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval.sh-tpl @@ -56,7 +56,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval_gpu.sh-tpl index 520de31..f6a6b85 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_eval_gpu.sh-tpl @@ -57,7 +57,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train.sh-tpl index 143a79f..a714d63 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train.sh-tpl @@ -60,7 +60,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit echo "start training for device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train_gpu.sh-tpl index 50f530f..39785b7 100755 --- a/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/scripts/run_standalone_train_gpu.sh-tpl @@ -61,7 +61,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit diff --git a/mindinsight/wizard/conf/templates/network/lenet/src/config.py-tpl b/mindinsight/wizard/conf/templates/network/lenet/src/config.py-tpl index 863e0c6..14594cb 100644 --- a/mindinsight/wizard/conf/templates/network/lenet/src/config.py-tpl +++ b/mindinsight/wizard/conf/templates/network/lenet/src/config.py-tpl @@ -23,7 +23,7 @@ cfg = edict({ 'lr': 0.01, "momentum": 0.9, {% elif optimizer=='SGD' %} - 'lr': 0.1, + 'lr': 0.01, {% else %} 'lr': 0.001, {% endif %} diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train.sh-tpl index b08fef2..8ddc5ac 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train.sh-tpl @@ -67,7 +67,6 @@ do rm -rf ./train_parallel$i mkdir ./train_parallel$i cp ../*.py ./train_parallel$i - cp *.sh ./train_parallel$i cp -r ../src ./train_parallel$i cd ./train_parallel$i || exit echo "start training for rank $RANK_ID, device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train_gpu.sh-tpl index cd346dc..b34b1d7 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_distribute_train_gpu.sh-tpl @@ -54,7 +54,6 @@ export RANK_SIZE=$DEVICE_NUM rm -rf ./train_parallel mkdir ./train_parallel cp ../*.py ./train_parallel -cp *.sh ./train_parallel cp -r ../src ./train_parallel cd ./train_parallel || exit diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval.sh-tpl index 7df933f..f0837b0 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval.sh-tpl @@ -56,7 +56,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval_gpu.sh-tpl index 9c0ebfc..1bc43ab 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_eval_gpu.sh-tpl @@ -57,7 +57,6 @@ then fi mkdir ./eval cp ../*.py ./eval -cp *.sh ./eval cp -r ../src ./eval cd ./eval || exit env > env.log diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train.sh-tpl index afe7af3..4e892da 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train.sh-tpl @@ -59,7 +59,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit echo "start training for device $DEVICE_ID" diff --git a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train_gpu.sh-tpl b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train_gpu.sh-tpl index 37664f5..8989ec1 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train_gpu.sh-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/scripts/run_standalone_train_gpu.sh-tpl @@ -59,7 +59,6 @@ then fi mkdir ./train cp ../*.py ./train -cp *.sh ./train cp -r ../src ./train cd ./train || exit echo "start training" diff --git a/mindinsight/wizard/conf/templates/network/resnet50/src/config.py-tpl b/mindinsight/wizard/conf/templates/network/resnet50/src/config.py-tpl index 04a00f7..ea14603 100644 --- a/mindinsight/wizard/conf/templates/network/resnet50/src/config.py-tpl +++ b/mindinsight/wizard/conf/templates/network/resnet50/src/config.py-tpl @@ -30,7 +30,7 @@ cfg = ed({ "momentum": 0.9, "lr": 0.01, {% elif optimizer=='SGD' %} - 'lr': 0.1, + 'lr': 0.01, {% else %} 'lr': 0.001, {% endif %} diff --git a/mindinsight/wizard/create_project.py b/mindinsight/wizard/create_project.py index 21c89ec..f44f850 100644 --- a/mindinsight/wizard/create_project.py +++ b/mindinsight/wizard/create_project.py @@ -91,6 +91,7 @@ class CreateProject(BaseCommand): if not choice: click.secho(textwrap.dedent("Network is required."), fg='red') + click.secho(textwrap.dedent("Your choice is %s." % network_type_choices[choice - 1]), fg='yellow') return network_type_choices[choice - 1] @staticmethod -- GitLab