Merge pull request #3030 from microsoft/v2.0

Merge v2.0 into master
microsoft · Oct 27, 2020 · 80b6cb3 · 80b6cb3
2 parents 77dac12 + ff1af7f
commit 80b6cb3
Show file tree

Hide file tree

Showing 650 changed files with 885 additions and 735 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,12 @@
+/nni_node/
+/toolchain/
+
+# unit test generated files
+/test/model_path/
+/test/temp.json
+/test/ut/sdk/*.pth
+
+
 # Logs
 logs
 *.log

diff --git a/Makefile b/Makefile
diff --git a/README.Makefile.md → archive-del/README.Makefile.md b/README.Makefile.md → archive-del/README.Makefile.md
diff --git a/README.Makefile_zh_CN.md → archive-del/README.Makefile_zh_CN.md b/README.Makefile_zh_CN.md → archive-del/README.Makefile_zh_CN.md
diff --git a/_config.yml → archive-del/_config.yml b/_config.yml → archive-del/_config.yml
diff --git a/install.ps1 → archive-del/install.ps1 b/install.ps1 → archive-del/install.ps1
diff --git a/install.sh → archive-del/install.sh b/install.sh → archive-del/install.sh
diff --git a/src/sdk/pycli/setup.py → archive-del/sdk/pycli/setup.py b/src/sdk/pycli/setup.py → archive-del/sdk/pycli/setup.py
diff --git a/src/sdk/pynni/.gitignore → archive-del/sdk/pynni/.gitignore b/src/sdk/pynni/.gitignore → archive-del/sdk/pynni/.gitignore
diff --git a/src/sdk/pynni/pylintrc → archive-del/sdk/pynni/pylintrc b/src/sdk/pynni/pylintrc → archive-del/sdk/pynni/pylintrc
diff --git a/src/sdk/pynni/requirements.txt → archive-del/sdk/pynni/requirements.txt b/src/sdk/pynni/requirements.txt → archive-del/sdk/pynni/requirements.txt
diff --git a/src/sdk/pynni/setup.py → archive-del/sdk/pynni/setup.py b/src/sdk/pynni/setup.py → archive-del/sdk/pynni/setup.py
diff --git a/src/sdk/pynni/ut.sh → archive-del/sdk/pynni/ut.sh b/src/sdk/pynni/ut.sh → archive-del/sdk/pynni/ut.sh
diff --git a/tools/bash-completion → archive-del/tools/bash-completion b/tools/bash-completion → archive-del/tools/bash-completion
diff --git a/tools/setup.py → archive-del/tools/setup.py b/tools/setup.py → archive-del/tools/setup.py
diff --git a/uninstall.ps1 → archive-del/uninstall.ps1 b/uninstall.ps1 → archive-del/uninstall.ps1
diff --git a/src/sdk/pynni/README.md → archive-doc/nni/README.md b/src/sdk/pynni/README.md → archive-doc/nni/README.md
diff --git a/src/sdk/pynni/README_zh_CN.md → archive-doc/nni/README_zh_CN.md b/src/sdk/pynni/README_zh_CN.md → archive-doc/nni/README_zh_CN.md
diff --git a/tools/nni_annotation/README.md → archive-doc/nni_annotation/README.md b/tools/nni_annotation/README.md → archive-doc/nni_annotation/README.md
diff --git a/tools/nni_annotation/README_zh_CN.md → archive-doc/nni_annotation/README_zh_CN.md b/tools/nni_annotation/README_zh_CN.md → archive-doc/nni_annotation/README_zh_CN.md
diff --git a/tools/README.md → archive-doc/tools/README.md b/tools/README.md → archive-doc/tools/README.md
diff --git a/tools/README_zh_CN.md → archive-doc/tools/README_zh_CN.md b/tools/README_zh_CN.md → archive-doc/tools/README_zh_CN.md
diff --git a/src/sdk/pynni/tests/__init__.py → archive-ut/nni/tests/__init__.py b/src/sdk/pynni/tests/__init__.py → archive-ut/nni/tests/__init__.py
diff --git a/...ests/assets/classic_nas_search_space.json → ...ests/assets/classic_nas_search_space.json b/...ests/assets/classic_nas_search_space.json → ...ests/assets/classic_nas_search_space.json
diff --git a/src/sdk/pynni/tests/assets/search_space.json → ...ive-ut/nni/tests/assets/search_space.json b/src/sdk/pynni/tests/assets/search_space.json → ...ive-ut/nni/tests/assets/search_space.json
diff --git a/...ni/tests/expect/test_graph_module1.expect → ...ni/tests/expect/test_graph_module1.expect b/...ni/tests/expect/test_graph_module1.expect → ...ni/tests/expect/test_graph_module1.expect
diff --git a/...ni/tests/expect/test_graph_module2.expect → ...ni/tests/expect/test_graph_module2.expect b/...ni/tests/expect/test_graph_module2.expect → ...ni/tests/expect/test_graph_module2.expect
diff --git a/...ni/tests/expect/test_graph_module3.expect → ...ni/tests/expect/test_graph_module3.expect b/...ni/tests/expect/test_graph_module3.expect → ...ni/tests/expect/test_graph_module3.expect
diff --git a/...i/tests/models/pytorch_models/__init__.py → ...i/tests/models/pytorch_models/__init__.py b/...i/tests/models/pytorch_models/__init__.py → ...i/tests/models/pytorch_models/__init__.py
diff --git a/...odels/pytorch_models/layer_choice_only.py → ...odels/pytorch_models/layer_choice_only.py b/...odels/pytorch_models/layer_choice_only.py → ...odels/pytorch_models/layer_choice_only.py
diff --git a/.../tests/models/pytorch_models/mobilenet.py → .../tests/models/pytorch_models/mobilenet.py b/.../tests/models/pytorch_models/mobilenet.py → .../tests/models/pytorch_models/mobilenet.py
diff --git a/...ts/models/pytorch_models/mutable_scope.py → ...ts/models/pytorch_models/mutable_scope.py b/...ts/models/pytorch_models/mutable_scope.py → ...ts/models/pytorch_models/mutable_scope.py
diff --git a/...ynni/tests/models/pytorch_models/naive.py → .../nni/tests/models/pytorch_models/naive.py b/...ynni/tests/models/pytorch_models/naive.py → .../nni/tests/models/pytorch_models/naive.py
diff --git a/...nni/tests/models/pytorch_models/nested.py → ...nni/tests/models/pytorch_models/nested.py b/...nni/tests/models/pytorch_models/nested.py → ...nni/tests/models/pytorch_models/nested.py
diff --git a/src/sdk/pynni/tests/test_assessor.py → archive-ut/nni/tests/test_assessor.py b/src/sdk/pynni/tests/test_assessor.py → archive-ut/nni/tests/test_assessor.py
diff --git a/src/sdk/pynni/tests/test_builtin_tuners.py → archive-ut/nni/tests/test_builtin_tuners.py b/src/sdk/pynni/tests/test_builtin_tuners.py → archive-ut/nni/tests/test_builtin_tuners.py
diff --git a/...sdk/pynni/tests/test_compression_utils.py → ...ve-ut/nni/tests/test_compression_utils.py b/...sdk/pynni/tests/test_compression_utils.py → ...ve-ut/nni/tests/test_compression_utils.py
diff --git a/src/sdk/pynni/tests/test_compressor_tf.py → archive-ut/nni/tests/test_compressor_tf.py b/src/sdk/pynni/tests/test_compressor_tf.py → archive-ut/nni/tests/test_compressor_tf.py
diff --git a/src/sdk/pynni/tests/test_compressor_torch.py → ...ive-ut/nni/tests/test_compressor_torch.py b/src/sdk/pynni/tests/test_compressor_torch.py → ...ive-ut/nni/tests/test_compressor_torch.py
diff --git a/...pynni/tests/test_curvefitting_assessor.py → ...t/nni/tests/test_curvefitting_assessor.py b/...pynni/tests/test_curvefitting_assessor.py → ...t/nni/tests/test_curvefitting_assessor.py
diff --git a/src/sdk/pynni/tests/test_dependecy_aware.py → archive-ut/nni/tests/test_dependecy_aware.py b/src/sdk/pynni/tests/test_dependecy_aware.py → archive-ut/nni/tests/test_dependecy_aware.py
diff --git a/src/sdk/pynni/tests/test_evolution_tuner.py → archive-ut/nni/tests/test_evolution_tuner.py b/src/sdk/pynni/tests/test_evolution_tuner.py → archive-ut/nni/tests/test_evolution_tuner.py
diff --git a/src/sdk/pynni/tests/test_graph_utils.py → archive-ut/nni/tests/test_graph_utils.py b/src/sdk/pynni/tests/test_graph_utils.py → archive-ut/nni/tests/test_graph_utils.py
diff --git a/src/sdk/pynni/tests/test_hyperopt_tuner.py → archive-ut/nni/tests/test_hyperopt_tuner.py b/src/sdk/pynni/tests/test_hyperopt_tuner.py → archive-ut/nni/tests/test_hyperopt_tuner.py
diff --git a/src/sdk/pynni/tests/test_model_speedup.py → archive-ut/nni/tests/test_model_speedup.py b/src/sdk/pynni/tests/test_model_speedup.py → archive-ut/nni/tests/test_model_speedup.py
diff --git a/src/sdk/pynni/tests/test_msg_dispatcher.py → archive-ut/nni/tests/test_msg_dispatcher.py b/src/sdk/pynni/tests/test_msg_dispatcher.py → archive-ut/nni/tests/test_msg_dispatcher.py
diff --git a/src/sdk/pynni/tests/test_nas.py → archive-ut/nni/tests/test_nas.py b/src/sdk/pynni/tests/test_nas.py → archive-ut/nni/tests/test_nas.py
diff --git a/...pynni/tests/test_networkmorphism_tuner.py → ...t/nni/tests/test_networkmorphism_tuner.py b/...pynni/tests/test_networkmorphism_tuner.py → ...t/nni/tests/test_networkmorphism_tuner.py
diff --git a/src/sdk/pynni/tests/test_protocol.py → archive-ut/nni/tests/test_protocol.py b/src/sdk/pynni/tests/test_protocol.py → archive-ut/nni/tests/test_protocol.py
diff --git a/src/sdk/pynni/tests/test_pruners.py → archive-ut/nni/tests/test_pruners.py b/src/sdk/pynni/tests/test_pruners.py → archive-ut/nni/tests/test_pruners.py
diff --git a/src/sdk/pynni/tests/test_smartparam.py → archive-ut/nni/tests/test_smartparam.py b/src/sdk/pynni/tests/test_smartparam.py → archive-ut/nni/tests/test_smartparam.py
diff --git a/src/sdk/pynni/tests/test_trial.py → archive-ut/nni/tests/test_trial.py b/src/sdk/pynni/tests/test_trial.py → archive-ut/nni/tests/test_trial.py
diff --git a/src/sdk/pynni/tests/test_utils.py → archive-ut/nni/tests/test_utils.py b/src/sdk/pynni/tests/test_utils.py → archive-ut/nni/tests/test_utils.py
diff --git a/...ni_annotation/examples/mnist_generated.py → ...ni_annotation/examples/mnist_generated.py b/...ni_annotation/examples/mnist_generated.py → ...ni_annotation/examples/mnist_generated.py
diff --git a/...ation/examples/mnist_with_annotation.json → ...ation/examples/mnist_with_annotation.json b/...ation/examples/mnist_with_annotation.json → ...ation/examples/mnist_with_annotation.json
diff --git a/...otation/examples/mnist_with_annotation.py → ...otation/examples/mnist_with_annotation.py b/...otation/examples/mnist_with_annotation.py → ...otation/examples/mnist_with_annotation.py
diff --git a/...on/examples/mnist_without_annotation.json → ...on/examples/mnist_without_annotation.json b/...on/examples/mnist_without_annotation.json → ...on/examples/mnist_without_annotation.json
diff --git a/...tion/examples/mnist_without_annotation.py → ...tion/examples/mnist_without_annotation.py b/...tion/examples/mnist_without_annotation.py → ...tion/examples/mnist_without_annotation.py
diff --git a/tools/nni_annotation/test_annotation.py → archive-ut/nni_annotation/test_annotation.py b/tools/nni_annotation/test_annotation.py → archive-ut/nni_annotation/test_annotation.py
diff --git a/...notation/testcase/annotated/dir/simple.py → ...notation/testcase/annotated/dir/simple.py b/...notation/testcase/annotated/dir/simple.py → ...notation/testcase/annotated/dir/simple.py
diff --git a/...nnotation/testcase/annotated/handwrite.py → ...nnotation/testcase/annotated/handwrite.py b/...nnotation/testcase/annotated/handwrite.py → ...nnotation/testcase/annotated/handwrite.py
diff --git a/...ni_annotation/testcase/annotated/mnist.py → ...ni_annotation/testcase/annotated/mnist.py b/...ni_annotation/testcase/annotated/mnist.py → ...ni_annotation/testcase/annotated/mnist.py
diff --git a/.../nni_annotation/testcase/annotated/nas.py → .../nni_annotation/testcase/annotated/nas.py b/.../nni_annotation/testcase/annotated/nas.py → .../nni_annotation/testcase/annotated/nas.py
diff --git a/.../testcase/annotated/non_annotation/bar.py → .../testcase/annotated/non_annotation/bar.py b/.../testcase/annotated/non_annotation/bar.py → .../testcase/annotated/non_annotation/bar.py
diff --git a/.../testcase/annotated/non_annotation/foo.py → .../testcase/annotated/non_annotation/foo.py b/.../testcase/annotated/non_annotation/foo.py → .../testcase/annotated/non_annotation/foo.py
diff --git a/.../nni_annotation/testcase/searchspace.json → .../nni_annotation/testcase/searchspace.json b/.../nni_annotation/testcase/searchspace.json → .../nni_annotation/testcase/searchspace.json
diff --git a/...nnotation/testcase/usercode/dir/simple.py → ...nnotation/testcase/usercode/dir/simple.py b/...nnotation/testcase/usercode/dir/simple.py → ...nnotation/testcase/usercode/dir/simple.py
diff --git a/...nni_annotation/testcase/usercode/mnist.py → ...nni_annotation/testcase/usercode/mnist.py b/...nni_annotation/testcase/usercode/mnist.py → ...nni_annotation/testcase/usercode/mnist.py
diff --git a/...s/nni_annotation/testcase/usercode/nas.py → ...t/nni_annotation/testcase/usercode/nas.py b/...s/nni_annotation/testcase/usercode/nas.py → ...t/nni_annotation/testcase/usercode/nas.py
diff --git a/...n/testcase/usercode/non_annotation/bar.py → ...n/testcase/usercode/non_annotation/bar.py b/...n/testcase/usercode/non_annotation/bar.py → ...n/testcase/usercode/non_annotation/bar.py
diff --git a/...n/testcase/usercode/non_annotation/foo.py → ...n/testcase/usercode/non_annotation/foo.py b/...n/testcase/usercode/non_annotation/foo.py → ...n/testcase/usercode/non_annotation/foo.py
diff --git a/...ni_annotation/testcase/usercode/nonpy.txt → ...ni_annotation/testcase/usercode/nonpy.txt b/...ni_annotation/testcase/usercode/nonpy.txt → ...ni_annotation/testcase/usercode/nonpy.txt
diff --git a/...s/config_files/invalid/custom-tuner-1.yml → ...s/config_files/invalid/custom-tuner-1.yml b/...s/config_files/invalid/custom-tuner-1.yml → ...s/config_files/invalid/custom-tuner-1.yml
diff --git a/...s/config_files/invalid/custom-tuner-2.yml → ...s/config_files/invalid/custom-tuner-2.yml b/...s/config_files/invalid/custom-tuner-2.yml → ...s/config_files/invalid/custom-tuner-2.yml
diff --git a/...cmd/tests/config_files/invalid/mytuner.py → ...cmd/tests/config_files/invalid/mytuner.py b/...cmd/tests/config_files/invalid/mytuner.py → ...cmd/tests/config_files/invalid/mytuner.py
diff --git a/...d/tests/config_files/invalid/no-tuner.yml → ...d/tests/config_files/invalid/no-tuner.yml b/...d/tests/config_files/invalid/no-tuner.yml → ...d/tests/config_files/invalid/no-tuner.yml
diff --git a/...ts/config_files/invalid/search_space.json → ...ts/config_files/invalid/search_space.json b/...ts/config_files/invalid/search_space.json → ...ts/config_files/invalid/search_space.json
diff --git a/...config_files/invalid/searchspace-path.yml → ...config_files/invalid/searchspace-path.yml b/...config_files/invalid/searchspace-path.yml → ...config_files/invalid/searchspace-path.yml
diff --git a/.../config_files/invalid/tuner-wrong-key.yml → .../config_files/invalid/tuner-wrong-key.yml b/.../config_files/invalid/tuner-wrong-key.yml → .../config_files/invalid/tuner-wrong-key.yml
diff --git a/...config_files/invalid/wrong-class-args.yml → ...config_files/invalid/wrong-class-args.yml b/...config_files/invalid/wrong-class-args.yml → ...config_files/invalid/wrong-class-args.yml
diff --git a/..._files/invalid/wrong-training-service.yml → ..._files/invalid/wrong-training-service.yml b/..._files/invalid/wrong-training-service.yml → ..._files/invalid/wrong-training-service.yml
diff --git a/...ts/config_files/test_files/test_json.json → ...ts/config_files/test_files/test_json.json b/...ts/config_files/test_files/test_json.json → ...ts/config_files/test_files/test_json.json
diff --git a/...sts/config_files/test_files/test_yaml.yml → ...sts/config_files/test_files/test_yaml.yml b/...sts/config_files/test_files/test_yaml.yml → ...sts/config_files/test_files/test_yaml.yml
diff --git a/.../nni_cmd/tests/config_files/valid/main.py → .../nni_cmd/tests/config_files/valid/main.py b/.../nni_cmd/tests/config_files/valid/main.py → .../nni_cmd/tests/config_files/valid/main.py
diff --git a/...ests/config_files/valid/search_space.json → ...ests/config_files/valid/search_space.json b/...ests/config_files/valid/search_space.json → ...ests/config_files/valid/search_space.json
diff --git a/...nni_cmd/tests/config_files/valid/test.yml → ...nni_cmd/tests/config_files/valid/test.yml b/...nni_cmd/tests/config_files/valid/test.yml → ...nni_cmd/tests/config_files/valid/test.yml
diff --git a/tools/nni_cmd/tests/mock/experiment.py → archive-ut/nni_cmd/tests/mock/experiment.py b/tools/nni_cmd/tests/mock/experiment.py → archive-ut/nni_cmd/tests/mock/experiment.py
diff --git a/...md/tests/mock/nnictl_metadata/.experiment → ...md/tests/mock/nnictl_metadata/.experiment b/...md/tests/mock/nnictl_metadata/.experiment → ...md/tests/mock/nnictl_metadata/.experiment
diff --git a/...tests/mock/nnictl_metadata/aGew0x/.config → ...tests/mock/nnictl_metadata/aGew0x/.config b/...tests/mock/nnictl_metadata/aGew0x/.config → ...tests/mock/nnictl_metadata/aGew0x/.config
diff --git a/.../tests/mock/nnictl_metadata/aGew0x/stderr → .../tests/mock/nnictl_metadata/aGew0x/stderr b/.../tests/mock/nnictl_metadata/aGew0x/stderr → .../tests/mock/nnictl_metadata/aGew0x/stderr
diff --git a/.../tests/mock/nnictl_metadata/aGew0x/stdout → .../tests/mock/nnictl_metadata/aGew0x/stdout b/.../tests/mock/nnictl_metadata/aGew0x/stdout → .../tests/mock/nnictl_metadata/aGew0x/stdout
diff --git a/...tests/mock/nnictl_metadata/config/.config → ...tests/mock/nnictl_metadata/config/.config b/...tests/mock/nnictl_metadata/config/.config → ...tests/mock/nnictl_metadata/config/.config
diff --git a/tools/nni_cmd/tests/mock/restful_server.py → ...e-ut/nni_cmd/tests/mock/restful_server.py b/tools/nni_cmd/tests/mock/restful_server.py → ...e-ut/nni_cmd/tests/mock/restful_server.py
diff --git a/tools/nni_cmd/tests/test_common_utils.py → ...ive-ut/nni_cmd/tests/test_common_utils.py b/tools/nni_cmd/tests/test_common_utils.py → ...ive-ut/nni_cmd/tests/test_common_utils.py
diff --git a/tools/nni_cmd/tests/test_config_utils.py → ...ive-ut/nni_cmd/tests/test_config_utils.py b/tools/nni_cmd/tests/test_config_utils.py → ...ive-ut/nni_cmd/tests/test_config_utils.py
diff --git a/...s/nni_cmd/tests/test_config_validation.py → ...t/nni_cmd/tests/test_config_validation.py b/...s/nni_cmd/tests/test_config_validation.py → ...t/nni_cmd/tests/test_config_validation.py
diff --git a/tools/nni_cmd/tests/test_nnictl_utils.py → ...ive-ut/nni_cmd/tests/test_nnictl_utils.py b/tools/nni_cmd/tests/test_nnictl_utils.py → ...ive-ut/nni_cmd/tests/test_nnictl_utils.py
diff --git a/tools/nni_trial_tool/test/__init__.py → archive-ut/nni_trial_tool/test/__init__.py b/tools/nni_trial_tool/test/__init__.py → archive-ut/nni_trial_tool/test/__init__.py
diff --git a/.../nni_trial_tool/test/test_file_channel.py → .../nni_trial_tool/test/test_file_channel.py b/.../nni_trial_tool/test/test_file_channel.py → .../nni_trial_tool/test/test_file_channel.py
diff --git a/...trial_tool/test/test_hdfsClientUtility.py → ...trial_tool/test/test_hdfsClientUtility.py b/...trial_tool/test/test_hdfsClientUtility.py → ...trial_tool/test/test_hdfsClientUtility.py