Sfoglia il codice sorgente

upgrade ov from 2023.03 to 2025.0 (#3789)

zhang-prog 7 mesi fa
parent
commit
dd732a95eb

+ 2 - 1
libs/ultra-infer/cmake/openvino.cmake

@@ -51,7 +51,8 @@ else()
       if(NEED_ABI0)
         set(OPENVINO_FILENAME "openvino-linux-x64-20230302-abi0")
       else()
-        set(OPENVINO_FILENAME "openvino-linux-x64-20230302")
+        set(OPENVINO_VERSION "2025.0")
+        set(OPENVINO_FILENAME "openvino-linux-x64-${OPENVINO_VERSION}")
       endif()
     endif()
   endif()

+ 1 - 1
libs/ultra-infer/cmake/utils.cmake

@@ -37,7 +37,7 @@ function(get_openvino_libs OPENVINO_RUNTIME_DIR)
   find_package(TBB PATHS ${TBB_DIR})
   if (TBB_FOUND)
     # 2024.10.22(zhangyue): Use openvino with tbb on linux
-    set(TBB_LIB "${OPENVINO_RUNTIME_DIR}/3rdparty/tbb/lib/libtbb.so.12")
+    set(TBB_LIB "${OPENVINO_RUNTIME_DIR}/3rdparty/tbb/lib/libtbb.so")
     list(APPEND LIB_LIST ${TBB_LIB})
   else()
     # TODO(zhoushunjie): Use openvino with tbb on linux in future.

+ 1 - 1
libs/ultra-infer/scripts/linux/_build_py.sh

@@ -74,6 +74,6 @@ rm -rf .setuptools-cmake-build build ultra_infer/libs/third_libs dist
 python setup.py build
 # HACK
 patchelf \
-    --set-rpath '$ORIGIN/libs/third_libs/onnxruntime/lib:$ORIGIN/libs/third_libs/paddle2onnx/lib:$ORIGIN/libs/third_libs/paddle_inference/paddle/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/cryptopp/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/mklml/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/glog/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/protobuf/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/utf8proc/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/xxhash/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/gflags/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/onednn/lib:$ORIGIN/libs/third_libs/tensorrt/lib:$ORIGIN/libs/third_libs/opencv/lib64:$ORIGIN/libs/third_libs/openvino/runtime/lib:$ORIGIN/libs/third_libs/openvino/runtime/3rdparty/omp/lib' \
+    --set-rpath '$ORIGIN/libs/third_libs/onnxruntime/lib:$ORIGIN/libs/third_libs/paddle2onnx/lib:$ORIGIN/libs/third_libs/paddle_inference/paddle/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/cryptopp/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/mklml/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/glog/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/protobuf/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/utf8proc/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/xxhash/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/gflags/lib:$ORIGIN/libs/third_libs/paddle_inference/third_party/install/onednn/lib:$ORIGIN/libs/third_libs/tensorrt/lib:$ORIGIN/libs/third_libs/opencv/lib64:$ORIGIN/libs/third_libs/openvino/runtime/lib:$ORIGIN/libs/third_libs/openvino/runtime/3rdparty/tbb/lib' \
     build/lib.*/ultra_infer/ultra_infer_main*.so
 python setup.py bdist_wheel