diff --git a/mindinsight/wizard/README.md b/mindinsight/wizard/README.md index 6a3d1ff2..94bad8e9 100644 --- a/mindinsight/wizard/README.md +++ b/mindinsight/wizard/README.md @@ -27,12 +27,18 @@ Run the mindwizard command and answer the following questions as prompted： 1. Select a network（LeNet / AlexNet / ResNet50 / ...） - 1.1. Select a Loss Function（SoftmaxCrossEntropyExpand / SoftmaxCrossEntropyWithLogits / ...） + 1.1. Select a Loss Function（SoftmaxCrossEntropyWithLogits / ...） + + Default: SoftmaxCrossEntropyWithLogits 1.2. Select a Optimizer（Adam / Momentum / SGD ...） + + Default: Momentum 2. Select a Dataset（MNIST / Cifar10 / ImageNet / ...） +Default: MNIST or ImageNet + After the project is generated, user can perform training and evaluation. For details, see README in the network project. ## Network Project Structure @@ -66,18 +72,21 @@ $ mindwizard project 2: lenet 3: resnet50 : 2 +Your choice is lenet. >>> Please select a loss function: - 1: SoftmaxCrossEntropyExpand - 2: SoftmaxCrossEntropyWithLogits - [2]: 2 + 1: SoftmaxCrossEntropyWithLogits + [1]: 1 +Your choice is SoftmaxCrossEntropyWithLogits. >>> Please select an optimizer: 1: Adam 2: Momentum 3: SGD [2]: 2 +Your choice is Momentum. >>> Please select a dataset: 1: MNIST [1]: 1 +Your choice is MNIST. project is generated in $PWD/project diff --git a/mindinsight/wizard/README_CN.md b/mindinsight/wizard/README_CN.md index 36ec86ba..10dfd262 100644 --- a/mindinsight/wizard/README_CN.md +++ b/mindinsight/wizard/README_CN.md @@ -27,12 +27,18 @@ optional arguments: 1. 请选择网络（LeNet / AlexNet / ResNet50 / ...） - 1.1. 请选择损失函数（SoftmaxCrossEntropyExpand / SoftmaxCrossEntropyWithLogits / ...） - + 1.1. 请选择损失函数（SoftmaxCrossEntropyWithLogits / ...） + + 缺省值: SoftmaxCrossEntropyWithLogits + 1.2. 请选择优化器（Adam / Momentum / SGD ...） + + 缺省值: Momentum 2. 请选择数据集（MNIST / Cifar10 / ImageNet / ...） +缺省值: MNIST or ImageNet + 生成脚本后，用户可执行训练和评估，详细介绍可参考网络脚本工程中的README。 ## 网络脚本工程结构 @@ -66,18 +72,21 @@ $ mindwizard project 2: lenet 3: resnet50 : 2 +Your choice is lenet. >>> Please select a loss function: - 1: SoftmaxCrossEntropyExpand - 2: SoftmaxCrossEntropyWithLogits - [2]: 2 + 1: SoftmaxCrossEntropyWithLogits + [1]: 1 +Your choice is SoftmaxCrossEntropyWithLogits. >>> Please select an optimizer: 1: Adam 2: Momentum 3: SGD [2]: 2 +Your choice is Momentum. >>> Please select a dataset: 1: MNIST [1]: 1 +Your choice is MNIST. project is generated in $PWD/project diff --git a/mindinsight/wizard/network/alexnet.py b/mindinsight/wizard/network/alexnet.py index 5a9cbb39..5e96eb7f 100644 --- a/mindinsight/wizard/network/alexnet.py +++ b/mindinsight/wizard/network/alexnet.py @@ -14,5 +14,5 @@ class Network(GenericNetwork): """Network code generator.""" name = 'alexnet' supported_datasets = ['Cifar10', 'ImageNet'] - supported_loss_functions = ['SoftmaxCrossEntropyWithLogits', 'SoftmaxCrossEntropyExpand'] + supported_loss_functions = ['SoftmaxCrossEntropyWithLogits'] supported_optimizers = ['Momentum', 'Adam', 'SGD'] diff --git a/mindinsight/wizard/network/lenet.py b/mindinsight/wizard/network/lenet.py index 414aac61..08a24408 100644 --- a/mindinsight/wizard/network/lenet.py +++ b/mindinsight/wizard/network/lenet.py @@ -20,5 +20,5 @@ class Network(GenericNetwork): """Network code generator.""" name = 'lenet' supported_datasets = ['MNIST'] - supported_loss_functions = ['SoftmaxCrossEntropyWithLogits', 'SoftmaxCrossEntropyExpand'] + supported_loss_functions = ['SoftmaxCrossEntropyWithLogits'] supported_optimizers = ['Momentum', 'Adam', 'SGD'] diff --git a/mindinsight/wizard/network/resnet50.py b/mindinsight/wizard/network/resnet50.py index 41171841..a9972bb2 100644 --- a/mindinsight/wizard/network/resnet50.py +++ b/mindinsight/wizard/network/resnet50.py @@ -14,5 +14,5 @@ class Network(GenericNetwork): """Network code generator.""" name = 'resnet50' supported_datasets = ['Cifar10', 'ImageNet'] - supported_loss_functions = ['SoftmaxCrossEntropyWithLogits', 'SoftmaxCrossEntropyExpand'] + supported_loss_functions = ['SoftmaxCrossEntropyWithLogits'] supported_optimizers = ['Momentum', 'Adam', 'SGD'] diff --git a/tests/st/func/wizard/test_alexnet.py b/tests/st/func/wizard/test_alexnet.py index 93ca6103..49219864 100644 --- a/tests/st/func/wizard/test_alexnet.py +++ b/tests/st/func/wizard/test_alexnet.py @@ -18,6 +18,7 @@ Function: Test the various combinations based on AlexNet. """ import os +import shutil import pytest from mindinsight.wizard.base.utility import load_network_maker @@ -49,21 +50,6 @@ class TestAlexNet: 'optimizer': 'SGD', 'dataset': 'Cifar10'}, 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Momentum', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Adam', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'SGD', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' }, { 'config': {'loss': 'SoftmaxCrossEntropyWithLogits', 'optimizer': 'Momentum', @@ -79,21 +65,6 @@ class TestAlexNet: 'optimizer': 'SGD', 'dataset': 'ImageNet'}, 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Momentum', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Adam', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'SGD', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' }]) def test_combinations(self, params): """Do testing.""" @@ -105,33 +76,51 @@ class TestAlexNet: network_maker = load_network_maker(network_maker_name) network_maker.configure(config) - self.source_files = network_maker.generate(**config) + source_files = network_maker.generate(**config) + + self.output_dir = os.path.realpath('test_folder') + for source_file in source_files: + source_file.write(self.output_dir) - self.check_scripts() - self.check_src(dataset_loader_name, config) - self.check_train_eval_readme(config['dataset'], config['loss'], config['optimizer']) + try: + self.check_scripts() + self.check_src(dataset_loader_name, config) + self.check_train_eval_readme(config['dataset'], config['loss'], config['optimizer']) + finally: + shutil.rmtree(self.output_dir) def check_src(self, dataset_name, config): """Check src file.""" + unexpected_file_exists = False dataset_is_right = False config_dataset_is_right = False config_optimizer_is_right = False network_is_right = False generator_lr_is_right = False - for source_file in self.source_files: - if source_file.file_relative_path == 'src/dataset.py': - if dataset_name in source_file.content: - dataset_is_right = True - if source_file.file_relative_path == os.path.join('src', NETWORK_NAME.lower()+'.py'): - network_is_right = True - if source_file.file_relative_path == 'src/generator_lr.py': - generator_lr_is_right = True - if source_file.file_relative_path == 'src/config.py': - content = source_file.content - - config_dataset_is_right = self._check_config_dataset(config, content) - config_optimizer_is_right = self._check_config_optimizer(config, content) + sub_output_dir_list = os.walk(self.output_dir) + for sub_output_dir in sub_output_dir_list: + for sub_output_file in sub_output_dir[-1]: + content_dir = os.path.relpath( + os.path.join(sub_output_dir[0], sub_output_file), + self.output_dir) + + try: + with open(os.path.realpath(os.path.join(self.output_dir, content_dir))) as file: + content = file.read() + if content_dir == 'src/dataset.py' and dataset_name in content: + dataset_is_right = True + elif content_dir == os.path.join('src', NETWORK_NAME.lower() + '.py'): + network_is_right = True + elif content_dir == 'src/generator_lr.py': + generator_lr_is_right = True + elif content_dir == 'src/config.py': + config_dataset_is_right = self._check_config_dataset(config, content) + config_optimizer_is_right = self._check_config_optimizer(config, content) + except IOError: + unexpected_file_exists = True + + assert not unexpected_file_exists assert dataset_is_right assert config_dataset_is_right assert config_optimizer_is_right @@ -168,24 +157,33 @@ class TestAlexNet: def check_train_eval_readme(self, dataset_name, loss_name, optimizer_name): """Check train and eval.""" + unexpected_file_exists = False train_is_right = False eval_is_right = False readme_is_right = False - for source_file in self.source_files: - if source_file.file_relative_path == 'train.py': - content = source_file.content - if 'alexnet' in content and loss_name in content and optimizer_name in content: - train_is_right = True - - if source_file.file_relative_path == 'eval.py': - content = source_file.content - if 'alexnet' in content and loss_name in content: - eval_is_right = True - - if source_file.file_relative_path == 'README.md': - content = source_file.content - if 'AlexNet' in content and dataset_name in content: - readme_is_right = True + + sub_output_dir_list = os.walk(self.output_dir) + for sub_output_dir in sub_output_dir_list: + for sub_output_file in sub_output_dir[-1]: + content_dir = os.path.relpath( + os.path.join(sub_output_dir[0], sub_output_file), + self.output_dir) + + try: + with open(os.path.realpath(os.path.join(self.output_dir, content_dir))) as file: + content = file.read() + if content_dir == 'train.py' \ + and 'alexnet' in content \ + and loss_name in content and optimizer_name in content: + train_is_right = True + elif content_dir == 'eval.py' and 'alexnet' in content and loss_name in content: + eval_is_right = True + elif content_dir == 'README.md' and 'AlexNet' in content and dataset_name in content: + readme_is_right = True + except IOError: + unexpected_file_exists = True + + assert not unexpected_file_exists assert train_is_right assert eval_is_right assert readme_is_right @@ -200,19 +198,25 @@ class TestAlexNet: exist_run_standalone_train = False exist_run_standalone_train_gpu = False - for source_file in self.source_files: - if source_file.file_relative_path == 'scripts/run_distribute_train.sh': - exist_run_distribute_train = True - if source_file.file_relative_path == 'scripts/run_distribute_train_gpu.sh': - exist_run_distribute_train_gpu = True - if source_file.file_relative_path == 'scripts/run_eval.sh': - exist_run_eval = True - if source_file.file_relative_path == 'scripts/run_eval_gpu.sh': - exist_run_eval_gpu = True - if source_file.file_relative_path == 'scripts/run_standalone_train.sh': - exist_run_standalone_train = True - if source_file.file_relative_path == 'scripts/run_standalone_train_gpu.sh': - exist_run_standalone_train_gpu = True + sub_output_dir_list = os.walk(self.output_dir) + for sub_output_dir in sub_output_dir_list: + for sub_output_file in sub_output_dir[-1]: + content_dir = os.path.relpath( + os.path.join(sub_output_dir[0], sub_output_file), + self.output_dir) + + if content_dir == 'scripts/run_distribute_train.sh': + exist_run_distribute_train = True + elif content_dir == 'scripts/run_distribute_train_gpu.sh': + exist_run_distribute_train_gpu = True + elif content_dir == 'scripts/run_eval.sh': + exist_run_eval = True + elif content_dir == 'scripts/run_eval_gpu.sh': + exist_run_eval_gpu = True + elif content_dir == 'scripts/run_standalone_train.sh': + exist_run_standalone_train = True + elif content_dir == 'scripts/run_standalone_train_gpu.sh': + exist_run_standalone_train_gpu = True assert exist_run_distribute_train assert exist_run_distribute_train_gpu diff --git a/tests/st/func/wizard/test_lenet.py b/tests/st/func/wizard/test_lenet.py index b9c1b202..3ea32942 100644 --- a/tests/st/func/wizard/test_lenet.py +++ b/tests/st/func/wizard/test_lenet.py @@ -48,21 +48,6 @@ class TestLeNet: 'optimizer': 'SGD', 'dataset': 'MNIST'}, 'dataset_loader_name': 'MnistDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Momentum', - 'dataset': 'MNIST'}, - 'dataset_loader_name': 'MnistDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Adam', - 'dataset': 'MNIST'}, - 'dataset_loader_name': 'MnistDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyWithLogits', - 'optimizer': 'SGD', - 'dataset': 'MNIST'}, - 'dataset_loader_name': 'MnistDataset' }]) def test_combinations(self, params): """Do testing.""" diff --git a/tests/st/func/wizard/test_resnet50.py b/tests/st/func/wizard/test_resnet50.py index f9afd81a..a0cc7136 100644 --- a/tests/st/func/wizard/test_resnet50.py +++ b/tests/st/func/wizard/test_resnet50.py @@ -49,21 +49,6 @@ class TestResNet50: 'optimizer': 'SGD', 'dataset': 'Cifar10'}, 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Momentum', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Adam', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'SGD', - 'dataset': 'Cifar10'}, - 'dataset_loader_name': 'Cifar10Dataset' }, { 'config': {'loss': 'SoftmaxCrossEntropyWithLogits', 'optimizer': 'Momentum', @@ -79,21 +64,6 @@ class TestResNet50: 'optimizer': 'SGD', 'dataset': 'ImageNet'}, 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Momentum', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'Adam', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' - }, { - 'config': {'loss': 'SoftmaxCrossEntropyExpand', - 'optimizer': 'SGD', - 'dataset': 'ImageNet'}, - 'dataset_loader_name': 'ImageFolderDataset' }]) def test_combinations(self, params): """Do testing."""