Commit c5998d23 authored by Ilya Churaev's avatar Ilya Churaev Committed by Scott Cyphers

Fixed paths for python build (#3797)

* Added relative paths for python build

* Fixed Ninja generator
parent 66c72c18
......@@ -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()
......
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment