diff --git a/dockerfiles/Dockerfile.openvino b/dockerfiles/Dockerfile.openvino index 21b67bb434..b449ea1194 100644 --- a/dockerfiles/Dockerfile.openvino +++ b/dockerfiles/Dockerfile.openvino @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT #-------------------------------------------------------------------------- -ARG OPENVINO_VERSION=2021.4 +ARG OPENVINO_VERSION=2021.4.1 # Build stage diff --git a/dockerfiles/Dockerfile.openvino-centos7 b/dockerfiles/Dockerfile.openvino-centos7 index f79c0e1673..af14da9e64 100755 --- a/dockerfiles/Dockerfile.openvino-centos7 +++ b/dockerfiles/Dockerfile.openvino-centos7 @@ -8,12 +8,12 @@ FROM centos:7.8.2003 WORKDIR /code ARG MY_ROOT=/code -ARG YUM_OV_PACKAGE=intel-openvino-runtime-centos7-2021.4.582.x86_64 +ARG YUM_OV_PACKAGE=intel-openvino-runtime-centos7-2021.4.689.x86_64 ARG DEVICE=CPU_FP32 ARG ONNXRUNTIME_REPO=https://github.com/microsoft/onnxruntime ARG ONNXRUNTIME_BRANCH=master -ENV INTEL_OPENVINO_DIR=/opt/intel/openvino_2021.4.582 +ENV INTEL_OPENVINO_DIR=/opt/intel/openvino_2021.4.689 ENV InferenceEngine_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/share ENV IE_PLUGINS_PATH=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64 ENV ngraph_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/ngraph/cmake @@ -58,7 +58,7 @@ RUN yum update -y && \ yum update -y && yum list intel-openvino* && \ yum install -y $YUM_OV_PACKAGE && \ cd ${INTEL_OPENVINO_DIR}/install_dependencies/ && ./install_openvino_dependencies.sh -y && \ - printf "\nexport LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:/usr/local/lib\n" >> /opt/intel/openvino_2021.4.582/bin/setupvars.sh && \ + printf "\nexport LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:/usr/local/lib\n" >> /opt/intel/openvino_2021.4.689/bin/setupvars.sh && \ cd /opt/libusb-1.0.22 && \ /usr/bin/install -c -m 644 libusb-1.0.pc '/usr/local/lib/pkgconfig' && \ cp /opt/intel/openvino_2021/deployment_tools/inference_engine/external/97-myriad-usbboot.rules /etc/udev/rules.d/ && \ diff --git a/dockerfiles/Dockerfile.openvino-csharp b/dockerfiles/Dockerfile.openvino-csharp index a6d1c71040..cbbf52483c 100644 --- a/dockerfiles/Dockerfile.openvino-csharp +++ b/dockerfiles/Dockerfile.openvino-csharp @@ -15,7 +15,7 @@ ARG MY_ROOT=/code ENV PATH /opt/miniconda/bin:/code/cmake-3.21.0-linux-x86_64/bin:$PATH ENV LD_LIBRARY_PATH=/opt/miniconda/lib:/usr/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH -ENV INTEL_OPENVINO_DIR=/opt/intel/openvino_2021.4.582 +ENV INTEL_OPENVINO_DIR=/opt/intel/openvino_2021.4.689 ENV InferenceEngine_DIR=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/share ENV IE_PLUGINS_PATH=${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64 ENV LD_LIBRARY_PATH=/opt/intel/opencl:${INTEL_OPENVINO_DIR}/inference_engine/external/gna/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/mkltiny_lnx/lib:$INTEL_OPENVINO_DIR/deployment_tools/ngraph/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/omp/lib:${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}:${LD_LIBRARY_PATH} @@ -54,7 +54,7 @@ RUN apt update -y && \ cd /etc/apt/sources.list.d && \ echo "deb https://apt.repos.intel.com/openvino/2021 all main">intel-openvino-2021.list && \ apt update -y && \ - apt -y install intel-openvino-dev-ubuntu18-2021.4.582 && \ + apt -y install intel-openvino-dev-ubuntu18-2021.4.689 && \ cd ${INTEL_OPENVINO_DIR}/install_dependencies && ./install_openvino_dependencies.sh -y && \ cd ${INTEL_OPENVINO_DIR} && rm -rf documentation data_processing && \ cd deployment_tools/ && rm -rf model_optimizer open_model_zoo demo tools && \ @@ -112,4 +112,4 @@ RUN apt update -y && \ apt remove -y git && apt autoremove -y && apt remove -y cmake && \ cd /usr/lib/ && rm -rf python2.7 python3.7 python3.8 && \ cd && rm -rf .cache && \ - cd /usr/share/python-wheels/ && rm -rf *.whl \ No newline at end of file + cd /usr/share/python-wheels/ && rm -rf *.whl diff --git a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc index 702235396f..f6472a276e 100644 --- a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc +++ b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc @@ -104,7 +104,6 @@ std::vector supported_op_mode = { {"GlobalLpPool", V_2020_4, {"CPU", "GPU"}}, {"Greater", V_2020_4, {"All"}}, {"Identity", V_2020_4, {"All"}}, - {"ImageScaler", V_2021_4, {"All"}}, {"InstanceNormalization", V_2020_4, {"All"}}, {"HardSigmoid", V_2020_4, {"CPU", "GPU"}}, {"LeakyRelu", V_2020_4, {"All"}}, diff --git a/onnxruntime/test/perftest/command_args_parser.cc b/onnxruntime/test/perftest/command_args_parser.cc index 7ad02d7b32..5b7f76d92e 100644 --- a/onnxruntime/test/perftest/command_args_parser.cc +++ b/onnxruntime/test/perftest/command_args_parser.cc @@ -59,7 +59,7 @@ namespace perftest { "\t [OpenVINO only] [device_type]: Overrides the accelerator hardware type and precision with these values at runtime.\n" "\t [OpenVINO only] [device_id]: Selects a particular hardware device for inference.\n" "\t [OpenVINO only] [enable_vpu_fast_compile]: Optionally enabled to speeds up the model's compilation on VPU device targets.\n" - "\t [OpenVINO only] [num_of_threads]: Overrides the accelerator hardware type and precision with these values at runtime.\n" + "\t [OpenVINO only] [num_of_threads]: Overrides the accelerator default value of number of threads with this value at runtime. If this option is not explicitly set, default value of 8 is used during build time.\n" "\t [OpenVINO only] [use_compiled_network]: Can be enabled to directly import pre-compiled blobs if exists. currently this feature is only supported on MyriadX(VPU) hardware device target.\n" "\t [OpenVINO only] [blob_dump_path]: Explicitly specify the path where you would like to dump and load the blobs for the use_compiled_network(save/load blob) feature. This overrides the default path.\n" "\t [Usage]: -e -i '| |'\n\n" diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino index e988155c5f..eb46ecebdc 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino @@ -12,7 +12,7 @@ RUN apt update && apt install -y libnuma1 ocl-icd-libopencl1 && \ WORKDIR /root -ENV INTEL_OPENVINO_DIR /opt/intel/openvino_${OPENVINO_VERSION}.582 +ENV INTEL_OPENVINO_DIR /opt/intel/openvino_${OPENVINO_VERSION}.689 ENV LD_LIBRARY_PATH $INTEL_OPENVINO_DIR/deployment_tools/inference_engine/lib/intel64:$INTEL_OPENVINO_DIR/deployment_tools/ngraph/lib:$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/external/tbb/lib:/usr/local/openblas/lib:$LD_LIBRARY_PATH ENV InferenceEngine_DIR $INTEL_OPENVINO_DIR/deployment_tools/inference_engine/share ENV ngraph_DIR $INTEL_OPENVINO_DIR/deployment_tools/ngraph/cmake @@ -26,7 +26,7 @@ RUN wget https://apt.repos.intel.com/openvino/2021/GPG-PUB-KEY-INTEL-OPENVINO-20 cd /etc/apt/sources.list.d && \ echo "deb https://apt.repos.intel.com/openvino/2021 all main">intel-openvino-2021.list && \ apt update && \ - apt install -y intel-openvino-dev-ubuntu18-2021.4.582 && \ + apt install -y intel-openvino-dev-ubuntu18-2021.4.689 && \ cd ${INTEL_OPENVINO_DIR}/install_dependencies && ./install_openvino_dependencies.sh -y RUN wget https://github.com/intel/compute-runtime/releases/download/19.41.14441/intel-gmmlib_19.3.2_amd64.deb && \