Update makefile (#831)

In current version of makefile, if user use make dev-install, they will install two packages "nni-sdk" and "nnictl" in their environment. Now merge the two package to be one package "nni".
microsoft · Mar 12, 2019 · 8f71e99 · 8f71e99
1 parent cfb0bca
commit 8f71e99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -168,18 +168,13 @@ install-dependencies: $(NNI_NODE_TARBALL) $(NNI_YARN_TARBALL)
 .PHONY: install-python-modules
 install-python-modules:
 	#$(_INFO) Installing Python SDK $(_END)
-	cd src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) .
-
-	#$(_INFO) Installing nnictl $(_END)
-	cd tools && 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) .
 
 .PHONY: dev-install-python-modules
 dev-install-python-modules:
 	#$(_INFO) Installing Python SDK $(_END)
-	cd src/sdk/pynni && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e .
-
-	#$(_INFO) Installing nnictl $(_END)
-	cd tools && sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) -e .
+	sed -ie 's/$(NNI_VERSION_TEMPLATE)/$(NNI_VERSION_VALUE)/' setup.py && $(PIP_INSTALL) $(PIP_MODE) .
+
 
 .PHONY: install-node-modules
 install-node-modules:

diff --git a/setup.py b/setup.py
@@ -68,5 +68,10 @@ def run(self):
 
     cmdclass={
         'install': CustomInstallCommand
+    },
+    entry_points = {
+        'console_scripts' : [
+            'nnictl = nni_cmd.nnictl:parse_args'
+        ]
     }
 )