Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
N
ngraph
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ngraph
Commits
c5998d23
Commit
c5998d23
authored
Oct 24, 2019
by
Ilya Churaev
Committed by
Scott Cyphers
Oct 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed paths for python build (#3797)
* Added relative paths for python build * Fixed Ninja generator
parent
66c72c18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
CMakeLists.txt
python/CMakeLists.txt
+6
-6
build_wheel.sh.in
python/build_wheel.sh.in
+4
-4
No files found.
python/CMakeLists.txt
View file @
c5998d23
...
...
@@ -24,24 +24,24 @@ ExternalProject_Add(
pybind11
GIT_REPOSITORY
"https://github.com/pybind/pybind11.git"
GIT_TAG
"v2.2.4"
SOURCE_DIR
"
${
CMAKE_BINARY_DIR
}
/pybind11"
SOURCE_DIR
"
${
CMAKE_
CURRENT_
BINARY_DIR
}
/pybind11"
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
set
(
BUILD_SH_IN
"
${
CMAKE_
SOURCE_DIR
}
/python
/build_wheel.sh.in"
)
set
(
BUILD_SH
"
${
CMAKE_
BINARY_DIR
}
/python
/build_wheel.sh"
)
set
(
BUILD_SH_IN
"
${
CMAKE_
CURRENT_SOURCE_DIR
}
/build_wheel.sh.in"
)
set
(
BUILD_SH
"
${
CMAKE_
CURRENT_BINARY_DIR
}
/build_wheel.sh"
)
configure_file
(
${
BUILD_SH_IN
}
${
BUILD_SH
}
@ONLY
)
add_custom_command
(
OUTPUT
${
CMAKE_
BINARY_DIR
}
/python
/dist/
OUTPUT
${
CMAKE_
CURRENT_BINARY_DIR
}
/dist/
POST_BUILD
WORKING_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
COMMAND $
(
MAKE
)
-C ../ DESTDIR=python/_install install && bash build_wheel.sh
COMMAND
$
{
MAKE
}
-C ../ DESTDIR=python/_install install && bash build_wheel.sh
)
add_custom_target
(
python_wheel DEPENDS ngraph
${
CMAKE_
BINARY_DIR
}
/python
/dist/
)
add_custom_target
(
python_wheel DEPENDS ngraph
${
CMAKE_
CURRENT_BINARY_DIR
}
/dist/
)
if
(
NGRAPH_CPU_ENABLE
)
add_dependencies
(
python_wheel libmkldnn
)
endif
()
...
...
python/build_wheel.sh.in
View file @
c5998d23
...
...
@@ -17,13 +17,13 @@
set
-e
export
PYBIND_HEADERS_PATH
=
@CMAKE_BINARY_DIR@/pybind11
export
NGRAPH_CPP_BUILD_PATH
=
@CMAKE_
BINARY_DIR@/python
/_install/@CMAKE_INSTALL_PREFIX@/
export
PYBIND_HEADERS_PATH
=
@CMAKE_
CURRENT_
BINARY_DIR@/pybind11
export
NGRAPH_CPP_BUILD_PATH
=
@CMAKE_
CURRENT_BINARY_DIR@
/_install/@CMAKE_INSTALL_PREFIX@/
export
NGRAPH_ONNX_IMPORT_ENABLE
=
@NGRAPH_ONNX_IMPORT_ENABLE@
export
NGRAPH_VERSION
=
@NGRAPH_WHEEL_VERSION@
SOURCE_DIR
=
@CMAKE_
SOURCE_DIR@/python
BUILD_DIR
=
@CMAKE_
BINARY_DIR@/python
SOURCE_DIR
=
@CMAKE_
CURRENT_SOURCE_DIR@
BUILD_DIR
=
@CMAKE_
CURRENT_BINARY_DIR@
!
PYTHON2_DETECTED
=
$(($(
python
-c
'import sys; print(sys.version_info.major)'
2> /dev/null
)
==
2
))
!
PYTHON3_DETECTED
=
$(($(
python3
-c
'import sys; print(sys.version_info.major)'
2> /dev/null
)
==
3
))
...
...
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