Update Makefile

Makefile

@@ -122,7 +122,7 @@ easy-install: install
 easy-install: update-bash-config
 
 easy-install:
-	#$(_INFO) Complete! #(_END)
+	#$(_INFO) Complete! $(_END)
 
 
 # Target for setup.py
@@ -203,21 +203,21 @@ install-dependencies: $(NODE_TARBALL) $(YARN_TARBALL) $(SERVE_TARBALL)
 .PHONY: install-python-modules
 install-python-modules:
 	#$(_INFO) Installing Python SDK $(_END)
-	cd src/sdk/pynni && python3 setup.py install $(PIP_MODE)
+	cd src/sdk/pynni && $(PIP_INSTALL) $(PIP_MODE) .
 
 	#$(_INFO) Installing nnictl $(_END)
-	cd tools && python3 setup.py install $(PIP_MODE)
+	cd tools && $(PIP_INSTALL) $(PIP_MODE) .
 
 .PHONY: install-node-modules
 install-node-modules:
 	mkdir -p $(INSTALL_PREFIX)/nni
 
 	#$(_INFO) Installing NNI Manager $(_END)
-	cp -rT src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
-	cp -rT src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
+	cp -rT ${PWD}/src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
+	cp -rT ${PWD}/src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
 
 	#$(_INFO) Installing Web UI $(_END)
-	cp -rT src/webui/build $(INSTALL_PREFIX)/nni/webui
+	cp -rT ${PWD}/src/webui/build $(INSTALL_PREFIX)/nni/webui
 
 
 .PHONY: install-dev-modules
@@ -231,11 +231,11 @@ install-dev-modules:
 	mkdir -p $(INSTALL_PREFIX)/nni
 
 	#$(_INFO) Installing NNI Manager $(_END)
-	ln -sf $(PWD)/src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
-	ln -sf $(PWD)/src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
+	ln -sf ${PWD}/src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
+	ln -sf ${PWD}/src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
 
 	#$(_INFO) Installing Web UI $(_END)
-	ln -sf $(PWD)/src/webui/build $(INSTALL_PREFIX)/nni/webui
+	ln -sf ${PWD}/src/webui/build $(INSTALL_PREFIX)/nni/webui
 
 
 .PHONY: install-scripts

install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
-make install-dependencies
-make build
-make dev-install
-make install-examples
-make update-bash-config
+make easy-install
 source ~/.bashrc

tools/README.md

@@ -1,36 +1,37 @@
-##NNI CTL
+## NNI CTL
 The NNI CTL module is used to control Neural Network Intelligence, including start a new experiment, stop an experiment and update an experiment etc.  
-##Environment
+## Environment
+
 ```
 Ubuntu 16.04 or other Linux OS
 python >= 3.5
 ```
 
-##Installation
- 1.Enter tools directory  
-
- 2.Use pip3 to install packages
+## Installation
 
-   2.1 Install for current user:
+ 1. Enter tools directory  
+
+ 2. Use pip3 to install packages
+    * Install for current user:
 
-     pip3 install --user -e .
+          pip3 install --user -e .
 
-   2.2 Install for all users:
+    * Install for all users:
 
-     pip3 install -e .
+          pip3 install -e .
 
 
- 3.Change the mode of nnictl file 
+1. Change the mode of nnictl file 
 
     chmod +x ./nnictl
 
-4.Add nnictl to your PATH system environment variable.   
+2. Add nnictl to your PATH system environment variable.   
 
-  * You could use `export` command to set PATH variable temporary.
+    * You could use `export` command to set PATH variable temporary.
 
           export PATH={your nnictl path}:$PATH  
 
-  * Or you could edit your `/etc/profile` file.
+    * Or you could edit your `/etc/profile` file.
 
           1.sudo vim /etc/profile
 
@@ -43,7 +44,8 @@ python >= 3.5
           3.source /etc/profile 
 
 
-##To start using NNI CTL
+## To start using NNI CTL
+
 please reference to the [NNI CTL document].