From 376428b59a652acba4ba387d16e07e04df204440 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 19 Feb 2024 11:18:24 +0400 Subject: [PATCH] Ported to 2023.3 from master (#22899) ### Ported from master: - https://github.com/openvinotoolkit/openvino/pull/22816 - https://github.com/openvinotoolkit/openvino/pull/22847 - https://github.com/openvinotoolkit/openvino/pull/22866 --------- Signed-off-by: dependabot[bot] Co-authored-by: Maksim Kutakov Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_doc.yml | 2 +- .github/workflows/code_snippets.yml | 2 +- src/plugins/intel_cpu/src/nodes/interpolate.cpp | 4 ++-- thirdparty/gtest/CMakeLists.txt | 15 +++++---------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 8b108ef2a20..0a17f987c6b 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -20,7 +20,7 @@ jobs: lfs: 'true' - name: Install apt-get dependencies - uses: awalsh128/cache-apt-pkgs-action@v1.4.0 + uses: awalsh128/cache-apt-pkgs-action@v1.4.1 with: packages: graphviz texlive liblua5.2-0 libclang1-9 libclang-cpp9 version: 3.0 diff --git a/.github/workflows/code_snippets.yml b/.github/workflows/code_snippets.yml index b6527e7f37c..144d9c68a1b 100644 --- a/.github/workflows/code_snippets.yml +++ b/.github/workflows/code_snippets.yml @@ -30,7 +30,7 @@ jobs: submodules: 'true' - name: Install OpenCL - uses: awalsh128/cache-apt-pkgs-action@v1.4.0 + uses: awalsh128/cache-apt-pkgs-action@v1.4.1 if: runner.os == 'Linux' with: packages: ocl-icd-opencl-dev opencl-headers diff --git a/src/plugins/intel_cpu/src/nodes/interpolate.cpp b/src/plugins/intel_cpu/src/nodes/interpolate.cpp index ceaf25a5267..e76e390fe55 100644 --- a/src/plugins/intel_cpu/src/nodes/interpolate.cpp +++ b/src/plugins/intel_cpu/src/nodes/interpolate.cpp @@ -314,8 +314,8 @@ private: std::vector local_store_pool_vec_idxs = { static_cast(vmm_dst.getIdx()) }; local_store_pool_vec_idxs.insert(local_store_pool_vec_idxs.begin(), store_pool_vec_idxs.begin(), store_pool_vec_idxs.end()); - emitters[seed]->emit_code({static_cast(vmm_dst.getIdx()), static_cast(offset)}, - {static_cast(reg_dst.getIdx())}, + emitters[seed]->emit_code({static_cast(vmm_dst.getIdx())}, + {static_cast(reg_dst.getIdx()), static_cast(offset)}, {local_store_pool_vec_idxs}, {store_pool_gpr_idxs}); } diff --git a/thirdparty/gtest/CMakeLists.txt b/thirdparty/gtest/CMakeLists.txt index 585b80934bc..20248bcd73c 100644 --- a/thirdparty/gtest/CMakeLists.txt +++ b/thirdparty/gtest/CMakeLists.txt @@ -39,18 +39,13 @@ _ov_gtest_filter_install_interface(gmock gmock) _ov_gtest_filter_install_interface(gmock_main gmock) foreach(target gtest gtest_main gmock gmock_main) - # If we have specified /Z7 option, remove -Zi option which comes from gtest - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - get_target_property(_target_cxx_flags ${target} COMPILE_OPTIONS) + if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + get_target_property(_target_cxx_flags ${target} COMPILE_FLAGS) if(_target_cxx_flags) - if(CMAKE_CXX_FLAGS_DEBUG MATCHES ".+/Z7.+" OR CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES ".+/Z7.+") - string(REPLACE "-Zi" " " _target_cxx_flags ${_target_cxx_flags}) - message(STATUS "Removing -Zi flag from target " ${target}) - set_target_properties(${target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}") - endif() + string(REPLACE "-Zi" " " _target_cxx_flags ${_target_cxx_flags}) + set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${_target_cxx_flags}") endif() - elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$" OR - CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + elseif(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel") target_compile_options(${target} PRIVATE -Wno-undef) if(CMAKE_COMPILER_IS_GNUCXX) target_compile_options(${target} PRIVATE -Wno-deprecated-copy)