Resolve conflicts for #4760 (#4762)

a911b856 · Yuge Zhang · GitHub · 14d2966b · a911b856 · a911b856
Unverified Commit a911b856 authored Apr 21, 2022 by Yuge Zhang Committed by GitHub Apr 21, 2022
20 changed files
--- a/nni/tools/jupyter_extension/management.py
+++ b/nni/tools/jupyter_extension/management.py
--- a/nni/tools/jupyter_extension/proxy.py
+++ b/nni/tools/jupyter_extension/proxy.py
--- a/nni/tools/nnictl/config_schema.py
+++ b/nni/tools/nnictl/config_schema.py
--- a/nni/tools/nnictl/hello.py
+++ b/nni/tools/nnictl/hello.py
--- a/nni/tools/nnictl/legacy_launcher.py
+++ b/nni/tools/nnictl/legacy_launcher.py
--- a/nni/tools/nnictl/nnictl.py
+++ b/nni/tools/nnictl/nnictl.py
--- a/nni/tools/nnictl/nnictl_utils.py
+++ b/nni/tools/nnictl/nnictl_utils.py
--- a/nni/tools/nnictl/rest_utils.py
+++ b/nni/tools/nnictl/rest_utils.py
--- a/nni/tools/nnictl/ts_management.py
+++ b/nni/tools/nnictl/ts_management.py
--- a/nni/trial.py
+++ b/nni/trial.py
--- a/nni/tuner.py
+++ b/nni/tuner.py
--- a/nni/typehint.py
+++ b/nni/typehint.py
--- a/nni_assets/__init__.py
+++ b/nni_assets/__init__.py
--- a/nni_assets/hello_hpo/main.py
+++ b/nni_assets/hello_hpo/main.py
--- a/nni_assets/hello_hpo/model.py
+++ b/nni_assets/hello_hpo/model.py
--- a/pipelines/fast-test.yml
+++ b/pipelines/fast-test.yml
--- a/pipelines/release.yml
+++ b/pipelines/release.yml
--- a/pipelines/templates/cache-dependencies-template.yml
+++ b/pipelines/templates/cache-dependencies-template.yml
--- a/pipelines/templates/install-dependencies.yml
+++ b/pipelines/templates/install-dependencies.yml
--- a/pyrightconfig.json
+++ b/pyrightconfig.json