From 657e3065bac6cc72cc9210e39ff118ea8ecc4a54 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Thu, 1 Feb 2024 13:43:19 +0100 Subject: [PATCH 1/4] ACL v24.01 --- src/plugins/intel_cpu/src/nodes/normalize.cpp | 2 +- src/plugins/intel_cpu/src/nodes/roi_pooling.cpp | 2 +- src/plugins/intel_cpu/thirdparty/ComputeLibrary | 2 +- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/intel_cpu/src/nodes/normalize.cpp b/src/plugins/intel_cpu/src/nodes/normalize.cpp index 8b8b7b10bbc8b0..3b14c4ccaa5a47 100644 --- a/src/plugins/intel_cpu/src/nodes/normalize.cpp +++ b/src/plugins/intel_cpu/src/nodes/normalize.cpp @@ -1492,7 +1492,7 @@ std::shared_ptr NormalizeL2::NormalizeL2Execut OV_CASE2(ov::element::i8, ov::element::f32, int8_t, float), OV_CASE2(ov::element::f32, ov::element::f32, float, float), OV_CASE2(ov::element::bf16, ov::element::bf16, bfloat16_t, bfloat16_t), - OV_CASE2(ov::element::f16, ov::element::f16, float16_t, float16_t)); + OV_CASE2(ov::element::f16, ov::element::f16, ::float16_t, ::float16_t)); return ctx.executor; } diff --git a/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp b/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp index ae398dd9166cfc..1e3b5c73e40c5c 100644 --- a/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp +++ b/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp @@ -830,7 +830,7 @@ std::shared_ptr ROIPooling::ROIPoolingExecutor:: OV_SWITCH(intel_cpu, ROIPoolingExecutorCreation, ctx, jpp.src_prc, OV_CASE(ov::element::f32, float), OV_CASE(ov::element::bf16, bfloat16_t), - OV_CASE(ov::element::f16, float16_t)) + OV_CASE(ov::element::f16, ::float16_t)) return ctx.executor; } diff --git a/src/plugins/intel_cpu/thirdparty/ComputeLibrary b/src/plugins/intel_cpu/thirdparty/ComputeLibrary index 874e0c7b3fe93a..afb5a987d084e1 160000 --- a/src/plugins/intel_cpu/thirdparty/ComputeLibrary +++ b/src/plugins/intel_cpu/thirdparty/ComputeLibrary @@ -1 +1 @@ -Subproject commit 874e0c7b3fe93a6764ecb2d8cfad924af19a9d25 +Subproject commit afb5a987d084e14a161b63eff916f5c0519d366f diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index c28d7021d63e93..e6180ce0124456 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit c28d7021d63e93c470efc7b1a2c85b14da349ba4 +Subproject commit e6180ce0124456f4d18cf3390f1766ce62ef2e7d From 0e985b8ff701a63d3d4cd41c7a35e85f14a9cc4c Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Thu, 21 Mar 2024 11:42:40 +0100 Subject: [PATCH 2/4] upgrade acl to 24.02.1 --- src/plugins/intel_cpu/thirdparty/ComputeLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/ComputeLibrary b/src/plugins/intel_cpu/thirdparty/ComputeLibrary index afb5a987d084e1..f2eda6665c12d5 160000 --- a/src/plugins/intel_cpu/thirdparty/ComputeLibrary +++ b/src/plugins/intel_cpu/thirdparty/ComputeLibrary @@ -1 +1 @@ -Subproject commit afb5a987d084e14a161b63eff916f5c0519d366f +Subproject commit f2eda6665c12d568e179f5b0e7a24ccdc0ac824d From b2dfd1a9cd5c01a1b938a53048fbb01520bf3393 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Thu, 21 Mar 2024 11:46:05 +0100 Subject: [PATCH 3/4] upgrade onednn --- src/plugins/intel_cpu/thirdparty/onednn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/intel_cpu/thirdparty/onednn b/src/plugins/intel_cpu/thirdparty/onednn index d76046a54ece83..8e9f550fb13aa2 160000 --- a/src/plugins/intel_cpu/thirdparty/onednn +++ b/src/plugins/intel_cpu/thirdparty/onednn @@ -1 +1 @@ -Subproject commit d76046a54ece83cef4add49c843a205b58fddd2b +Subproject commit 8e9f550fb13aa2439f1f7baf157a57791e0c4628 From ed1c0d1c2d5c120acfc27eff47c2172838b14ea9 Mon Sep 17 00:00:00 2001 From: Aleksandr Voron Date: Thu, 21 Mar 2024 14:42:45 +0100 Subject: [PATCH 4/4] set dnnl::impl namespace --- src/plugins/intel_cpu/src/nodes/normalize.cpp | 2 +- src/plugins/intel_cpu/src/nodes/roi_pooling.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/intel_cpu/src/nodes/normalize.cpp b/src/plugins/intel_cpu/src/nodes/normalize.cpp index 8021a2e504602c..0f61e7c717d4bc 100644 --- a/src/plugins/intel_cpu/src/nodes/normalize.cpp +++ b/src/plugins/intel_cpu/src/nodes/normalize.cpp @@ -1492,7 +1492,7 @@ std::shared_ptr NormalizeL2::NormalizeL2Execut OV_CASE2(ov::element::i8, ov::element::f32, int8_t, float), OV_CASE2(ov::element::f32, ov::element::f32, float, float), OV_CASE2(ov::element::bf16, ov::element::bf16, bfloat16_t, bfloat16_t), - OV_CASE2(ov::element::f16, ov::element::f16, ::float16_t, ::float16_t)); + OV_CASE2(ov::element::f16, ov::element::f16, dnnl::impl::float16_t, dnnl::impl::float16_t)); return ctx.executor; } diff --git a/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp b/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp index 88af0406e615dd..f1a4291f0803a3 100644 --- a/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp +++ b/src/plugins/intel_cpu/src/nodes/roi_pooling.cpp @@ -830,7 +830,7 @@ std::shared_ptr ROIPooling::ROIPoolingExecutor:: OV_SWITCH(intel_cpu, ROIPoolingExecutorCreation, ctx, jpp.src_prc, OV_CASE(ov::element::f32, float), OV_CASE(ov::element::bf16, bfloat16_t), - OV_CASE(ov::element::f16, ::float16_t)) + OV_CASE(ov::element::f16, dnnl::impl::float16_t)) return ctx.executor; }