diff --git a/CMakeLists.txt b/CMakeLists.txt index ac3ec78f595e875e7734a46c9786dce38b794c40..c929978523fe37df7c3c1ec117a345dcba236626 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ else() ${CMAKE_CURRENT_LIST_DIR}/inc/third_party/tensorflow/include/tensorflow_core/include/ ${CMAKE_CURRENT_LIST_DIR}/inc/third_party/tensorflow/include/tensorflow-1.15.5.data/purelib/tensorflow_core/include/ ${CMAKE_CURRENT_LIST_DIR}/inc/tensorflow/ - ${HI_PYTHON_INC}/ + ${HI_PYTHON_39_INC}/ ) target_compile_options(tf_adapter PUBLIC @@ -248,7 +248,7 @@ else() && rm -rf ${CMAKE_CURRENT_BINARY_DIR}/wheel/npu_bridge/convert_tf2npu/v2 && cp -r ${CMAKE_CURRENT_BINARY_DIR}/_tf_adapter.so ${CMAKE_CURRENT_BINARY_DIR}/wheel/npu_bridge && cd ${CMAKE_CURRENT_BINARY_DIR}/wheel - && ${HI_PYTHON} setup.py bdist_wheel --plat-name=manylinux2014_${CMAKE_SYSTEM_PROCESSOR} >/dev/null + && ${HI_PYTHON_39} setup.py bdist_wheel --plat-name=manylinux2014_${CMAKE_SYSTEM_PROCESSOR} >/dev/null && cp -f dist/${NPU_BRIDGE_WHL} ${CMAKE_CURRENT_BINARY_DIR}/ && echo "package whl end" DEPENDS tf_adapter @@ -263,8 +263,8 @@ else() -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DPYTHON_BIN_PATH=${HI_PYTHON_PATH} - -DPYTHON_INCLUDE_DIR=${HI_PYTHON_INC} + -DPYTHON_BIN_PATH=${HI_PYTHON_39_PATH} + -DPYTHON_INCLUDE_DIR=${HI_PYTHON_39_INC} -DASCEND_CI_BUILD_DIR=${TOP_DIR} BUILD_COMMAND $(MAKE) diff --git a/tools/build_wheel.sh b/tools/build_wheel.sh index 35be187598b7beaa81a1b34b500afa9b3e8a4dc1..7195fbe849465c73a4075a50f954ceb49a39b067 100644 --- a/tools/build_wheel.sh +++ b/tools/build_wheel.sh @@ -28,12 +28,12 @@ else fi #PYTHON_BIN_PATH=$(which python3.7) -PYTHON_BIN_PATH=${HI_PYTHON_PATH} +PYTHON_BIN_PATH=${HI_PYTHON_39_PATH} if [[ -z "${PYTHON_BIN_PATH}" ]]; then echo -e "\033[7mNo python3 installed\033[0m" exit 1 fi -PYTHON_INCLUDE_PATH=${HI_PYTHON_INC} +PYTHON_INCLUDE_PATH=${HI_PYTHON_39_INC} if [[ -z "${PYTHON_INCLUDE_PATH}" ]]; then echo -e "\033[7mNot found python3 include path\033[0m" exit 1