Merge v0.3 into master (#337)

* Fix pypi package missing python module

* Fix pypi package missing python module

* fix bug in smartparam example (#322)

* Fix nnictl update trialnum and document (#326)

1.Fix restful server of update
2.Update nnictl document of update
3.Add tensorboard in docement

* Update the version numbers from 0.3.2 to 0.3.3

README.md

@@ -37,7 +37,7 @@ Note: If you are in docker container (as root), please remove `--user` from the
 * We only support Linux (Ubuntu 16.04 or higher) in our current stage. 
 * Run the following commands in an environment that has `python >= 3.5`, `git` and `wget`.
 ```bash	
-    git clone -b v0.3.3 https://github.com/Microsoft/nni.git	
+    git clone -b v0.3.3 https://github.com/Microsoft/nni.git
     cd nni	
     source install.sh	
 ```

deployment/docker/Dockerfile

@@ -53,7 +53,7 @@ RUN python3 -m pip --no-cache-dir install \
 #
 #Install NNI
 #
-RUN python3 -m pip install --user nni
+RUN python3 -m pip install nni
 
 #
 #Tensorflow 1.10.0
@@ -68,6 +68,6 @@ RUN python3 -m pip --no-cache-dir install Keras==2.1.6
 #sklearn
 RUN python3 -m pip --no-cache-dir install scikit-learn
 
-ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/.local/bin:/usr/bin:
+ENV PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/.local/bin:/usr/bin:/bin:/sbin
 
 WORKDIR /root
\ No newline at end of file

deployment/pypi/Makefile

@@ -9,11 +9,16 @@ build:
 	tar xf $(CWD)node-linux-x64.tar.xz -C node-linux-x64 --strip-components 1
 	cd $(CWD)../../src/nni_manager && yarn && yarn build
 	cd $(CWD)../../src/webui && yarn && yarn build
-	rm -rf $(CWD)nni
-	cp -r $(CWD)../../src/nni_manager/dist $(CWD)nni
-	cp -r $(CWD)../../src/webui/build $(CWD)nni/static
-	cp $(CWD)../../src/nni_manager/package.json $(CWD)nni
-	cd $(CWD)nni && yarn --prod
+	rm -rf $(CWD)nni_pkg
+	cp -r $(CWD)../../src/nni_manager/dist $(CWD)nni_pkg
+	cp -r $(CWD)../../src/webui/build $(CWD)nni_pkg/static
+	cp $(CWD)../../src/nni_manager/package.json $(CWD)nni_pkg
+	cd $(CWD)nni_pkg && yarn --prod
+	rm -rf $(CWD)nnicmd
+	rm -rf $(CWD)nni_annotation
+	cp -r $(CWD)../../tools/nnicmd $(CWD)nnicmd
+	cp -r $(CWD)../../tools/nni_annotation $(CWD)nni_annotation
+	cp -r $(CWD)../../tools/trial_tool $(CWD)trial_tool
 	cd $(CWD) && python3 setup.py bdist_wheel
 	cd $(CWD)../../src/sdk/pynni && python3 setup.py bdist_wheel
 	cp -r $(CWD)../../src/sdk/pynni/dist/*.whl $(CWD)dist

deployment/pypi/setup.py

@@ -11,7 +11,7 @@ with open('../../README.md', 'r') as fh:
 
 setuptools.setup(
     name = 'nni',
-    version = '0.3.2',
+    version = '0.3.3',
     author = 'Microsoft NNI team',
     author_email = 'nni@microsoft.com',
     description = 'Neural Network Intelligence package',
@@ -32,7 +32,8 @@ setuptools.setup(
         'pyyaml',
         'psutil',
         'requests',
-        'astor'
+        'astor',
+        'pyhdfs'
     ],
     classifiers = [
         'Programming Language :: Python :: 3',

docs/NNICTLDOC.md

@@ -15,6 +15,7 @@ nnictl experiment
 nnictl config
 nnictl log
 nnictl webui
+nnictl tensorboard
 ```
 ### Manage an experiment
 * __nnictl create__ 
@@ -122,6 +123,23 @@ nnictl webui
           | ------ | ------ | ------ |------ |
           | id|  False| |ID of the experiment you want to set|
           | --value, -v|  True| |the experiment duration will be NUMBER seconds. SUFFIX may be 's' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for days.|  
+
+ 	* __nnictl update trialnum__  
+        * Description
+          
+		      You can use this command to update an experiment's maxtrialnum.     
+	  
+	     * Usage
+        
+		       nnictl update trialnum [OPTIONS] 
+
+            Options:
+    
+            | Name, shorthand | Required|Default | Description |
+            | ------ | ------ | ------ |------ |
+           | id|  False| |ID of the experiment you want to set|
+           | --value, -v|  True| |the new number of maxtrialnum you want to set|
+
      
 
 * __nnictl trial__

examples/trials/mnist-smartparam/mnist.py

@@ -223,6 +223,7 @@ def generate_defualt_params():
 
 if __name__ == '__main__':
     try:
+        nni.get_next_parameter()
         main(generate_defualt_params())
     except Exception as exception:
         logger.exception(exception)

setup.py

@@ -35,7 +35,7 @@ class CustomInstallCommand(install):
 
 setup(
     name = 'nni',
-    version = '0.3.2',
+    version = '0.3.3',
     author = 'Microsoft NNI Team',
     author_email = 'nni@microsoft.com',
     description = 'Neural Network Intelligence project',

src/nni_manager/rest_server/restValidationSchemas.ts

@@ -94,7 +94,9 @@ export namespace ValidationSchemas {
             params: joi.object(STARTEXPERIMENT.body).required(),
             execDuration: joi.number().required(),
             startTime: joi.number(),
-            endTime: joi.number()
+            endTime: joi.number(),
+            logDir: joi.string(),
+            maxSequenceId: joi.number()
         }
     };
     export const STARTTENSORBOARD = {

src/sdk/pynni/nni/trial.py

@@ -47,6 +47,7 @@ def get_next_parameter():
     return _params['parameters']
 
 def get_current_parameter(tag):
+    global _params
     if _params is None:
         return None
     return _params['parameters'][tag]