openvino-inference-engine: update to latest on 2022.3 branch

Brings in support for NumPy 1.24 and support for system installed
OpenCL. Includes a newer version of myriad firmware as well.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 14 insertions, 38 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
index ed488808..86ed2a96 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
@@ -1,17 +1,14 @@
 Yocto specific tweaks to the build process:
-
-* Install python modules to site-packages.
+  
 * Dont try to detect glibc version as that doesn't work when cross compiling.
 * Use shared protobuf and gflags libs.
-* Use system installed ocl headers.
-* We have va.h in recipe-sysroot and having a va.h here leads to failures.
 * Install sample binaries as well.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index 62831fffab..b123bbad75 100644
+index e6c72540288..fec9996db14 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
 @@ -123,4 +123,4 @@ function(ov_glibc_version)
@@ -21,7 +18,7 @@ index 62831fffab..b123bbad75 100644
 -ov_glibc_version()
 +#ov_glibc_version()
 diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-index f27e934793..da51c56cf3 100644
+index 40c29d3c297..f6800592de9 100644
 --- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
 +++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
 @@ -32,5 +32,4 @@ endif()
@@ -32,7 +29,7 @@ index f27e934793..da51c56cf3 100644
 -)
 +    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin)
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index 3a10819c47..d82262a714 100644
+index 1fe54c602e8..01c86d418d9 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
 @@ -230,9 +230,8 @@ macro(ie_add_sample)
@@ -48,7 +45,7 @@ index 3a10819c47..d82262a714 100644
      # create global target with all samples / demo apps
      if(NOT TARGET ie_samples)
 diff --git a/samples/cpp/common/format_reader/CMakeLists.txt b/samples/cpp/common/format_reader/CMakeLists.txt
-index 44d94e8a27..208edd8e4e 100644
+index 7c07bf07dbb..4cd566749e5 100644
 --- a/samples/cpp/common/format_reader/CMakeLists.txt
 +++ b/samples/cpp/common/format_reader/CMakeLists.txt
 @@ -44,5 +44,5 @@ endif()
@@ -58,32 +55,11 @@ index 44d94e8a27..208edd8e4e 100644
 -    LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
 +    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT samples_bin
  )
-diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
-deleted file mode 100644
-index 5c8a5c6f6e..0000000000
---- a/src/plugins/intel_gpu/include/va/va.h
-+++ /dev/null
-@@ -1,6 +0,0 @@
--// Copyright (C) 2018-2022 Intel Corporation
--// SPDX-License-Identifier: Apache-2.0
--//
--
--typedef cl_uint VASurfaceID;
--typedef void* VADisplay;
 diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 98067991a7..bb19b592ee 100644
+index cf2863438c7..3ec5c5ed86b 100644
 --- a/thirdparty/CMakeLists.txt
 +++ b/thirdparty/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS)
- endif()
- 
- if(ENABLE_INTEL_GPU)
--    add_subdirectory(ocl)
-+       #add_subdirectory(ocl)
- endif()
- 
- add_subdirectory(xbyak EXCLUDE_FROM_ALL)
-@@ -187,11 +187,11 @@ endif()
+@@ -268,11 +268,11 @@ endif()
  
  if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL OR ENABLE_TESTS)
      if(LINUX)
@@ -100,7 +76,7 @@ index 98067991a7..bb19b592ee 100644
          find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
      endif()
  
-@@ -248,7 +248,7 @@ endif()
+@@ -329,7 +329,7 @@ endif()
  
  if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
      if(ENABLE_SYSTEM_PROTOBUF)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb
index 2e28ae8f..b1417c17 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb
@@ -5,8 +5,8 @@ deep learning models through a high-level C++ Inference Engine API \
 integrated with application logic."
 
 SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/3;lfs=0 \
-           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_20221129_35.zip;name=usb_ma2x8x \
-           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_20221129_35.zip;name=pcie_ma2x8x \
+           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_usb-ma2x8x_20230121_38.zip;name=usb_ma2x8x \
+           https://storage.openvinotoolkit.org/dependencies/myriad/firmware_pcie-ma2x8x_20230121_38.zip;name=pcie_ma2x8x \
            git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
            git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
            git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
@@ -16,15 +16,15 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=r
            file://cython-cmake.patch \
            "
 
-SRCREV = "9752fafe8ebf7e30dfea7edd447ff3bf0ac1d01d"
+SRCREV = "0a5ca5375265f0f12cdaee68574030408dd1c352"
 SRCREV_mkl = "44de3c3698b687c26e487fc8f0213fa487e8fe2c"
 SRCREV_onednn = "fbec3e25a559ee252022ae066817b204e106a6ba"
 SRCREV_xbyak = "f8ea5c28dfcdc98585881d0ca9e499580ca077ae"
 SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
 SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9"
 
-SRC_URI[usb_ma2x8x.sha256sum] = "1ca3566d294c8d269f3a0ad2f5699e9dbb2679a24a455b2cc343612303d867bd"
-SRC_URI[pcie_ma2x8x.sha256sum] = "5667eb028290fbec92220031590ba5f87774a7b638b13178e0dcf8447a4ee8ca"
+SRC_URI[usb_ma2x8x.sha256sum] = "f7351b2e26f25d652a0539f6ace5797d7700735d52479c3e6ef354c236abbd3a"
+SRC_URI[pcie_ma2x8x.sha256sum] = "439219aeac010f8b85f19838420e9a247f2cdf23a6d00e7727cf92d96dbdaeeb"
 
 LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -75,7 +75,7 @@ COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
 PACKAGECONFIG ?= "vpu opencl"
-PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva,"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp,"
 PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
 PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
 PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"