diff --git a/mindinsight/wizard/README_CN.md b/mindinsight/wizard/README_CN.md index 4c153be7271eaa9b3bf1fabb63037baeaedf82d4..36ec86ba2750378a32f3dea211911b728842f2b6 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 edb014f656a4cd2cbd93ec6319a41f6da71dc209..810c5ddcbf249082bca63fd658dcad4061c1fd25 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 b08fef2690fa05de04bc2f22ed0f59cc902a7f17..8ddc5ac0231d0ed82ed210a3bacc460f5791fba2 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 88296279164558830f72780a8a635a671c51811e..6f5f5846751ade8d634e44ff82424289264e4eee 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 7df933f2af5ed9fe0e984d25dcdaba2573243039..f0837b06f4884187eefca45cff848fd26b168263 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 9c0ebfca88588cf5e1f34a4e9b579b90a8f02323..1bc43ab13314528137787aa7d3f201fa0c22298b 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 afe7af3287a44eed34c4c049e78739fdb44eb182..4e892dac0701ca9d358574b90b846e3e789a0207 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 37664f5e1c377cdb323cca482158db6463373c7e..8989ec1d401d376c1cadd58687a7713a425f7c19 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 c4e34036b30e6ca0beff9375e76248452a08b783..bfa8eb0eb872b642e0fb03a0458a941da8e8e9a8 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 da292eb4b08b665df4c3275860ecd34c82765383..e5af6d8faf5f8db38d3036d2e75e30e68b571e11 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 b88fcdc447d74c46f8beee19a9e330408936b5a2..443701f4157d5d12d85676a9edc4774980ab3ce1 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 a9ba602957ce3b6702db7a055e0a46590a8058b1..604779ebbe80c40b9a2450f58b1e28a08e09f5e0 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 520de31efa3a7a836a702e2fbf4a520003a0e666..f6a6b855c86176d242fe827327b97816aeb00982 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 143a79f9e5037f6c0965b680acb1e3a8d1cf5814..a714d6353cec91e50338a80a5a618d34083d3caa 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 50f530f4bc229e1e29ecc0161f3c6f3f5b800998..39785b782a53d2fbf3babbf600f14f5bbf43d8e7 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 863e0c631863bc262bebea7d23c27723cc20cad8..14594cb8e3fd70b51bc322449a64c4842140565f 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 b08fef2690fa05de04bc2f22ed0f59cc902a7f17..8ddc5ac0231d0ed82ed210a3bacc460f5791fba2 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 cd346dc843a339649cae97486b8d74fd55eb78c5..b34b1d725a2e24b0b571c58241be3187c97f6751 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 7df933f2af5ed9fe0e984d25dcdaba2573243039..f0837b06f4884187eefca45cff848fd26b168263 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 9c0ebfca88588cf5e1f34a4e9b579b90a8f02323..1bc43ab13314528137787aa7d3f201fa0c22298b 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 afe7af3287a44eed34c4c049e78739fdb44eb182..4e892dac0701ca9d358574b90b846e3e789a0207 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 37664f5e1c377cdb323cca482158db6463373c7e..8989ec1d401d376c1cadd58687a7713a425f7c19 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 04a00f75fc8f329353e88fd4b12f6650fa934a75..ea14603f6805658e28e60c5c1009371fdf642c13 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 21c89ecd1619fdeca5b43f5e539778108afc2c85..f44f850e9a26ad981a77b43602c4864c93dd6edc 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