natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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] <support@github.com>
Co-authored-by: Maksim Kutakov <maksim.kutakov@intel.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Ilya Lavrenov 2024-02-19 11:18:24 +04:00 committed by GitHub
parent ee39aaaa84
commit 376428b59a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_doc.yml vendored
View File

@ -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

2
.github/workflows/code_snippets.yml vendored
View File

@ -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

4
src/plugins/intel_cpu/src/nodes/interpolate.cpp
View File

@ -314,8 +314,8 @@ private:
std::vector<size_t> local_store_pool_vec_idxs = { static_cast<size_t>(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<size_t>(vmm_dst.getIdx()), static_cast<size_t>(offset)},
{static_cast<size_t>(reg_dst.getIdx())},
emitters[seed]->emit_code({static_cast<size_t>(vmm_dst.getIdx())},
{static_cast<size_t>(reg_dst.getIdx()), static_cast<size_t>(offset)},
{local_store_pool_vec_idxs}, {store_pool_gpr_idxs});
}

15
thirdparty/gtest/CMakeLists.txt vendored
View File

@ -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)