Merge pull request #18 from Microsoft/master

merge master
microsoft · Oct 7, 2018 · 90fe674 · 90fe674
2 parents 951e80e + b84c50c
commit 90fe674
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 108 deletions.
diff --git a/Makefile b/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,22 @@ 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
+	rm -rf ${PWD}/src/nni_manager/dist/node_modules
 
 	#$(_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 +232,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

diff --git a/README.Makefile.md b/README.Makefile.md
@@ -13,7 +13,7 @@ The targets will be detailed later.
 
 ## Dependencies
 
-NNI requires at least Node.js, Yarn, and setuptools to build, while PIP and TypeScript are also recommended.
+NNI requires at least Node.js, Yarn, and PIP to build, while TypeScript is also recommended.
 
 NNI requires Node.js, serve, and all dependency libraries to run.
 Required Node.js libraries (including TypeScript) can be installed by Yarn, and required Python libraries can be installed by setuptools or PIP.

diff --git a/README.md b/README.md
@@ -5,21 +5,10 @@
 NNI (Neural Network Intelligence) is a toolkit to help users run automated machine learning experiments. 
 The tool dispatches and runs trial jobs that generated by tuning algorithms to search the best neural architecture and/or hyper-parameters in different environments (e.g. local machine, remote servers and cloud).
 
-```
-            AutoML experiment                                 Training Services
-┌────────┐        ┌────────────────────────┐                  ┌────────────────┐
-│ nnictl │ ─────> │  nni_manager           │                  │ Local Machine  │
-└────────┘        │    sdk/tuner           │                  └────────────────┘
-                  │      hyperopt_tuner    │
-                  │      evolution_tuner   │    trial jobs    ┌────────────────┐
-                  │      ...               │     ────────>    │ Remote Servers │          
-                  ├────────────────────────┤                  └────────────────┘
-                  │  trial job source code │                  
-                  │    sdk/annotation      │                  ┌────────────────┐
-                  ├────────────────────────┤                  │ Yarn,K8s,      │
-                  │  nni_board             │                  │ ...            │
-                  └────────────────────────┘                  └────────────────┘
-```
+<p align="center">
+<img src="./docs/nni_overview.png" alt="drawing" width="800"/>
+</p>
+
 ## **Who should consider using NNI**
 * You want to try different AutoML algorithms for your training code (model) at local
 * You want to run AutoML trial jobs in different environments to speed up search (e.g. remote servers and cloud)

diff --git a/docs/nni_overview.png b/docs/nni_overview.png
diff --git a/examples/tuners/ga_customer_tuner/customer_tuner.py b/examples/tuners/ga_customer_tuner/customer_tuner.py
@@ -61,7 +61,8 @@ def __str__(self):
 
     def mutation(self, config=None, info=None, save_dir=None):
         self.result = None
-        self.config = config
+        if config is not None:
+            self.config = config
         self.config.mutation()
         self.restore_dir = self.save_dir
         self.save_dir = save_dir
@@ -121,8 +122,7 @@ def receive_trial_result(self, parameter_id, parameters, reward):
         logger.debug(str(parameters))
         logger.debug(str(reward))
 
-        indiv = graph_loads(parameters)
-        indiv.result = reward
+        indiv = Individual(graph_loads(parameters), result=reward)
         self.population.append(indiv)
         return
 

diff --git a/src/webui/package.json b/src/webui/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "antd": "^3.9.3",
+    "antd": "^3.8.1",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "echarts": "^4.1.0",

diff --git a/src/webui/src/components/SlideBar.tsx b/src/webui/src/components/SlideBar.tsx
@@ -11,7 +11,7 @@ class SlideBar extends React.Component<{}, {}> {
         <ul className="nav">
           <li>
             <IndexLink to={'/oview'} activeClassName="high">
-              <Icon className="icon" type="experiment" theme="outlined" />Overview
+              <Icon className="icon" type="rocket" />Overview
               <Icon className="floicon" type="right" />
             </IndexLink>
           </li>
@@ -41,7 +41,7 @@ class SlideBar extends React.Component<{}, {}> {
           </li>
           <li>
             <a href="https://github.com/Microsoft/nni/issues" target="_blank">
-              <Icon className="icon" type="smile" theme="outlined" />Feedback
+              <Icon className="icon" type="smile" />Feedback
             </a>
           </li>
         </ul>

diff --git a/tools/README.md b/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].
 
 

diff --git a/tools/bash-completion b/tools/bash-completion
@@ -81,4 +81,4 @@ _nnictl()
     fi
 }
 
-complete -F _nnictl nnictl
+complete -o nospace -F _nnictl nnictl
diff --git a/tools/completion b/tools/completion
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,4 +81,4 @@ _nnictl() @@
         fi
     }
-    complete -F _nnictl nnictl
+    complete -o nospace -F _nnictl nnictl