Merge pull request #144 from Microsoft/master

Fix installation (#864)

Makefile

@@ -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
@@ -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

docs/en_US/ExperimentConfig.md

@@ -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

setup.py

@@ -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',
@@ -66,9 +58,6 @@ setup(
         'PythonWebHDFS'
     ],
 
-    cmdclass={
-        'install': CustomInstallCommand
-    },
     entry_points = {
         'console_scripts' : [
             'nnictl = nni_cmd.nnictl:parse_args'

tools/nni_cmd/launcher.py

@@ -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':