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

[MERGE] Port 24718 and 24849 (#24862) 

### Details:
Ported from master:
 - https://github.com/openvinotoolkit/openvino/pull/24718
 - https://github.com/openvinotoolkit/openvino/pull/24849

### Tickets:
 - *ticket-id*

---------

Co-authored-by: Andrey Babushkin <andrey.babushkin@intel.com>
This commit is contained in:
Mikhail Ryzhov 2024-06-05 20:28:07 +02:00 committed by GitHub
parent bb4a50703a
commit 7773712581
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/windows_conditional_compilation.yml vendored
View File

@ -50,7 +50,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: aks-win-8-cores-64gb
runs-on: aks-win-32-cores-128gb
env:
CMAKE_BUILD_TYPE: 'Release'
CMAKE_GENERATOR: 'Ninja Multi-Config'
@ -174,8 +174,8 @@ jobs:
- name: Cmake build - CC COLLECT
run: |
cmake --build ${{ env.BUILD_DIR }} --parallel 8 --config ${{ env.CMAKE_BUILD_TYPE }} && `
cmake --build ${{ env.BUILD_DIR }} --parallel 8 --config ${{ env.CMAKE_BUILD_TYPE }} --target sea_itt_lib
cmake --build ${{ env.BUILD_DIR }} --parallel 32 --config ${{ env.CMAKE_BUILD_TYPE }} && `
cmake --build ${{ env.BUILD_DIR }} --parallel 32 --config ${{ env.CMAKE_BUILD_TYPE }} --target sea_itt_lib
- name: Show ccache stats
run: '& ccache --show-stats'
@ -262,7 +262,7 @@ jobs:
defaults:
run:
shell: pwsh
runs-on: aks-win-8-cores-64gb
runs-on: aks-win-32-cores-128gb
env:
CMAKE_BUILD_TYPE: 'Release'
OPENVINO_REPO: "${{ github.workspace }}\\openvino"

5
src/plugins/intel_cpu/src/node.cpp
View File

@ -692,9 +692,8 @@ void Node::filterSupportedPrimitiveDescriptors() {
// Compare by format tag
auto areCompatible = [](const MemoryDesc& desc, dnnl::memory::format_tag fmt) -> bool {
auto fmt_tdesc = DnnlBlockedMemoryDesc(desc.getShape(),
DnnlExtensionUtils::ElementTypeToDataType(desc.getPrecision()),
fmt);
auto data_type = DnnlExtensionUtils::ElementTypeToDataType(desc.getPrecision());
auto fmt_tdesc = DnnlBlockedMemoryDesc(desc.getShape(), data_type, fmt);
return desc.isCompatible(fmt_tdesc);
};