Merge pull request #122 from Microsoft/master

merge master

README.md

 <p align="center">
-<img src="https://microsoft.github.io/nni/docs/img/nni_logo.png" width="300"/>
+<img src="https://github.com/Microsoft/nni/blob/master/docs/img/nni_logo.png" width="300"/>
 </p>
 
 -----------
@@ -18,22 +18,22 @@ The tool dispatches and runs trial jobs generated by tuning algorithms to search
 
 ### **NNI [v0.5.1](https://github.com/Microsoft/nni/releases) has been released!**
 <p align="center">
-  <a href="#nni-v05-has-been-released"><img src="https://microsoft.github.io/nni/docs/img/overview.svg" /></a>
+  <a href="#nni-v05-has-been-released"><img src="https://github.com/Microsoft/nni/blob/master/docs/img/overview.svg" /></a>
 </p>
 <table>
   <tbody>
     <tr align="center" valign="bottom">
       <td>
         <b>Supported Frameworks</b>
-        <img src="https://user-images.githubusercontent.com/44491713/51381727-e3d0f780-1b4f-11e9-96ab-d26b9198ba65.png"/>
+        <img src="https://github.com/Microsoft/nni/blob/master/docs/img/bar.png"/>
       </td>
       <td>
         <b>Tuning Algorithms</b>
-        <img src="https://user-images.githubusercontent.com/44491713/51381727-e3d0f780-1b4f-11e9-96ab-d26b9198ba65.png"/>
+        <img src="https://github.com/Microsoft/nni/blob/master/docs/img/bar.png"/>
       </td>
       <td>
         <b>Training Services</b>
-        <img src="https://user-images.githubusercontent.com/44491713/51381727-e3d0f780-1b4f-11e9-96ab-d26b9198ba65.png"/>
+        <img src="https://github.com/Microsoft/nni/blob/master/docs/img/bar.png"/>
       </td>
     </tr>
     <tr/>

deployment/pypi/Makefile

@@ -30,8 +30,6 @@ build:
 	sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' $(CWD)nni/package.json
 	cd $(CWD)nni && yarn --prod
 	cd $(CWD) && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && python3 setup.py bdist_wheel -p $(WHEEL_SPEC)
-	cd $(CWD)../../src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && python3 setup.py bdist_wheel
-	cp -r $(CWD)../../src/sdk/pynni/dist/*.whl $(CWD)dist
 	cd $(CWD)
 
 .PHONY: upload
@@ -41,7 +39,6 @@ upload:
 
 .PHONY: clean
 clean:
-	rm -rf $(CWD)../../src/sdk/pynni/dist
 	rm -rf $(CWD)build
 	rm -rf $(CWD)dist
 	rm -rf $(CWD)nni

deployment/pypi/setup.py

+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+# OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# ==================================================================================================
+
 import setuptools
 import platform
 from os import walk, path
@@ -28,21 +48,26 @@ setuptools.setup(
     long_description_content_type = 'text/markdown',
     license = 'MIT',
     url = 'https://github.com/Microsoft/nni',
-    packages = setuptools.find_packages('../../tools'),
+    packages = setuptools.find_packages('../../tools') + setuptools.find_packages('../../src/sdk/pynni')
     package_dir = {
         'nni_annotation': '../../tools/nni_annotation',
         'nni_cmd': '../../tools/nni_cmd',
-        'nni_trial_tool':'../../tools/nni_trial_tool'
+        'nni_trial_tool': '../../tools/nni_trial_tool',
+        'nni': '../../src/sdk/pynni/nni'
     },
     python_requires = '>=3.5',
     install_requires = [
-        'nni-sdk',
         'schema',
         'pyyaml',
         'psutil',
         'requests',
         'astor',
-        'pyhdfs'
+        'pyhdfs',
+        'hyperopt',
+        'json_tricks',
+        'numpy',
+        'scipy',
+        'coverage'
     ],
     classifiers = [
         'Programming Language :: Python :: 3',