From 0a7f9c3ab815574104a39127332717c8181c20a8 Mon Sep 17 00:00:00 2001 From: likun104 Date: Sat, 28 Dec 2024 18:50:19 +0800 Subject: [PATCH] rename whl files --- CMakeLists.txt | 15 ++++++++------- build.sh | 15 +++++++++++---- tf_adapter/python/setup.py | 2 +- tf_adapter_2.x/CI_Build | 2 +- tf_adapter_2.x/CMakeLists.txt | 7 +++++-- tf_adapter_2.x/python/setup.py | 6 +++--- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc2cc7356..ac3ec78f5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ option(ENABLE_OPEN_SRC "Enable graphengine compile in opensource." FALSE) set(TFADAPTER_DIR ${CMAKE_CURRENT_LIST_DIR}) +set(NPU_BRIDGE_WHL npu_bridge-1.15.0-py3-none-manylinux2014_${CMAKE_SYSTEM_PROCESSOR}.whl) if (ENABLE_OPEN_SRC) cmake_minimum_required(VERSION 3.14) @@ -92,7 +93,7 @@ if (ENABLE_OPEN_SRC) add_custom_command(TARGET _tf_adapter POST_BUILD - COMMAND cd ${CMAKE_BINARY_DIR}/dist/python/ && ${PYTHON_BIN_PATH} setup.py bdist_wheel + COMMAND cd ${CMAKE_BINARY_DIR}/dist/python/ && ${PYTHON_BIN_PATH} setup.py bdist_wheel --plat-name=manylinux2014_${CMAKE_SYSTEM_PROCESSOR} VERBATIM ) else() @@ -234,12 +235,12 @@ else() ################################################################################################### add_custom_target( hw_npu_bridge_1.15.0 ALL - DEPENDS tensorflow_framework pywrap_tensorflow_internal tf_adapter ${CMAKE_CURRENT_BINARY_DIR}/npu_bridge-1.15.0-py3-none-any.whl npu_device_whl + DEPENDS tensorflow_framework pywrap_tensorflow_internal tf_adapter ${CMAKE_CURRENT_BINARY_DIR}/${NPU_BRIDGE_WHL} npu_device_whl ) # package _tf_adapter.so in npu_bridge-xxx.whl add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/npu_bridge-1.15.0-py3-none-any.whl + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NPU_BRIDGE_WHL} COMMAND echo "package whl start" && mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/wheel && cp -r ${BASE_DIR}/tf_adapter/python/. ${CMAKE_CURRENT_BINARY_DIR}/wheel @@ -247,8 +248,8 @@ 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 >/dev/null - && cp -f dist/npu_bridge-1.15.0-py3-none-any.whl ${CMAKE_CURRENT_BINARY_DIR}/ + && ${HI_PYTHON} 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 ) @@ -267,7 +268,7 @@ else() -DASCEND_CI_BUILD_DIR=${TOP_DIR} BUILD_COMMAND $(MAKE) - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /dist/python/dist/npu_device-0.1-py3-none-any.whl ${CMAKE_CURRENT_BINARY_DIR} + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy /dist/python/dist/npu_device-2.6.5-py3-none-manylinux2014_${CMAKE_SYSTEM_PROCESSOR}.whl ${CMAKE_CURRENT_BINARY_DIR} EXCLUDE_FROM_ALL TRUE ) ################################################################################################### @@ -277,7 +278,7 @@ else() LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/npu_bridge-1.15.0-py3-none-any.whl ${CMAKE_CURRENT_BINARY_DIR}/npu_device-0.1-py3-none-any.whl OPTIONAL + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${NPU_BRIDGE_WHL} ${CMAKE_CURRENT_BINARY_DIR}/npu_device-2.6.5-py3-none-manylinux2014_${CMAKE_SYSTEM_PROCESSOR}.whl OPTIONAL DESTINATION ${INSTALL_LIBRARY_DIR} ) endif() diff --git a/build.sh b/build.sh index b557f98a9..04f3d7e1f 100755 --- a/build.sh +++ b/build.sh @@ -25,7 +25,7 @@ RELEASE_TARGET="tfadapter.tar" # print usage message usage() { echo "Usage:" - echo " bash build.sh [-h] [-j[n]] [-v] [-g] [-u] [-s] [-c] [-x]" + echo " bash build.sh [-h] [-j[n]] [-v] [-g] [-u] [-s] [-c] [-x] [-a]" echo "" echo "Options:" echo " -h Print usage" @@ -36,6 +36,7 @@ usage() { echo " -s TF_adapter stest" echo " -c TF_adapter ci build" echo " -x TF_adapter2.x ci build" + echo " -a TF_adapter2.x use python3.7" echo "to be continued ..." } @@ -52,8 +53,9 @@ checkopts() { ENABLE_TFADAPTER_ST="off" ENABLE_CI_BUILD="off" ENABLE_2X_CI_BUILD="off" + TFADAPTER_2X_PY37="off" # Process the options - while getopts 'hj:vuscg:x' opt + while getopts 'hj:vuscg:xa' opt do case "${opt}" in h) usage @@ -65,6 +67,7 @@ checkopts() { s) ENABLE_TFADAPTER_ST="on" ;; c) ENABLE_CI_BUILD="on" ;; x) ENABLE_2X_CI_BUILD="on" ;; + a) TFADAPTER_2X_PY37="on" ;; *) logging "Undefined option: ${opt}" usage exit 1 ;; @@ -121,7 +124,7 @@ build_tfadapter() { release_tfadapter() { logging "Create output directory" - cd ${CMAKE_PATH}/dist/python/dist && mkdir -p fwkplugin/bin && mv npu_bridge-*.whl fwkplugin/bin && mv "${BASE_PATH}/tf_adapter_2.x/build/dist/python/dist/npu_device-0.1-py3-none-any.whl" fwkplugin/bin && tar cfz "${RELEASE_TARGET}" * && mv "${RELEASE_TARGET}" "${RELEASE_PATH}" + cd ${CMAKE_PATH}/dist/python/dist && mkdir -p fwkplugin/bin && mv npu_bridge-*.whl fwkplugin/bin && mv ${BASE_PATH}/tf_adapter_2.x/build/dist/python/dist/npu_device-*.whl fwkplugin/bin && tar cfz "${RELEASE_TARGET}" * && mv "${RELEASE_TARGET}" "${RELEASE_PATH}" } main() { @@ -132,7 +135,11 @@ main() { mk_dir "${RELEASE_PATH}" if [[ "X$ENABLE_2X_CI_BUILD" = "Xon" ]]; then chmod +x "${BASE_PATH}/tf_adapter_2.x/CI_Build" - sh "${BASE_PATH}/tf_adapter_2.x/CI_Build" "python3.7" + if [[ "X$TFADAPTER_2X_PY37" = "Xon" ]]; then + sh "${BASE_PATH}/tf_adapter_2.x/CI_Build" "python3.7" + else + sh "${BASE_PATH}/tf_adapter_2.x/CI_Build" "python3.9" + fi else build_tfadapter fi diff --git a/tf_adapter/python/setup.py b/tf_adapter/python/setup.py index ffc7c1d7b..be51ed890 100644 --- a/tf_adapter/python/setup.py +++ b/tf_adapter/python/setup.py @@ -15,7 +15,7 @@ # limitations under the License. # ============================================================================== -"""npu bridge for tensorflow v1.15.0. +"""npu bridge for tensorflow v1.15.0, tag version v0.0.33 """ from __future__ import absolute_import diff --git a/tf_adapter_2.x/CI_Build b/tf_adapter_2.x/CI_Build index 8f1c21560..0a85df4a8 100644 --- a/tf_adapter_2.x/CI_Build +++ b/tf_adapter_2.x/CI_Build @@ -39,7 +39,7 @@ echo "Configuration finished" rm -rf build mkdir build cd build -cmake .. +cmake -DASCEND_CI_LIMITED_PY37_ENABLE=ON .. make -j8 deactivate diff --git a/tf_adapter_2.x/CMakeLists.txt b/tf_adapter_2.x/CMakeLists.txt index fe80f7db0..04c055b6d 100644 --- a/tf_adapter_2.x/CMakeLists.txt +++ b/tf_adapter_2.x/CMakeLists.txt @@ -17,6 +17,9 @@ if (DEFINED ASCEND_CI_BUILD_DIR) include_directories(${PYTHON_INCLUDE_DIR}) add_definitions(-DASCEND_CI_LIMITED_PY37) else () + if (ASCEND_CI_LIMITED_PY37_ENABLE) + add_definitions(-DASCEND_CI_LIMITED_PY37) + endif () if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/tools/COMPILE_FLAGS OR NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/tools/TF_INSTALLED_PATH OR NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/tools/ASCEND_INSTALLED_PATH OR NOT EXISTS @@ -52,8 +55,8 @@ add_subdirectory(compat_v1) add_subdirectory(convert_tool) add_custom_target(ascend_adapter2 ALL - COMMAND cd ${CMAKE_BINARY_DIR}/dist/python/ && ${PYTHON_BIN_PATH} setup.py bdist_wheel + COMMAND cd ${CMAKE_BINARY_DIR}/dist/python/ && ${PYTHON_BIN_PATH} setup.py bdist_wheel --plat-name=manylinux2014_${CMAKE_SYSTEM_PROCESSOR} DEPENDS _npu_ops _npu_device_backends _tf_adapter convert_tool_v2 VERBATIM) -install(CODE "execute_process(COMMAND ${PYTHON_BIN_PATH} -m pip install ${CMAKE_BINARY_DIR}/dist/python/dist/npu_device-0.1-py3-none-any.whl --upgrade)") +install(CODE "execute_process(COMMAND ${PYTHON_BIN_PATH} -m pip install ${CMAKE_BINARY_DIR}/dist/python/dist/npu_device-2.6.5-py3-none-manylinux2014_${CMAKE_SYSTEM_PROCESSOR}.whl --upgrade)") diff --git a/tf_adapter_2.x/python/setup.py b/tf_adapter_2.x/python/setup.py index 68cdaf7e4..35bc6622b 100644 --- a/tf_adapter_2.x/python/setup.py +++ b/tf_adapter_2.x/python/setup.py @@ -20,9 +20,9 @@ from setuptools import setup from setuptools import find_packages setup(name='npu_device', - version='0.1', - description='This is a demo package', - long_description='This is a demo package', + version='2.6.5', + description='npu device for tensorflow v2.6.5, tag version v0.0.33', + long_description='npu device for tensorflow v2.6.5, tag version v0.0.33', packages=find_packages(), include_package_data=True, ext_modules=[], -- Gitee