Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix installation (#864) #144

Merged
merged 2 commits into from
Mar 20, 2019
Merged

Fix installation (#864) #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f370e17
Fix installation (#864)
Crysple Mar 18, 2019
05c8c98
quick fix version check (#866)
SparkSnail Mar 18, 2019
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
11 changes: 1 addition & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,6 @@ dev-install: install-scripts
dev-install:
#$(_INFO) Complete! You may want to add $(BIN_FOLDER) to your PATH environment $(_END)

# Target for setup.py
# Do not invoke this manually
.PHONY: pip-install
pip-install: install-dependencies
pip-install: build
pip-install: install-node-modules
pip-install: install-scripts
pip-install: update-bash-config

.PHONY: uninstall
uninstall:
-$(PIP_UNINSTALL) -y nni
Expand Down Expand Up @@ -173,7 +164,7 @@ install-python-modules:
.PHONY: dev-install-python-modules
dev-install-python-modules:
#$(_INFO) Installing Python SDK $(_END)
sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) .
sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e .


.PHONY: install-node-modules
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/ExperimentConfig.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ machineList:
* __debug__
* Description

NNI will check the version of nniManager process and the version of trialKeeper in remote, pai and kubernetes platform. If you want to disable version check, you could set debug be false.
NNI will check the version of nniManager process and the version of trialKeeper in remote, pai and kubernetes platform. If you want to disable version check, you could set debug be true.

* __maxTrialNum__
* Description
Expand Down
11 changes: 0 additions & 11 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,10 @@

import os
from setuptools import setup, find_packages
from setuptools.command.install import install
import subprocess

def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read()

class CustomInstallCommand(install):
'''a customized install class in pip module'''
def run(self):
super().run()
subprocess.run(['make', 'pip-install'], check=True)

setup(
name = 'nni',
version = '999.0.0-developing',
Expand Down Expand Up @@ -66,9 +58,6 @@ def run(self):
'PythonWebHDFS'
],

cmdclass={
'install': CustomInstallCommand
},
entry_points = {
'console_scripts' : [
'nnictl = nni_cmd.nnictl:parse_args'
Expand Down
3 changes: 2 additions & 1 deletion tools/nni_cmd/launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,9 @@ def set_experiment(experiment_config, mode, port, config_file_name):
request_data['tuner'] = experiment_config['tuner']
if 'assessor' in experiment_config:
request_data['assessor'] = experiment_config['assessor']
#debug mode should disable version check
if experiment_config.get('debug') is not None:
request_data['versionCheck'] = experiment_config.get('debug')
request_data['versionCheck'] = not experiment_config.get('debug')

request_data['clusterMetaData'] = []
if experiment_config['trainingServicePlatform'] == 'local':
Expand Down