From 0997089737b1c9cb6056367845896540fde5e5d9 Mon Sep 17 00:00:00 2001 From: saurabhintel0 Date: Mon, 26 Jun 2023 20:57:17 +0530 Subject: [PATCH 1/3] ovep dockerfile and wheel docs changes --- docs/python/ReadMeOV.rst | 4 +--- .../github/linux/docker/Dockerfile.ubuntu_openvino | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/python/ReadMeOV.rst b/docs/python/ReadMeOV.rst index 3942195732f8..a19aa0e86dc8 100644 --- a/docs/python/ReadMeOV.rst +++ b/docs/python/ReadMeOV.rst @@ -20,6 +20,7 @@ Requirements This package supports: - Intel® CPUs - Intel® integrated GPUs + - Intel® discrete GPUs ``pip3 install onnxruntime-openvino`` @@ -28,9 +29,6 @@ For installation instructions on Windows please refer to `OpenVINO™ Execution **OpenVINO™ Execution Provider for ONNX Runtime** Linux Wheels comes with pre-built libraries of OpenVINO™ version 2023.0.0 eliminating the need to install OpenVINO™ separately. The OpenVINO™ libraries are prebuilt with CXX11_ABI flag set to 0. -The package also includes module that is used by torch-ort-inference to accelerate inference for PyTorch models with OpenVINO Execution Provider. -See `torch-ort-inference `_ for more details. - For more details on build and installation please refer to `Build `_. Usage diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino index 4ef5a8886480..86d513a4f767 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino @@ -1,7 +1,7 @@ ARG UBUNTU_VERSION=20.04 FROM ubuntu:${UBUNTU_VERSION} -ARG OPENVINO_VERSION=2022.3.0 +ARG OPENVINO_VERSION=2023.0.0 ARG PYTHON_VERSION=3.8 ADD scripts /tmp/scripts @@ -20,9 +20,9 @@ ENV IE_PLUGINS_PATH $INTEL_OPENVINO_DIR/runtime/lib/intel64 ENV DEBIAN_FRONTEND=noninteractive RUN cd /opt && mkdir -p intel && cd intel && \ - wget https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/linux/l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64.tgz && \ - tar xzf l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64.tgz && rm -rf l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64.tgz && \ - mv l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64 openvino_2022.3.0 && \ + wget https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/linux/l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz && \ + tar xzf l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz && rm -rf l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz && \ + mv l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64 openvino_2023.0.0 && \ cd $INTEL_OPENVINO_DIR/install_dependencies && ./install_openvino_dependencies.sh -y WORKDIR /root From 12bf283249ae2c3b7c18a7770143f9ca2cafef09 Mon Sep 17 00:00:00 2001 From: saurabhintel0 Date: Thu, 6 Jul 2023 17:50:24 +0530 Subject: [PATCH 2/3] change OpenVINO version to 2023.0.0 in linux-openvino-ci-pipeline.yml --- .../github/azure-pipelines/linux-openvino-ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/linux-openvino-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-openvino-ci-pipeline.yml index a1bbec12d180..68ea7338dc06 100644 --- a/tools/ci_build/github/azure-pipelines/linux-openvino-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-openvino-ci-pipeline.yml @@ -3,7 +3,7 @@ jobs: parameters: AgentPool : 'Linux-CPU-2019' JobName: 'Linux_CI_Dev' - RunDockerBuildArgs: '-o ubuntu20.04 -d openvino -v 2022.3.0 -x "--use_openvino CPU_FP32 --build_wheel"' + RunDockerBuildArgs: '-o ubuntu20.04 -d openvino -v 2023.0.0 -x "--use_openvino CPU_FP32 --build_wheel"' DoNugetPack: 'false' ArtifactName: 'drop-linux' TimeoutInMinutes: 120 From 83833d4fe495f5a4f586e0a9ba7191d3c6ed82aa Mon Sep 17 00:00:00 2001 From: saurabhintel0 Date: Fri, 14 Jul 2023 16:16:17 +0530 Subject: [PATCH 3/3] fix layernormalization unit test --- onnxruntime/core/providers/openvino/ov_versions/data_ops.cc | 2 +- onnxruntime/core/providers/openvino/ov_versions/utils.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc index 30ba5a319830..a87e0a669dc6 100644 --- a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc +++ b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc @@ -41,6 +41,7 @@ std::set ops_supported_only_in_model = { "GatherElements", "GatherND", "Identity", + "LayerNormalization", "Loop", "LSTM", "NonMaxSuppression", @@ -162,7 +163,6 @@ std::vector supported_op_mode = { {"InstanceNormalization", V_2023_0, {"VPUX"}}, {"HardSigmoid", V_2020_4, {"CPU", "GPU"}}, {"HardMax", V_2022_1, {"CPU", "GPU"}}, - {"LayerNormalization", V_2023_0, {"CPU", "GPU"}}, {"LeakyRelu", V_2020_4, {"CPU", "GPU"}}, {"LeakyRelu", V_2023_0, {"VPUX"}}, {"Less", V_2020_4, {"CPU", "GPU"}}, diff --git a/onnxruntime/core/providers/openvino/ov_versions/utils.cc b/onnxruntime/core/providers/openvino/ov_versions/utils.cc index c3b47aae4fa9..53b2c3b460e1 100644 --- a/onnxruntime/core/providers/openvino/ov_versions/utils.cc +++ b/onnxruntime/core/providers/openvino/ov_versions/utils.cc @@ -45,6 +45,7 @@ bool IsOpSupportedOnlyInModel(std::string name) { "Exp", "GatherND", "Identity", + "LayerNormalization", "NonMaxSuppression", "NonZero", "Not",