Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Commit

Permalink
Fix installation (#864)
Browse files Browse the repository at this point in the history
* fix installation
  • Loading branch information
Crysple authored and chicm-ms committed Mar 18, 2019
1 parent c1e6098 commit f370e17
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,6 @@ dev-install: install-scripts
dev-install:
#$(_INFO) Complete! You may want to add $(BIN_FOLDER) to your PATH environment $(_END)

# Target for setup.py
# Do not invoke this manually
.PHONY: pip-install
pip-install: install-dependencies
pip-install: build
pip-install: install-node-modules
pip-install: install-scripts
pip-install: update-bash-config

.PHONY: uninstall
uninstall:
-$(PIP_UNINSTALL) -y nni
Expand Down Expand Up @@ -173,7 +164,7 @@ install-python-modules:
.PHONY: dev-install-python-modules
dev-install-python-modules:
#$(_INFO) Installing Python SDK $(_END)
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) -e .


.PHONY: install-node-modules
Expand Down
11 changes: 0 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,10 @@

import os
from setuptools import setup, find_packages
from setuptools.command.install import install
import subprocess

def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read()

class CustomInstallCommand(install):
'''a customized install class in pip module'''
def run(self):
super().run()
subprocess.run(['make', 'pip-install'], check=True)

setup(
name = 'nni',
version = '999.0.0-developing',
Expand Down Expand Up @@ -66,9 +58,6 @@ def run(self):
'PythonWebHDFS'
],

cmdclass={
'install': CustomInstallCommand
},
entry_points = {
'console_scripts' : [
'nnictl = nni_cmd.nnictl:parse_args'
Expand Down

0 comments on commit f370e17

Please sign in to comment.