Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Remove NAS UI #4088

Merged
merged 5 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies/recommended_gpu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tensorflow
keras == 2.4.3
torch == 1.9.0+cu111
torchvision == 0.10.0+cu111
pytorch-lightning >= 1.2.8
pytorch-lightning >= 1.4.2
onnx
peewee
graphviz
Expand Down
1 change: 0 additions & 1 deletion docs/en_US/Tutorial/SetupNniDeveloperEnvironment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ TypeScript (Linux and macOS)

* If ``ts/nni_manager`` is changed, run ``yarn watch`` under this folder. It will watch and build code continually. The ``nnictl`` need to be restarted to reload NNI manager.
* If ``ts/webui`` is changed, run ``yarn dev``\ , which will run a mock API server and a webpack dev server simultaneously. Use ``EXPERIMENT`` environment variable (e.g., ``mnist-tfv1-running``\ ) to specify the mock data being used. Built-in mock experiments are listed in ``src/webui/mock``. An example of the full command is ``EXPERIMENT=mnist-tfv1-running yarn dev``.
* If ``ts/nasui`` is changed, run ``yarn start`` under the corresponding folder. The web UI will refresh automatically if code is changed. There is also a mock API server that is useful when developing. It can be launched via ``node server.js``.

TypeScript (Windows)
********************
Expand Down
6 changes: 1 addition & 5 deletions nni/tools/nnictl/nnictl.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .nnictl_utils import stop_experiment, trial_ls, trial_kill, list_experiment, experiment_status,\
log_trial, experiment_clean, platform_clean, experiment_list, \
monitor_experiment, export_trials_data, trial_codegen, webui_url, \
get_config, log_stdout, log_stderr, search_space_auto_gen, webui_nas, \
get_config, log_stdout, log_stderr, search_space_auto_gen, \
save_experiment, load_experiment
from .algo_management import algo_reg, algo_unreg, algo_show, algo_list
from .constants import DEFAULT_REST_PORT
Expand Down Expand Up @@ -188,10 +188,6 @@ def parse_args():
parser_webui_url = parser_webui_subparsers.add_parser('url', help='show the url of web ui')
parser_webui_url.add_argument('id', nargs='?', help='the id of experiment')
parser_webui_url.set_defaults(func=webui_url)
parser_webui_nas = parser_webui_subparsers.add_parser('nas', help='show nas ui')
parser_webui_nas.add_argument('--port', default=6060, type=int, help='port of nas ui')
parser_webui_nas.add_argument('--logdir', default='.', type=str, help='the logdir where nas ui will read data')
parser_webui_nas.set_defaults(func=webui_nas)

#parse config command
parser_config = subparsers.add_parser('config', help='get config information')
Expand Down
16 changes: 0 additions & 16 deletions nni/tools/nnictl/nnictl_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from datetime import datetime, timezone
from subprocess import Popen
from nni.tools.annotation import expand_annotations
import nni_node # pylint: disable=wrong-import-order, import-error
from .rest_utils import rest_get, rest_delete, check_rest_server_quick, check_response
from .url_utils import trial_jobs_url, experiment_url, trial_job_id_url, export_data_url, metric_data_url
from .config_utils import Config, Experiments
Expand Down Expand Up @@ -457,21 +456,6 @@ def webui_url(args):
experiments_dict = Experiments().get_all_experiments()
print_normal('{0} {1}'.format('Web UI url:', ' '.join(experiments_dict[experiment_id].get('webuiUrl'))))

def webui_nas(args):
'''launch nas ui'''
print_normal('Starting NAS UI...')
try:
entry_dir = nni_node.__path__[0]
entry_file = os.path.join(entry_dir, 'nasui', 'server.js')
if sys.platform == 'win32':
node_command = os.path.join(entry_dir, 'node.exe')
else:
node_command = os.path.join(entry_dir, 'node')
cmds = [node_command, '--max-old-space-size=4096', entry_file, '--port', str(args.port), '--logdir', args.logdir]
subprocess.run(cmds, cwd=entry_dir)
except KeyboardInterrupt:
pass

def local_clean(directory):
'''clean up local data'''
print_normal('removing folder {0}'.format(directory))
Expand Down
2 changes: 1 addition & 1 deletion nni/tools/trial_tool/trial_keeper.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def trial_keeper_help_info(*args):
def check_version(args):
try:
trial_keeper_version = pkg_resources.get_distribution('nni').version
except pkg_resources.ResolutionError as err:
except pkg_resources.ResolutionError:
# package nni does not exist, try nni-tool package
nni_log(LogType.Error, 'Package nni does not exist!')
os._exit(1)
Expand Down
2 changes: 1 addition & 1 deletion nni/tools/trial_tool/trial_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def trial_runner_help_info(*args):
def check_version(args):
try:
trial_runner_version = pkg_resources.get_distribution('nni').version
except pkg_resources.ResolutionError as err:
except pkg_resources.ResolutionError:
# package nni does not exist, try nni-tool package
nni_log(LogType.Error, 'Package nni does not exist!')
os._exit(1)
Expand Down
5 changes: 0 additions & 5 deletions pipelines/fast-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ stages:
set -e
cd ts/nni_manager
yarn test
cd ../nasui
CI=true yarn test
displayName: TypeScript unit test

- task: PublishTestResults@2
Expand Down Expand Up @@ -295,8 +293,6 @@ stages:
set -e
cd ts/nni_manager
yarn test
cd ../nasui
CI=true yarn test
displayName: TypeScript unit test

- job: macos
Expand Down Expand Up @@ -356,7 +352,6 @@ stages:
set -e
export CI=true
(cd ts/nni_manager && yarn test --exclude test/core/nnimanager.test.ts)
(cd ts/nasui && yarn test)
displayName: TypeScript unit test

- script: |
Expand Down
1 change: 0 additions & 1 deletion pipelines/full-test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
export PATH=$PATH:$PWD/toolchain/yarn/bin
export CI=true
(cd ts/nni_manager && yarn test)
(cd ts/nasui && yarn test)
displayName: Unit test
continueOnError: true

Expand Down
14 changes: 0 additions & 14 deletions setup_ts.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@ def compile_ts():
_yarn('ts/webui')
_yarn('ts/webui', 'build')

_print('Building NAS UI')
_yarn('ts/nasui')
_yarn('ts/nasui', 'build')

_print('Building JupyterLab extension')
_yarn('ts/jupyter_extension')
_yarn('ts/jupyter_extension', 'build')
Expand All @@ -172,10 +168,6 @@ def symlink_nni_node():

_symlink('ts/webui/build', 'nni_node/static')

Path('nni_node/nasui').mkdir(exist_ok=True)
_symlink('ts/nasui/build', 'nni_node/nasui/build')
_symlink('ts/nasui/server.js', 'nni_node/nasui/server.js')

_symlink('ts/jupyter_extension/dist', 'nni_node/jupyter-extension')


Expand Down Expand Up @@ -207,10 +199,6 @@ def copy_nni_node(version):

shutil.copytree('ts/webui/build', 'nni_node/static')

Path('nni_node/nasui').mkdir(exist_ok=True)
shutil.copytree('ts/nasui/build', 'nni_node/nasui/build')
shutil.copyfile('ts/nasui/server.js', 'nni_node/nasui/server.js')

shutil.copytree('ts/jupyter_extension/dist', 'nni_node/jupyter-extension')


Expand Down Expand Up @@ -245,8 +233,6 @@ def _print(*args):
'ts/nni_manager/node_modules',
'ts/webui/build',
'ts/webui/node_modules',
'ts/nasui/build',
'ts/nasui/node_modules',

# unit test
'ts/nni_manager/.nyc_output',
Expand Down
35 changes: 0 additions & 35 deletions test/scripts/unittest.ps1

This file was deleted.

39 changes: 0 additions & 39 deletions test/scripts/unittest.sh

This file was deleted.

23 changes: 0 additions & 23 deletions ts/nasui/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion ts/nasui/assets/darts/graph.json

This file was deleted.

Loading