Port several PRs from master to 2023.3 LTS (#23461)
### Ported PRs: - https://github.com/openvinotoolkit/openvino/pull/22928 - https://github.com/openvinotoolkit/openvino/pull/22963 - https://github.com/openvinotoolkit/openvino/pull/23345 - https://github.com/openvinotoolkit/openvino/pull/23460 --------- Co-authored-by: Andrey Babushkin <andrey.babushkin@intel.com>
This commit is contained in:
parent
15b0f99132
commit
28c1585d65
|
|
@ -28,7 +28,10 @@ jobs:
|
|||
INSTALL_DIR: ${{ github.workspace }}/install
|
||||
INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
|
||||
ONNX_MODELS_PATH: ${{ github.workspace }}/onnx_test_models
|
||||
MODELS_SHARE_PATH: "/mount/onnxtestdata"
|
||||
# instead of using static MODELS_SHARE_PATH
|
||||
# choose one of the replicas dynamically instead
|
||||
# depending on GITHUB_RUN_NUMBER variable
|
||||
NUMBER_OF_REPLICAS: 2
|
||||
ONNX_MODEL_ZOO_SHA: "d58213534f2a4d1c4b19ba62b3bb5f544353256e"
|
||||
steps:
|
||||
- name: Set apt retries
|
||||
|
|
@ -52,6 +55,8 @@ jobs:
|
|||
echo "OPENVINO_REPO=$GITHUB_WORKSPACE/openvino" >> "$GITHUB_ENV"
|
||||
echo "INSTALL_DIR=$GITHUB_WORKSPACE/install" >> "$GITHUB_ENV"
|
||||
echo "INSTALL_TEST_DIR=$GITHUB_WORKSPACE/install/tests" >> "$GITHUB_ENV"
|
||||
echo "MODELS_SHARE_PATH=/mount/onnxtestdata$((GITHUB_RUN_NUMBER % NUMBER_OF_REPLICAS))" >> "$GITHUB_ENV"
|
||||
echo $MODELS_SHARE_PATH
|
||||
|
||||
- name: Extract OpenVINO packages
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ jobs:
|
|||
CMAKE_C_COMPILER_LAUNCHER: sccache
|
||||
SCCACHE_IGNORE_SERVER_IO_ERROR: 1
|
||||
SCCACHE_SERVER_PORT: 35555
|
||||
SCCACHE_IDLE_TIMEOUT: 0
|
||||
OPENVINO_REPO: "${{ github.workspace }}\\openvino"
|
||||
OPENVINO_CONTRIB_REPO: "${{ github.workspace }}\\openvino_contrib"
|
||||
INSTALL_DIR: "${{ github.workspace }}\\openvino_install"
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ jobs:
|
|||
CMAKE_C_COMPILER_LAUNCHER: sccache
|
||||
SCCACHE_IGNORE_SERVER_IO_ERROR: 1
|
||||
SCCACHE_SERVER_PORT: 35555
|
||||
SCCACHE_IDLE_TIMEOUT: 0
|
||||
OPENVINO_REPO: "${{ github.workspace }}\\openvino"
|
||||
INSTALL_DIR: "${{ github.workspace }}\\openvino_install"
|
||||
INSTALL_TEST_DIR: "${{ github.workspace }}\\tests_install"
|
||||
|
|
@ -263,6 +264,7 @@ jobs:
|
|||
CMAKE_C_COMPILER_LAUNCHER: sccache
|
||||
SCCACHE_IGNORE_SERVER_IO_ERROR: 1
|
||||
SCCACHE_SERVER_PORT: 35555
|
||||
SCCACHE_IDLE_TIMEOUT: 0
|
||||
OPENVINO_REPO: "${{ github.workspace }}\\openvino"
|
||||
BUILD_DIR: "${{ github.workspace }}\\openvino_build"
|
||||
MODELS_PATH: "${{ github.workspace }}\\testdata"
|
||||
|
|
|
|||
|
|
@ -270,7 +270,6 @@ class CustomBuild(build):
|
|||
self.spawn(["cmake", "--install", binary_dir,
|
||||
"--prefix", prefix,
|
||||
"--config", CONFIG,
|
||||
"--strip",
|
||||
"--component", cpack_comp_name])
|
||||
|
||||
def run(self):
|
||||
|
|
|
|||
|
|
@ -356,7 +356,10 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
|
|||
# see https://protobuf.dev/support/version-support/ and
|
||||
# https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa
|
||||
find_package(Protobuf 4.22.0 QUIET CONFIG)
|
||||
if(NOT Protobuf_FOUND)
|
||||
if(Protobuf_FOUND)
|
||||
# protobuf was found via CONFIG mode, let's save it for later usage in OpenVINOConfig.cmake static build
|
||||
set(protobuf_config CONFIG)
|
||||
else()
|
||||
if(OV_VCPKG_BUILD)
|
||||
set(protobuf_config CONFIG)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Reference in New Issue