Merge pull request #3302 from microsoft/v2.0-merge

Merge branch v2.0 into master (no squash)

Merge pull request #3302 from microsoft/v2.0-merge
Merge branch v2.0 into master (no squash)
4784cc6c · liuzhe-lz · GitHub · 25db55ca · 349ead41 · 4784cc6c
Unverified Commit 4784cc6c authored Jan 14, 2021 by liuzhe-lz Committed by GitHub Jan 14, 2021
20 changed files
--- a/test/.gitignore
+++ b/test/.gitignore
--- a/test/config/examples/cifar10-pytorch-adl.yml
+++ b/test/config/examples/cifar10-pytorch-adl.yml
--- a/test/config/examples/cifar10_adl_search_space.json
+++ b/test/config/examples/cifar10_adl_search_space.json
--- a/test/config/integration_tests.yml
+++ b/test/config/integration_tests.yml
--- a/test/config/integration_tests_tf2.yml
+++ b/test/config/integration_tests_tf2.yml
--- a/test/config/training_service.yml
+++ b/test/config/training_service.yml
--- a/test/nni_test/nnitest/generate_ts_config.py
+++ b/test/nni_test/nnitest/generate_ts_config.py
--- a/test/nni_test/nnitest/run_tests.py
+++ b/test/nni_test/nnitest/run_tests.py
--- a/test/pipelines/pipelines-it-frameworkcontroller.yml
+++ b/test/pipelines/pipelines-it-frameworkcontroller.yml
--- a/test/pipelines/pipelines-it-installation.yml
+++ b/test/pipelines/pipelines-it-installation.yml
--- a/test/pipelines/pipelines-it-kubeflow.yml
+++ b/test/pipelines/pipelines-it-kubeflow.yml
--- a/test/pipelines/pipelines-it-local-tf2.yml
+++ b/test/pipelines/pipelines-it-local-tf2.yml
--- a/test/pipelines/pipelines-it-local-windows.yml
+++ b/test/pipelines/pipelines-it-local-windows.yml
--- a/test/pipelines/pipelines-it-local.yml
+++ b/test/pipelines/pipelines-it-local.yml
--- a/test/pipelines/pipelines-it-pai-windows.yml
+++ b/test/pipelines/pipelines-it-pai-windows.yml
--- a/test/pipelines/pipelines-it-pai.yml
+++ b/test/pipelines/pipelines-it-pai.yml
--- a/test/pipelines/pipelines-it-paiYarn.yml
+++ b/test/pipelines/pipelines-it-paiYarn.yml
--- a/test/pipelines/pipelines-it-remote-linux-to-linux.yml
+++ b/test/pipelines/pipelines-it-remote-linux-to-linux.yml
--- a/test/pipelines/pipelines-it-remote-linux-to-windows.yml
+++ b/test/pipelines/pipelines-it-remote-linux-to-windows.yml
--- a/test/pipelines/pipelines-it-remote-windows-to-linux.yml
+++ b/test/pipelines/pipelines-it-remote-windows-to-linux.yml