Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
f370e171
Commit
f370e171
authored
Mar 18, 2019
by
Zejun Lin
Committed by
chicm-ms
Mar 18, 2019
Browse files
Fix installation (#864)
* fix installation
parent
c1e6098d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
21 deletions
+1
-21
Makefile
Makefile
+1
-10
setup.py
setup.py
+0
-11
No files found.
Makefile
View file @
f370e171
...
@@ -109,15 +109,6 @@ dev-install: install-scripts
...
@@ -109,15 +109,6 @@ dev-install: install-scripts
dev-install
:
dev-install
:
#
$(_INFO)
Complete! You may want to add
$(BIN_FOLDER)
to your PATH environment
$(_END)
#
$(_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
.PHONY
:
uninstall
uninstall
:
uninstall
:
-
$(PIP_UNINSTALL)
-y
nni
-
$(PIP_UNINSTALL)
-y
nni
...
@@ -173,7 +164,7 @@ install-python-modules:
...
@@ -173,7 +164,7 @@ install-python-modules:
.PHONY
:
dev-install-python-modules
.PHONY
:
dev-install-python-modules
dev-install-python-modules
:
dev-install-python-modules
:
#
$(_INFO)
Installing Python SDK
$(_END)
#
$(_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
.PHONY
:
install-node-modules
...
...
setup.py
View file @
f370e171
...
@@ -21,18 +21,10 @@
...
@@ -21,18 +21,10 @@
import
os
import
os
from
setuptools
import
setup
,
find_packages
from
setuptools
import
setup
,
find_packages
from
setuptools.command.install
import
install
import
subprocess
def
read
(
fname
):
def
read
(
fname
):
return
open
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
fname
),
encoding
=
'utf-8'
).
read
()
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
(
setup
(
name
=
'nni'
,
name
=
'nni'
,
version
=
'999.0.0-developing'
,
version
=
'999.0.0-developing'
,
...
@@ -66,9 +58,6 @@ setup(
...
@@ -66,9 +58,6 @@ setup(
'PythonWebHDFS'
'PythonWebHDFS'
],
],
cmdclass
=
{
'install'
:
CustomInstallCommand
},
entry_points
=
{
entry_points
=
{
'console_scripts'
:
[
'console_scripts'
:
[
'nnictl = nni_cmd.nnictl:parse_args'
'nnictl = nni_cmd.nnictl:parse_args'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment