Skip to content

Commit

Permalink
Update openvino to 2022.3.0 (#654)
Browse files Browse the repository at this point in the history
Signed-off-by: 靳伟昭 10307459 <jin.weizhao@zte.com.cn>
  • Loading branch information
JinXiaozhao committed Mar 6, 2023
1 parent 55cd85e commit c1cfc51
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 378 deletions.
5 changes: 3 additions & 2 deletions adlik_serving/runtime/openvino/model/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ serving_cc_library(
"ir_model.h",
"openvino_util.h",
],
linkopts = [
"-lopenvino",
],
deps = [
"//adlik_serving/framework/domain:dims_list",
"//adlik_serving/framework/domain:model_config_helper",
Expand All @@ -22,8 +25,6 @@ serving_cc_library(
"//adlik_serving/runtime/provider:predict_request_provider",
"//adlik_serving/runtime/provider:predict_response_provider",
"//cub/log",
"@local_config_openvino//:ie_headers",
"@local_config_openvino//:libopenvino",
"@org_tensorflow//tensorflow/core:lib",
],
)
3 changes: 0 additions & 3 deletions adlik_serving/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ Adlik serving dependencies
"""

load("@org_tensorflow//tensorflow:version_check.bzl", "check_bazel_version_at_least")
load("//third_party/openvino:openvino_configure.bzl", "openvino_configure")

def adlik_serving_workspace():
"""All Adlik serving external dependencies."""

check_bazel_version_at_least(minimum_bazel_version = "3.7.2")

openvino_configure(name = "local_config_openvino")
2 changes: 0 additions & 2 deletions ci/azure-pipelines/jobs/bazel-build-serving-openvino.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
key: bazel-build-serving-openvino
path: $(BAZEL_BUILD_CACHE)
- script: |
export INTEL_CVSDK_DIR=/opt/intel/openvino_2022
export InferenceEngine_DIR=$INTEL_CVSDK_DIR/runtime/cmake
ci/checks/bazel-build-serving.py \
--config=openvino \
-c opt \
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines/steps/install-openvino.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ steps:
. /etc/os-release
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | sudo apt-key add -
sudo apt-add-repository -u "deb https://apt.repos.intel.com/openvino/2022 $VERSION_CODENAME main"
sudo apt-get install --no-install-recommends -y "libopenvino-dev-2022.1.0"
sudo apt-get install --no-install-recommends -y "libopenvino-dev-2022.3.0"
displayName: Install OpenVINO libraries
2 changes: 1 addition & 1 deletion docker-images/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
_UBUNTU_VERSION = 'focal'
_TENSORRT_VERSION = '8.4.3.1'
_CUDA_VERSION = '11.6'
_OPENVINO_VERSION = '2022.3.0.dev20221103'
_OPENVINO_VERSION = '2022.3.0'

_IMAGES = {
'model-compiler': {'OPENVINO_VERSION': _OPENVINO_VERSION, 'TENSORRT_VERSION': _TENSORRT_VERSION.rpartition('.')[0],
Expand Down
16 changes: 9 additions & 7 deletions docker-images/dockerfiles/serving-openvino.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ COPY script/opencl.sh /script/opencl.sh
ARG OPENVINO_VERSION

RUN apt-get update && \
apt-get install --no-install-recommends -y ca-certificates wget curl && \
apt-get install --no-install-recommends -y ca-certificates wget && \
wget 'https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB' -O /etc/apt/trusted.gpg.d/openvino.asc && \
apt-get autoremove --purge -y wget && \
apt-get clean && \
find /var/lib/apt/lists -delete

RUN apt-get update && \
apt-get install --no-install-recommends -y curl && \
bash /script/opencl.sh && rm /script/opencl.sh && \
apt-get autoremove --purge -y wget curl && \
apt-get autoremove --purge -y curl && \
apt-get clean && \
find /var/lib/apt/lists -delete

Expand Down Expand Up @@ -57,9 +63,7 @@ COPY . /src

WORKDIR /src

RUN env INTEL_CVSDK_DIR="/opt/intel/openvino_2022" \
InferenceEngine_DIR="/opt/intel/openvino_2022/runtime/cmake" \
PYTHON_BIN_PATH=/usr/bin/python3 \
RUN env PYTHON_BIN_PATH=/usr/bin/python3 \
bazel build --config=openvino -c opt //adlik_serving

# Runtime.
Expand All @@ -76,7 +80,5 @@ RUN apt-get update && \

COPY --from=builder /src/bazel-bin/adlik_serving/adlik_serving /usr/local/bin/adlik-serving

ENV LD_LIBRARY_PATH=/opt/intel/openvino_2022/runtime/lib/intel64:/opt/intel/openvino_2022/runtime/3rdparty/tbb/lib

RUN chmod +x /script/run_server.sh
CMD /script/run_server.sh
8 changes: 4 additions & 4 deletions model_compiler/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ def run(self):
'onnxruntime==1.13.1',
'onnxruntime-gpu==1.13.1',
'opencv-python==4.6.0.66',
'openvino==2022.3.0.dev20221103',
'openvino-dev==2022.3.0.dev20221103',
'openvino-telemetry==2022.1.1',
'openvino==2022.3.0',
'openvino-dev==2022.3.0',
'openvino-telemetry==2022.3.0',
'opt-einsum==3.3.0',
'paddle-bfloat==0.1.7',
'paddle2onnx==1.0.0',
'paddlepaddle==2.4.0',
'pandas==1.1.5',
'pandas~=1.3.5',
'Pillow==9.3.0',
'progress==1.6',
'protobuf==3.19.1',
Expand Down
Empty file removed third_party/openvino/BUILD
Empty file.
201 changes: 0 additions & 201 deletions third_party/openvino/LICENSE

This file was deleted.

8 changes: 0 additions & 8 deletions third_party/openvino/build_defs.bzl.tpl

This file was deleted.

Loading

0 comments on commit c1cfc51

Please sign in to comment.