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

[GPU] resolve accruacy issue related to concat (#13097)

Browse Source 
+ Not to fuse activation function if concat is onednn
+ Added concat config to ForceImplType

Signed-off-by: Min, Byungil <byungil.min@intel.com>
This commit is contained in:
Min, Byungil 2022-10-04 14:58:36 +09:00 committed by GitHub
parent 782615fdc6
commit 846d8e4605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_primitive_fusing.cpp
View File

@ -291,7 +291,7 @@ void prepare_primitive_fusing::fuse_activations(program &p) {
}
if (use_onednn_impls) {
if (input.is_type<reshape>())
if (input.is_type<reshape>() || input.is_type<concatenation>())
return;
#ifdef ENABLE_ONEDNN_FOR_GPU
// Activation should not be fused if it isn't supported in onednn

8
src/plugins/intel_gpu/src/graph/layout_optimizer.cpp
View File

@ -1284,7 +1284,13 @@ impl_types layout_optimizer::get_forced_impl_type_by_config(program_node& node)
return impl_types::ocl;
else if (forced_impl_type == "reduce:onednn")
return impl_types::onednn;
}
} else if (node.is_type<concatenation>()) {
if (forced_impl_type == "concat:ocl")
return impl_types::ocl;
else if (forced_impl_type == "concat:onednn")
return impl_types::onednn;
}
// Forcing one layer
size_t found_type = forced_impl_type.rfind(":");

2
src/plugins/intel_gpu/tests/fusions/concatenate_fusion_test.cpp
View File

@ -136,7 +136,7 @@ TEST_P(concat_onednn_eltwise, along_f) {
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, concat_onednn_activation, ::testing::ValuesIn(std::vector<concat_test_params>{
concat_test_params{ CASE_CONCAT_F16_1, 3, 3, "" },
concat_test_params{ CASE_CONCAT_F16_1, 4, 4, "" },
}));
INSTANTIATE_TEST_SUITE_P(fusings_gpu, concat_onednn_eltwise, ::testing::ValuesIn(std::vector<concat_test_params>{

7
src/plugins/intel_gpu/tests/fusions/convolution_fusion_test.cpp
View File

@ -1118,6 +1118,7 @@ INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_multi_eltwise_quantization, ::te
class conv_fp32_multi_eltwise_concat : public ConvFusingTest {};
TEST_P(conv_fp32_multi_eltwise_concat, basic) {
auto p = GetParam();
data_types output_type = data_types::i8;
create_topologies(
input_layout("input", get_input_layout(p)),
data("eltwise_data1", get_mem(get_output_layout(p))),
@ -1129,15 +1130,15 @@ TEST_P(conv_fp32_multi_eltwise_concat, basic) {
eltwise("eltwise2", "conv_prim", "eltwise_data2", eltwise_mode::sum),
concatenation("concat",
{ "eltwise1", "eltwise2" },
1,
data_types::i8,
2,
output_type,
padding{ { 0, 0, 0, 0 }, 0 }),
reorder("reorder_bfyx", "concat", p.default_format, data_types::f32)
);
implementation_desc conv_impl = { format::b_fs_yx_fsv16, "" };
bo_fused.set_option(build_option::force_implementations({ { "conv_prim", conv_impl } }));
tolerance = default_tolerance(p.default_type);
tolerance = default_tolerance(output_type);
execute(p);
}