From cceee569179c10fa56d1fd9c3582f3371944ba59 Mon Sep 17 00:00:00 2001 From: Egor Tyuvaev Date: Mon, 2 Dec 2024 22:23:49 +0100 Subject: [PATCH] openvino/2024.5.0 update (#26037) --- recipes/openvino/all/conandata.yml | 121 +---- recipes/openvino/all/conanfile.py | 4 + .../dependencies/dependencies-2023.2.0.yml | 2 - .../dependencies/dependencies-2024.0.0.yml | 1 - .../dependencies/dependencies-2024.1.0.yml | 1 - .../dependencies/dependencies-2024.2.0.yml | 1 - .../dependencies/dependencies-2024.3.0.yml | 1 - .../dependencies/dependencies-2024.4.0.yml | 1 - .../dependencies/dependencies-2024.5.0.yml | 1 + .../patches/2023.2.0/0001-git-version.patch | 31 -- ...0001-Include-mutex-for-std-call_once.patch | 13 - .../0002-Fix-includes-for-dev-api.patch | 13 - ...port-OpenVINO-compilation-with-cpp20.patch | 501 ------------------ .../patches/2024.1.0/0001-fix-cxxflags.patch | 25 - recipes/openvino/config.yml | 13 +- 15 files changed, 16 insertions(+), 713 deletions(-) delete mode 100644 recipes/openvino/all/dependencies/dependencies-2023.2.0.yml delete mode 100644 recipes/openvino/all/dependencies/dependencies-2024.0.0.yml delete mode 100644 recipes/openvino/all/dependencies/dependencies-2024.1.0.yml delete mode 100644 recipes/openvino/all/dependencies/dependencies-2024.2.0.yml delete mode 100644 recipes/openvino/all/dependencies/dependencies-2024.3.0.yml delete mode 100644 recipes/openvino/all/dependencies/dependencies-2024.4.0.yml create mode 100644 recipes/openvino/all/dependencies/dependencies-2024.5.0.yml delete mode 100644 recipes/openvino/all/patches/2023.2.0/0001-git-version.patch delete mode 100644 recipes/openvino/all/patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch delete mode 100644 recipes/openvino/all/patches/2024.0.0/0002-Fix-includes-for-dev-api.patch delete mode 100644 recipes/openvino/all/patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch delete mode 100644 recipes/openvino/all/patches/2024.1.0/0001-fix-cxxflags.patch diff --git a/recipes/openvino/all/conandata.yml b/recipes/openvino/all/conandata.yml index 92d15e83a5401..6588f70161339 100644 --- a/recipes/openvino/all/conandata.yml +++ b/recipes/openvino/all/conandata.yml @@ -1,84 +1,20 @@ sources: - "2024.4.0": + "2024.5.0": "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.4.0.tar.gz" - sha256: "aeb6297e3e88b4ab7803b27b231a72bd0493b6761ef98f225142146be500f538" + url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.5.0.tar.gz" + sha256: "3d5b89760e1c946aca7b219dff4bf4cf5eb511932863c90cafc47d3c01c85744" "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.08.tar.gz" - sha256: "b3576ffa2a70e7704bdf7febe7109f4cfb416a0178222b58f5ee0fd455980337" + url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.09.tar.gz" + sha256: "49b8620f21cbbe49e825a131d9eacd548532646289b50e070b83860bd88087fe" "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/c8ae8d96e963bd04214858319fa334968e5e73c9.tar.gz" - sha256: "b9c2a53061b4528231ff5fbcee85900d698c329c7977b1f39c5d3d65f29c2caa" + url: "https://github.com/openvinotoolkit/oneDNN/archive/c60a9946aa2386890e5c9f5587974facb7624227.tar.gz" + sha256: "37cea8af9772053fd6d178817f64d59e3aa7de9fd8f1aa21873075bb0664240f" "mlas": url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz" sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c" "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/4ccd07e3a10e1c08075cf824ac14708245fbc334.tar.gz" - sha256: "4782d7cfd06ae6f782f1f99a62b7937e38a0d4b879a4e33f740a0602e610c86c" - "2024.3.0": - "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.3.0.tar.gz" - sha256: "53fccad05279d0975eca84ec75517a7c360be9b0f7bcd822da29a7949c12ce70" - "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.06.tar.gz" - sha256: "68e24589905638e406a98ad48236097ab30112f2849b35e196b7b1efb0ce74e6" - "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/f0f8defe2dff5058391f2a66e775e20b5de33b08.tar.gz" - sha256: "13bee5b8522177f297e095e3eba5948c1a7ee7a816d19d5a59ce0f717f82cedc" - "mlas": - url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz" - sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c" - "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/7ab8ee9adda866d675edeee7a3a6a29b2d0a1572.tar.gz" - sha256: "66363988363744e49fff55f4fcdb72318ff3f35fba6da68302c1662c837c22ac" - "2024.2.0": - "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.2.0.tar.gz" - sha256: "b624481efb7814cf2d98a29163c3b914fa2f23c1417289b13561d0b5e32fc67c" - "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.04.tar.gz" - sha256: "6d7aebfa9be74d29ecd2dbeb17f69e00c667c36292401f210121bf26a30b38a5" - "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/373e65b660c0ba274631cf30c422f10606de1618.tar.gz" - sha256: "c205b81f9024952c742e765090556a18c9463fff245753a2afa42c344bd6379d" - "mlas": - url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz" - sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c" - "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/37f48519b87cf8b5e5ef2209340a1948c3e87d72.tar.gz" - sha256: "58131e094408460f88bf941977b5206232dc2bc8dbf227250d1e2236b43153a5" - "2024.1.0": - "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.1.0.tar.gz" - sha256: "b298a91b5aae252ef9883e0f2017e88677be88a9839b1aa2f6e9f70067d98ce6" - "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.02.1.tar.gz" - sha256: "590d5cb710355bce2ddfe7117529c2f492cd253b548f709bbfe84702203d99c8" - "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/26633ae49edd4353a29b7170d9fcef6b2d79f4b3.tar.gz" - sha256: "3cd4a2aea30cd6ca689e63545cf986f8e83c88333b73d42bb750fcaf08940b17" - "mlas": - url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz" - sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c" - "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/4e6ff043c439652fcf6c400ac4e0c81bbac7c71c.tar.gz" - sha256: "c3543d560fbbb7297df91c191cc9bf682322c5554302e256f1bf4a757424a331" - "2024.0.0": - "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.0.0.tar.gz" - sha256: "b3c257f8af9545ae68a6ea217173b2b2de9dd42d35e8703a7a51d76f4c2bfe2f" - "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.08.tar.gz" - sha256: "62f514a555409d4401e5250b290cdf8cf1676e4eb775e5bd61ea6a740a8ce24f" - "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/f82148befdbdc9576ec721c9d500155ee4de8060.tar.gz" - sha256: "7fce5c6b499ffe1a30c26b2d4e4a5193a38aa217b6f54e44eea52b21cf38a684" - "mlas": - url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz" - sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c" - "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/494af5f9921bdae98f1a0e2955fa7d76ff386c4f.tar.gz" - sha256: "e2f36563cecf39197ad8d4f8b351ccc5a431085dad26e47c0ae6f0bb79149df7" + url: "https://github.com/oneapi-src/oneDNN/archive/1722066ad4c0f15495f2d0fcbe9deb2bfd188c36.tar.gz" + sha256: "8955f19800066d8a705df2eb8b462085d6142b4f771ff88ae196e59a0d4ab1bb" "2023.3.0": "openvino": url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.3.0.tar.gz" @@ -95,43 +31,4 @@ sources: "onednn_gpu": url: "https://github.com/oneapi-src/oneDNN/archive/cb77937ffcf5e83b5d1cf2940c94e8b508d8f7b4.tar.gz" sha256: "2ca304c033786aa5c3ec1ec6f8fc3936ae5c6874d5964b586311da11bec2ec4a" - "2023.2.0": - "openvino": - url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.2.0.tar.gz" - sha256: "419b3137a1a549fc5054edbba5b71da76cbde730e8a271769126e021477ad47b" - "arm_compute": - url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.08.tar.gz" - sha256: "62f514a555409d4401e5250b290cdf8cf1676e4eb775e5bd61ea6a740a8ce24f" - "onednn_cpu": - url: "https://github.com/openvinotoolkit/oneDNN/archive/2ead5d4fe5993a797d9a7a4b8b5557b96f6ec90e.tar.gz" - sha256: "3c51d577f9e7e4cbd94ad08d267502953ec64513241dda6595b2608fafc8314c" - "mlas": - url: "https://github.com/openvinotoolkit/mlas/archive/f6425b1394334822390fcd9da12788c9cd0d11da.tar.gz" - sha256: "707a6634d62ea5563042a67161472b4be3ffe73c9783719519abdd583b0295f4" - "onednn_gpu": - url: "https://github.com/oneapi-src/oneDNN/archive/284ad4574939fa784e4ddaa1f4aa577b8eb7a017.tar.gz" - sha256: "16f36078339cd08b949efea1d863344cb0b742d9f5898937d07a591b0c4da517" patches: - "2024.1.0": - - patch_file: "patches/2024.1.0/0001-fix-cxxflags.patch" - patch_description: "Fix build failure when explicitly passing different gcc ABI via cxx flags" - patch_type: "portability" - patch_source: "https://github.com/openvinotoolkit/openvino/pull/24274" - "2024.0.0": - - patch_file: "patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch" - patch_description: "Include mutex for std::call_once" - patch_type: "portability" - patch_source: "https://github.com/openvinotoolkit/openvino/pull/23151" - - patch_file: "patches/2024.0.0/0002-Fix-includes-for-dev-api.patch" - patch_description: "Include tensor for dev api" - patch_type: "portability" - patch_source: "https://github.com/openvinotoolkit/openvino/pull/23175" - - patch_file: "patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch" - patch_description: "Add support to OpenVINO to build it with standards newer than cpp11" - patch_type: "portability" - patch_source: "https://github.com/openvinotoolkit/openvino/pull/22784" - "2023.2.0": - - patch_file: "patches/2023.2.0/0001-git-version.patch" - patch_description: "Fixed issue with version on Windows" - patch_type: "portability" - patch_source: "https://github.com/openvinotoolkit/openvino/pull/19628" diff --git a/recipes/openvino/all/conanfile.py b/recipes/openvino/all/conanfile.py index 8e6af66ae2c3f..22e7d61400801 100644 --- a/recipes/openvino/all/conanfile.py +++ b/recipes/openvino/all/conanfile.py @@ -11,6 +11,7 @@ required_conan_version = ">=1.60.0 <2.0 || >=2.0.8" + class OpenvinoConan(ConanFile): name = "openvino" @@ -226,6 +227,8 @@ def generate(self): toolchain.cache_variables["ENABLE_OV_TF_LITE_FRONTEND"] = self.options.enable_tf_lite_frontend toolchain.cache_variables["ENABLE_OV_ONNX_FRONTEND"] = self.options.enable_onnx_frontend toolchain.cache_variables["ENABLE_OV_PYTORCH_FRONTEND"] = self.options.enable_pytorch_frontend + if Version(self.version) >= "2024.3.0": + toolchain.cache_variables["ENABLE_OV_JAX_FRONTEND"] = False # Dependencies toolchain.cache_variables["ENABLE_SYSTEM_TBB"] = True toolchain.cache_variables["ENABLE_TBBBIND_2_5"] = False @@ -418,3 +421,4 @@ def package_info(self): openvino_tensorflow_lite.set_property("cmake_target_name", "openvino::frontend::tensorflow_lite") openvino_tensorflow_lite.libs = ["openvino_tensorflow_lite_frontend"] openvino_tensorflow_lite.requires = ["Runtime", "flatbuffers::flatbuffers"] + diff --git a/recipes/openvino/all/dependencies/dependencies-2023.2.0.yml b/recipes/openvino/all/dependencies/dependencies-2023.2.0.yml deleted file mode 100644 index aaa60d5c30197..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2023.2.0.yml +++ /dev/null @@ -1,2 +0,0 @@ -onnx: "1.14.1" -ade: "0.1.2d" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.0.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.0.0.yml deleted file mode 100644 index f99604741682a..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2024.0.0.yml +++ /dev/null @@ -1 +0,0 @@ -onnx: "1.15.0" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.1.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.1.0.yml deleted file mode 100644 index f99604741682a..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2024.1.0.yml +++ /dev/null @@ -1 +0,0 @@ -onnx: "1.15.0" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.2.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.2.0.yml deleted file mode 100644 index f99604741682a..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2024.2.0.yml +++ /dev/null @@ -1 +0,0 @@ -onnx: "1.15.0" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.3.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.3.0.yml deleted file mode 100644 index f99604741682a..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2024.3.0.yml +++ /dev/null @@ -1 +0,0 @@ -onnx: "1.15.0" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.4.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.4.0.yml deleted file mode 100644 index 8cd1d9ccc3564..0000000000000 --- a/recipes/openvino/all/dependencies/dependencies-2024.4.0.yml +++ /dev/null @@ -1 +0,0 @@ -onnx: "1.16.0" diff --git a/recipes/openvino/all/dependencies/dependencies-2024.5.0.yml b/recipes/openvino/all/dependencies/dependencies-2024.5.0.yml new file mode 100644 index 0000000000000..8885f88a6f2fb --- /dev/null +++ b/recipes/openvino/all/dependencies/dependencies-2024.5.0.yml @@ -0,0 +1 @@ +onnx: "1.16.2" \ No newline at end of file diff --git a/recipes/openvino/all/patches/2023.2.0/0001-git-version.patch b/recipes/openvino/all/patches/2023.2.0/0001-git-version.patch deleted file mode 100644 index 36844097643e0..0000000000000 --- a/recipes/openvino/all/patches/2023.2.0/0001-git-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/cmake/developer_package/version.cmake b/cmake/developer_package/version.cmake -index 1b71befe44..b78f44995a 100644 ---- a/cmake/developer_package/version.cmake -+++ b/cmake/developer_package/version.cmake -@@ -5,7 +5,7 @@ - find_package(Git QUIET) - - function(ov_branch_name VAR REPO_ROOT) -- if(GIT_FOUND) -+ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${REPO_ROOT} -@@ -16,7 +16,7 @@ function(ov_branch_name VAR REPO_ROOT) - endfunction() - - function(ov_commit_hash VAR REPO_ROOT) -- if(GIT_FOUND) -+ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-parse --short=11 HEAD - WORKING_DIRECTORY ${REPO_ROOT} -@@ -27,7 +27,7 @@ function(ov_commit_hash VAR REPO_ROOT) - endfunction() - - function(ov_commit_number VAR REPO_ROOT) -- if(GIT_FOUND) -+ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-list --count --first-parent HEAD - WORKING_DIRECTORY ${REPO_ROOT} diff --git a/recipes/openvino/all/patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch b/recipes/openvino/all/patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch deleted file mode 100644 index 6c0e89e765f9f..0000000000000 --- a/recipes/openvino/all/patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/inference/src/dev/make_tensor.cpp b/src/inference/src/dev/make_tensor.cpp -index e34497749a..f28c90ccf4 100644 ---- a/src/inference/src/dev/make_tensor.cpp -+++ b/src/inference/src/dev/make_tensor.cpp -@@ -5,6 +5,7 @@ - #include "openvino/runtime/make_tensor.hpp" - - #include -+#include - - #include "openvino/runtime/iremote_tensor.hpp" - #include "openvino/runtime/properties.hpp" - diff --git a/recipes/openvino/all/patches/2024.0.0/0002-Fix-includes-for-dev-api.patch b/recipes/openvino/all/patches/2024.0.0/0002-Fix-includes-for-dev-api.patch deleted file mode 100644 index 1e33d8172c049..0000000000000 --- a/recipes/openvino/all/patches/2024.0.0/0002-Fix-includes-for-dev-api.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/inference/src/dev/make_tensor.cpp b/src/inference/src/dev/make_tensor.cpp -index f28c90ccf4..e457b81fc0 100644 ---- a/src/inference/src/dev/make_tensor.cpp -+++ b/src/inference/src/dev/make_tensor.cpp -@@ -9,6 +9,7 @@ - - #include "openvino/runtime/iremote_tensor.hpp" - #include "openvino/runtime/properties.hpp" -+#include "openvino/runtime/tensor.hpp" - #ifdef PROXY_PLUGIN_ENABLED - # include "openvino/proxy/plugin.hpp" - #endif - diff --git a/recipes/openvino/all/patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch b/recipes/openvino/all/patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch deleted file mode 100644 index 52337a8f822c9..0000000000000 --- a/recipes/openvino/all/patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch +++ /dev/null @@ -1,501 +0,0 @@ -diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml -index 4f2d7d8ec9..f74802072c 100644 ---- a/.github/workflows/linux_conditional_compilation.yml -+++ b/.github/workflows/linux_conditional_compilation.yml -@@ -152,6 +152,7 @@ jobs: - run: | - cmake \ - -G "${{ env.CMAKE_GENERATOR }}" \ -+ -DCMAKE_CXX_STANDARD=20 \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_TESTS=ON \ - -DENABLE_CPPLINT=OFF \ -diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml -index 6a47f620e7..ead6c37c87 100644 ---- a/.github/workflows/windows_conditional_compilation.yml -+++ b/.github/workflows/windows_conditional_compilation.yml -@@ -147,6 +147,7 @@ jobs: - run: | - cmake -G "${{ env.CMAKE_GENERATOR }}" ` - -DBUILD_SHARED_LIBS=OFF ` -+ -DCMAKE_CXX_STANDARD=20 ` - -DENABLE_TESTS=ON ` - -DENABLE_CPPLINT=OFF ` - -DENABLE_NCC_STYLE=OFF ` -diff --git a/docs/snippets/CMakeLists.txt b/docs/snippets/CMakeLists.txt -index 89c39d706d..415f1dea88 100644 ---- a/docs/snippets/CMakeLists.txt -+++ b/docs/snippets/CMakeLists.txt -@@ -15,6 +15,10 @@ if(UNUSED_BUT_SET_VARIABLE_SUPPORTED) - ov_add_compiler_flags(-Wno-unused-but-set-variable) - endif() - -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() -+ - file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c") -diff --git a/samples/cpp/hello_classification/main.cpp b/samples/cpp/hello_classification/main.cpp -index b0624b9a54..940ab918dd 100644 ---- a/samples/cpp/hello_classification/main.cpp -+++ b/samples/cpp/hello_classification/main.cpp -@@ -28,7 +28,8 @@ int tmain(int argc, tchar* argv[]) { - - // -------- Parsing and validation of input arguments -------- - if (argc != 4) { -- slog::info << "Usage : " << argv[0] << " " << slog::endl; -+ slog::info << "Usage : " << TSTRING2STRING(argv[0]) << " " -+ << slog::endl; - return EXIT_FAILURE; - } - -diff --git a/src/common/low_precision_transformations/CMakeLists.txt b/src/common/low_precision_transformations/CMakeLists.txt -index 215cb74de0..a325407d82 100644 ---- a/src/common/low_precision_transformations/CMakeLists.txt -+++ b/src/common/low_precision_transformations/CMakeLists.txt -@@ -16,6 +16,9 @@ source_group("src" FILES ${LIBRARY_SRC}) - source_group("include" FILES ${PUBLIC_HEADERS}) - - # Create library -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() - - add_library(${TARGET_NAME}_obj OBJECT - ${LIBRARY_SRC} -diff --git a/src/common/snippets/CMakeLists.txt b/src/common/snippets/CMakeLists.txt -index b3d2db77b7..dcde389cde 100644 ---- a/src/common/snippets/CMakeLists.txt -+++ b/src/common/snippets/CMakeLists.txt -@@ -16,6 +16,9 @@ source_group("src" FILES ${LIBRARY_SRC}) - source_group("include" FILES ${PUBLIC_HEADERS}) - - # Create static library -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() - - add_library(${TARGET_NAME} STATIC - ${LIBRARY_SRC} -diff --git a/src/common/transformations/CMakeLists.txt b/src/common/transformations/CMakeLists.txt -index c4c4ccaa9b..1d398b0054 100644 ---- a/src/common/transformations/CMakeLists.txt -+++ b/src/common/transformations/CMakeLists.txt -@@ -16,6 +16,9 @@ source_group("src" FILES ${LIBRARY_SRC}) - source_group("include" FILES ${PUBLIC_HEADERS}) - - # Create library -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() - - add_library(${TARGET_NAME}_obj OBJECT ${LIBRARY_SRC} ${PUBLIC_HEADERS}) - target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_OPENVINO_API) -diff --git a/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp b/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp -index 0719a5347c..28fa98d324 100644 ---- a/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp -+++ b/src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp -@@ -21,7 +21,7 @@ TRANSFORMATIONS_API bool has_nms_selected_indices(const Node* node); - - TRANSFORMATIONS_API void set_nms_selected_indices(Node* node); - --class TRANSFORMATIONS_API NmsSelectedIndices : ov::RuntimeAttribute { -+class TRANSFORMATIONS_API NmsSelectedIndices : public ov::RuntimeAttribute { - public: - OPENVINO_RTTI("nms_selected_indices", "0"); - NmsSelectedIndices() = default; -diff --git a/src/core/tests/matcher_pass.cpp b/src/core/tests/matcher_pass.cpp -index ae0b6d911c..0ac381a531 100644 ---- a/src/core/tests/matcher_pass.cpp -+++ b/src/core/tests/matcher_pass.cpp -@@ -25,7 +25,7 @@ public: - auto m_relu1 = ov::pass::pattern::wrap_type(pattern::consumers_count(1)); - auto m_relu2 = ov::pass::pattern::wrap_type({m_relu1}); - -- ov::graph_rewrite_callback callback = [=](pattern::Matcher& m) { -+ ov::graph_rewrite_callback callback = [m_relu1, this](pattern::Matcher& m) { - // Map that helps to connect labels with matched outputs - auto& node_to_output = m.get_pattern_value_map(); - -diff --git a/src/frontends/paddle/src/CMakeLists.txt b/src/frontends/paddle/src/CMakeLists.txt -index af0cf0373a..57241ae95a 100644 ---- a/src/frontends/paddle/src/CMakeLists.txt -+++ b/src/frontends/paddle/src/CMakeLists.txt -@@ -2,6 +2,10 @@ - # SPDX-License-Identifier: Apache-2.0 - # - -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() -+ - ov_add_frontend(NAME paddle - LINKABLE_FRONTEND - PROTOBUF_REQUIRED -diff --git a/src/frontends/pytorch/src/CMakeLists.txt b/src/frontends/pytorch/src/CMakeLists.txt -index 814d820b5c..7fb8c4ae50 100644 ---- a/src/frontends/pytorch/src/CMakeLists.txt -+++ b/src/frontends/pytorch/src/CMakeLists.txt -@@ -2,6 +2,10 @@ - # SPDX-License-Identifier: Apache-2.0 - # - -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() -+ - ov_add_frontend(NAME pytorch - LINKABLE_FRONTEND - SHUTDOWN_PROTOBUF -diff --git a/src/frontends/tensorflow/src/variables_index.cpp b/src/frontends/tensorflow/src/variables_index.cpp -index 2dcf3faf9e..3d97022bc6 100644 ---- a/src/frontends/tensorflow/src/variables_index.cpp -+++ b/src/frontends/tensorflow/src/variables_index.cpp -@@ -228,11 +228,11 @@ bool VariablesIndex::read_variables(std::ifstream& vi_stream, const std::wstring - } - if (m_mmap_enabled) { - m_data_files[shard].mmap = load_mmap_object(fullPath); -- FRONT_END_GENERAL_CHECK(m_data_files[shard].mmap->data(), L"Variable index data cannot be mapped"); -+ FRONT_END_GENERAL_CHECK(m_data_files[shard].mmap->data(), "Variable index data cannot be mapped"); - } else { - m_data_files[shard].stream = std::shared_ptr( - new std::ifstream(fullPath.c_str(), std::ifstream::in | std::ifstream::binary)); -- FRONT_END_GENERAL_CHECK(m_data_files[shard].stream->is_open(), L"Variable index data file does not exist"); -+ FRONT_END_GENERAL_CHECK(m_data_files[shard].stream->is_open(), "Variable index data file does not exist"); - } - } - -diff --git a/src/inference/tests/functional/caching_test.cpp b/src/inference/tests/functional/caching_test.cpp -index 1b45c2bd4a..c1a7d685f4 100644 ---- a/src/inference/tests/functional/caching_test.cpp -+++ b/src/inference/tests/functional/caching_test.cpp -@@ -2359,9 +2359,7 @@ TEST_P(CachingTest, LoadBATCHWithConfig) { - EXPECT_CALL(*mockPlugin, get_property(ov::internal::caching_properties.name(), _)).Times(AnyNumber()); - EXPECT_CALL(*mockPlugin, get_property(ov::hint::performance_mode.name(), _)) - .Times(AnyNumber()) -- .WillRepeatedly(Return([] { -- return ov::hint::PerformanceMode::THROUGHPUT; -- })); -+ .WillRepeatedly(Return(ov::hint::PerformanceMode::THROUGHPUT)); - if (m_remoteContext) { - return; // skip the remote Context test for Auto plugin - } -@@ -2490,4 +2488,4 @@ INSTANTIATE_TEST_SUITE_P(CacheTestWithProxyEnabled, - CacheTestWithProxyEnabled, - ::testing::Combine(::testing::ValuesIn(loadVariants), ::testing::ValuesIn(cacheFolders)), - getTestCaseName); --#endif -\ No newline at end of file -+#endif -diff --git a/src/plugins/auto_batch/src/sync_infer_request.cpp b/src/plugins/auto_batch/src/sync_infer_request.cpp -index c766c521ce..707adedc3b 100644 ---- a/src/plugins/auto_batch/src/sync_infer_request.cpp -+++ b/src/plugins/auto_batch/src/sync_infer_request.cpp -@@ -160,4 +160,4 @@ std::vector SyncInferRequest::get_profiling_info() const { - return m_batched_request_wrapper->_infer_request_batched->get_profiling_info(); - } - } // namespace autobatch_plugin --} // namespace ov -\ No newline at end of file -+} // namespace ov -diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt -index 3a15194061..962ba21c0e 100644 ---- a/src/plugins/intel_cpu/CMakeLists.txt -+++ b/src/plugins/intel_cpu/CMakeLists.txt -@@ -8,6 +8,10 @@ endif() - - set(TARGET_NAME "openvino_intel_cpu_plugin") - -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() -+ - if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - # C4267, 4244 issues from oneDNN headers conversion from 'XXX' to 'YYY', possible loss of data - ov_add_compiler_flags(/wd4018) -@@ -205,7 +209,7 @@ if(BUILD_SHARED_LIBS) - $) - - target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $) -- -+ - if(ENABLE_MLAS_FOR_CPU) - target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $) - endif() -diff --git a/src/plugins/intel_cpu/src/cache/multi_cache.h b/src/plugins/intel_cpu/src/cache/multi_cache.h -index 746499bd9b..8225f5ed0f 100644 ---- a/src/plugins/intel_cpu/src/cache/multi_cache.h -+++ b/src/plugins/intel_cpu/src/cache/multi_cache.h -@@ -41,10 +41,14 @@ public: - * Also the builder type is used for the ValueType deduction - * @return result of the operation which is a pair of the requested object of ValType and the status of whether the cache hit or miss occurred - */ -- -- template::type> -- typename CacheEntry::ResultType -- getOrCreate(const KeyType& key, BuilderType builder) { -+ template 201703L)) || (defined(__cplusplus) && (__cplusplus > 201703L)) -+ typename ValueType = std::invoke_result_t> -+#else -+ typename ValueType = typename std::result_of::type> -+#endif -+ typename CacheEntry::ResultType getOrCreate(const KeyType& key, BuilderType builder) { - auto entry = getEntry(); - return entry->getOrCreate(key, std::move(builder)); - } -diff --git a/src/plugins/intel_cpu/src/graph.cpp b/src/plugins/intel_cpu/src/graph.cpp -index 39a72bd80a..e1362e3302 100644 ---- a/src/plugins/intel_cpu/src/graph.cpp -+++ b/src/plugins/intel_cpu/src/graph.cpp -@@ -1093,6 +1093,17 @@ private: - #endif - - #if (OV_THREAD == OV_THREAD_TBB || OV_THREAD == OV_THREAD_TBB_AUTO || OV_THREAD == OV_THREAD_OMP) -+ -+# if (defined(_MSVC_LANG) && (_MSVC_LANG > 201703L)) || (defined(__cplusplus) && (__cplusplus > 201703L)) -+# define ov_memory_order_release std::memory_order_release -+# define ov_memory_order_relaxed std::memory_order_relaxed -+# define ov_memory_order_acquire std::memory_order_acquire -+# else -+# define ov_memory_order_release std::memory_order::memory_order_release -+# define ov_memory_order_relaxed std::memory_order::memory_order_relaxed -+# define ov_memory_order_acquire std::memory_order::memory_order_acquire -+# endif -+ - class UpdateNodesBase : public IUpdateNodes { - public: - explicit UpdateNodesBase(std::vector& executableGraphNodes) : m_executableGraphNodes(executableGraphNodes) {} -@@ -1103,22 +1114,22 @@ public: - if (node->isDynamicNode()) { - node->updateShapes(); - } -- m_prepareCounter.store(i, std::memory_order::memory_order_release); -+ m_prepareCounter.store(i, ov_memory_order_release); - } - } - catch(...) { -- m_completion.store(true, std::memory_order::memory_order_relaxed); -+ m_completion.store(true, ov_memory_order_relaxed); - throw; - } -- m_prepareCounter.store(stop_indx, std::memory_order::memory_order_relaxed); -- m_completion.store(true, std::memory_order::memory_order_release); -+ m_prepareCounter.store(stop_indx, ov_memory_order_relaxed); -+ m_completion.store(true, ov_memory_order_release); - } - - void updateDynParams(size_t node_indx, size_t /*unused*/) { - size_t local_counter = node_indx; - while (true) { -- const bool completion = m_completion.load(std::memory_order::memory_order_acquire); -- const size_t prepareCounter = m_prepareCounter.load(std::memory_order::memory_order_relaxed); -+ const bool completion = m_completion.load(ov_memory_order_acquire); -+ const size_t prepareCounter = m_prepareCounter.load(ov_memory_order_relaxed); - if (completion && local_counter == prepareCounter) { - break; - } -diff --git a/src/plugins/intel_cpu/src/nodes/executors/fullyconnected_implementations.cpp b/src/plugins/intel_cpu/src/nodes/executors/fullyconnected_implementations.cpp -index 0f656c7049..cae4a605f6 100644 ---- a/src/plugins/intel_cpu/src/nodes/executors/fullyconnected_implementations.cpp -+++ b/src/plugins/intel_cpu/src/nodes/executors/fullyconnected_implementations.cpp -@@ -244,7 +244,10 @@ const std::vector>& getImplementations() { - return true; - }, - // create -- [](const FCAttrs& attrs, const PostOps& postOps, const MemoryArgs& memory, ExecutorContext::CPtr context) { -+ [](const FCAttrs& attrs, -+ const PostOps& postOps, -+ const MemoryArgs& memory, -+ ExecutorContext::CPtr context) -> std::shared_ptr { - struct ConvolutionInstantiator { - std::shared_ptr operator()( - const MemoryArgs& memory, -diff --git a/src/plugins/intel_cpu/src/nodes/inverse.cpp b/src/plugins/intel_cpu/src/nodes/inverse.cpp -index 93f0df2948..04c283fc2f 100644 ---- a/src/plugins/intel_cpu/src/nodes/inverse.cpp -+++ b/src/plugins/intel_cpu/src/nodes/inverse.cpp -@@ -153,7 +153,7 @@ void Inverse::lu_decomposition(const T* data, - - // Find maximum value pivot - non-parallel - for (size_t i = (k + 1) * m_side, j = k + 1; i < m_side_squared; i += m_side, ++j) { -- if (abs(U[i + k]) > abs(U[pivot_idx + k])) { -+ if (std::abs(U[i + k]) > std::abs(U[pivot_idx + k])) { - pivot_row = j; - pivot_idx = pivot_row * m_side; - } -diff --git a/src/plugins/intel_cpu/src/nodes/kernels/x64/jit_kernel.hpp b/src/plugins/intel_cpu/src/nodes/kernels/x64/jit_kernel.hpp -index e837dc7fdf..ecc3688c68 100644 ---- a/src/plugins/intel_cpu/src/nodes/kernels/x64/jit_kernel.hpp -+++ b/src/plugins/intel_cpu/src/nodes/kernels/x64/jit_kernel.hpp -@@ -700,6 +700,9 @@ private: - std::unordered_map> _emitters; - }; - -+template <> -+const Xbyak::Reg64& jit_kernel::reserve(); -+ - template - void jit_kernel::copy(const Xbyak::Reg64& dst, - const Xbyak::Reg64& src, -diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt -index e48c985ad7..18a941ca79 100644 ---- a/src/plugins/intel_gpu/CMakeLists.txt -+++ b/src/plugins/intel_gpu/CMakeLists.txt -@@ -8,6 +8,10 @@ endif() - - set (TARGET_NAME "openvino_intel_gpu_plugin") - -+if((CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) AND CMAKE_CXX_STANDARD GREATER_EQUAL 20) -+ set(CMAKE_CXX_FLAGS "-Wno-error=deprecated ${CMAKE_CXX_FLAGS}") -+endif() -+ - if(CMAKE_COMPILER_IS_GNUCXX) - ov_add_compiler_flags(-Wno-strict-aliasing) - endif() -diff --git a/src/plugins/intel_gpu/src/graph/graph_optimizer/reorder_inputs.cpp b/src/plugins/intel_gpu/src/graph/graph_optimizer/reorder_inputs.cpp -index 0148026b6c..20b229ad9c 100644 ---- a/src/plugins/intel_gpu/src/graph/graph_optimizer/reorder_inputs.cpp -+++ b/src/plugins/intel_gpu/src/graph/graph_optimizer/reorder_inputs.cpp -@@ -689,16 +689,16 @@ void reorder_inputs::run(program& p, layout_optimizer& lo, reorder_factory& rf) - } - - GPU_DEBUG_IF(debug_config->verbose >= 2) { -- reorder_cnt total_reorder_count = std::accumulate( -- p.get_processing_order().begin(), -- p.get_processing_order().end(), -- reorder_cnt{ 0, 0 }, -- [&](reorder_cnt& total, program_node* node) { -- if (fmt_map.count(node) == 0 || fmt_map.at(node) == format::any) -- return total; -- auto count = count_reorders(fmt_map, lo, node); -- return reorder_cnt{ total.number + count.number, total.total_sizes + count.total_sizes }; -- }); -+ reorder_cnt total_reorder_count = -+ std::accumulate(p.get_processing_order().begin(), -+ p.get_processing_order().end(), -+ reorder_cnt{0, 0}, -+ [&](reorder_cnt total, program_node* node) { -+ if (fmt_map.count(node) == 0 || fmt_map.at(node) == format::any) -+ return total; -+ auto count = count_reorders(fmt_map, lo, node); -+ return reorder_cnt{total.number + count.number, total.total_sizes + count.total_sizes}; -+ }); - // Divide results by two as above function will each reorder from both sides - GPU_DEBUG_LOG_PASS << "Total number of reorders: " << total_reorder_count.number / 2 << std::endl; - GPU_DEBUG_LOG_PASS << "Total elements count of all reorders: " << total_reorder_count.total_sizes / 2 << std::endl; -diff --git a/src/plugins/intel_gpu/src/kernel_selector/auto_tuner.cpp b/src/plugins/intel_gpu/src/kernel_selector/auto_tuner.cpp -index a5d0711f61..d71a6834e8 100644 ---- a/src/plugins/intel_gpu/src/kernel_selector/auto_tuner.cpp -+++ b/src/plugins/intel_gpu/src/kernel_selector/auto_tuner.cpp -@@ -36,6 +36,27 @@ - #include - #endif - -+#if __cplusplus > 201703L -+ -+// Add operators `==` and `!=` for rapidjson::GenericMemberIterator for non const iterator when build with C++20, -+// is more strict regarding type checks. -+namespace rapidjson { -+ -+template -+inline bool operator==(GenericMemberIterator lhs, -+ GenericMemberIterator rhs) { -+ return static_cast>(lhs) == -+ static_cast>(rhs); -+} -+ -+template -+inline bool operator!=(GenericMemberIterator lhs, -+ GenericMemberIterator rhs) { -+ return !(lhs == rhs); -+} -+} // namespace rapidjson -+#endif -+ - namespace kernel_selector { - - class TuningCache::Impl { -diff --git a/src/plugins/intel_gpu/src/kernel_selector/kernel_selector_common.cpp b/src/plugins/intel_gpu/src/kernel_selector/kernel_selector_common.cpp -index 6caa5e75a4..3a14e9d802 100644 ---- a/src/plugins/intel_gpu/src/kernel_selector/kernel_selector_common.cpp -+++ b/src/plugins/intel_gpu/src/kernel_selector/kernel_selector_common.cpp -@@ -612,10 +612,8 @@ std::string toString_v2(const DataTensor& tensor) { - std::stringstream s; - s << toString(tensor.GetDType()) << "_"; - s << toString(tensor.GetLayout()); -- int i = 0; - for (auto dim : tensor.GetDims()) { - s << "_v" << dim.v << "_p" << dim.pad.before << "_" << dim.pad.after; -- i++; - } - return s.str(); - } -diff --git a/src/plugins/intel_gpu/tests/unit/module_tests/primitive_comparison_test.cpp b/src/plugins/intel_gpu/tests/unit/module_tests/primitive_comparison_test.cpp -index 0390593b59..3e0f608a9e 100644 ---- a/src/plugins/intel_gpu/tests/unit/module_tests/primitive_comparison_test.cpp -+++ b/src/plugins/intel_gpu/tests/unit/module_tests/primitive_comparison_test.cpp -@@ -11,6 +11,13 @@ - #include - #include - -+namespace cldnn { -+// For gtest NE compare, class defines only `==` operator. Required when building using C++20 -+inline bool operator!=(const range& lhs, const fully_connected& rhs) { -+ return !(lhs.operator==(rhs)); -+} -+} // namespace cldnn -+ - using namespace cldnn; - using namespace ::tests; - -diff --git a/src/tests/test_utils/common_test_utils/src/file_utils.cpp b/src/tests/test_utils/common_test_utils/src/file_utils.cpp -index b1b8b42797..eadaab6b71 100644 ---- a/src/tests/test_utils/common_test_utils/src/file_utils.cpp -+++ b/src/tests/test_utils/common_test_utils/src/file_utils.cpp -@@ -192,7 +192,7 @@ std::string getRelativePath(const std::string& from, const std::string& to) { - output += std::accumulate(mismatch_it.first, - from_vec.end(), - std::string{}, -- [&separator](std::string& a, const std::string&) -> std::string { -+ [&separator](std::string a, const std::string&) -> std::string { - return a += ".." + separator; - }); - } -@@ -203,7 +203,7 @@ std::string getRelativePath(const std::string& from, const std::string& to) { - output += std::accumulate(mismatch_it.second, - to_vec.end(), - std::string{}, -- [&separator](std::string& a, const std::string& b) -> std::string { -+ [&separator](std::string a, const std::string& b) -> std::string { - return a.empty() ? a += b : a += separator + b; - }); - return output; -diff --git a/thirdparty/itt_collector/sea_itt_lib/sea_itt_lib.cpp b/thirdparty/itt_collector/sea_itt_lib/sea_itt_lib.cpp -index 18196eda17..a764b27e68 100644 ---- a/thirdparty/itt_collector/sea_itt_lib/sea_itt_lib.cpp -+++ b/thirdparty/itt_collector/sea_itt_lib/sea_itt_lib.cpp -@@ -327,14 +327,14 @@ SEA_EXPORT int NotifyEvent(iJIT_JVM_EVENT event_type, void* EventSpecificData) { - - switch (event_type) { - case iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED: { -- sea::WriteJit(&(uint32_t)methodData->method_id, sizeof(uint32_t)); -+ sea::WriteJit(&methodData->method_id, sizeof(uint32_t)); - sea::WriteJit(&methodData->method_load_address, sizeof(void*)); -- sea::WriteJit(&(uint32_t)methodData->method_size, sizeof(uint32_t)); -- sea::WriteJit(&(uint32_t)methodData->line_number_size, sizeof(uint32_t)); -+ sea::WriteJit(&methodData->method_size, sizeof(uint32_t)); -+ sea::WriteJit(&methodData->line_number_size, sizeof(uint32_t)); - for (unsigned int i = 0; i < methodData->line_number_size; ++i) { - const LineNumberInfo& lni = methodData->line_number_table[i]; -- sea::WriteJit(&(uint32_t)lni.Offset, sizeof(uint32_t)); -- sea::WriteJit(&(uint32_t)lni.LineNumber, sizeof(uint32_t)); -+ sea::WriteJit(&lni.Offset, sizeof(uint32_t)); -+ sea::WriteJit(&lni.LineNumber, sizeof(uint32_t)); - } - - const char* strings[] = {methodData->method_name, methodData->class_file_name, methodData->source_file_name}; - diff --git a/recipes/openvino/all/patches/2024.1.0/0001-fix-cxxflags.patch b/recipes/openvino/all/patches/2024.1.0/0001-fix-cxxflags.patch deleted file mode 100644 index ceabd157b9ce9..0000000000000 --- a/recipes/openvino/all/patches/2024.1.0/0001-fix-cxxflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake -index d047a1aebd..7779b2fcf5 100644 ---- a/cmake/developer_package/target_flags.cmake -+++ b/cmake/developer_package/target_flags.cmake -@@ -118,8 +118,19 @@ function(ov_get_compiler_definition definition var) - message(FATAL_ERROR "Internal error: 'ov_get_definition' must be used only on Linux") - endif() - -+ get_directory_property(_user_defines COMPILE_DEFINITIONS) -+ foreach(_user_define IN LISTS _user_defines) -+ # older cmake versions keep -D at the beginning, trim it -+ string(REPLACE "-D" "" _user_define "${_user_define}") -+ list(APPEND _ov_user_flags "-D${_user_define}") -+ endforeach() -+ string(REPLACE " " ";" _user_cxx_flags "${CMAKE_CXX_FLAGS}") -+ foreach(_user_flag IN LISTS _user_cxx_flags) -+ list(APPEND _ov_user_flags ${_user_flag}) -+ endforeach() -+ - execute_process(COMMAND echo "#include " -- COMMAND "${CMAKE_CXX_COMPILER}" -x c++ - -E -dM -+ COMMAND "${CMAKE_CXX_COMPILER}" ${_ov_user_flags} -x c++ - -E -dM - COMMAND grep -E "^#define ${definition} " - OUTPUT_VARIABLE output_value - ERROR_VARIABLE error_message diff --git a/recipes/openvino/config.yml b/recipes/openvino/config.yml index f1172721d416f..9e7497e795ff9 100644 --- a/recipes/openvino/config.yml +++ b/recipes/openvino/config.yml @@ -1,15 +1,6 @@ versions: - "2024.4.0": - folder: "all" - "2024.3.0": - folder: "all" - "2024.2.0": - folder: "all" - "2024.1.0": - folder: "all" - "2024.0.0": + "2024.5.0": folder: "all" "2023.3.0": folder: "all" - "2023.2.0": - folder: "all" +