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

[GPU] Fixed conflicts in fc unit tests (#12857)

Browse Source
This commit is contained in:
Vladimir Paramuzov 2022-09-02 09:16:44 +04:00 committed by GitHub
parent 7a4d463d4d
commit 9590a77025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/intel_gpu/src/graph/fully_connected.cpp
View File

@ -132,6 +132,7 @@ std::vector<layout> fully_connected_inst::calc_output_layouts(fully_connected_no
}
ov::op::v0::MatMul op;
op.set_transpose_b(true);
std::vector<ShapeType> output_shapes = {ShapeType()};
std::vector<ShapeType> input_shapes = {
input_layout.get<ShapeType>(),

2
src/plugins/intel_gpu/tests/shape_infer/matmul_si_test.cpp
View File

@ -102,7 +102,7 @@ INSTANTIATE_TEST_SUITE_P(smoke, fully_connected_test,
testing::ValuesIn(std::vector<matmul_test_params>{
{
layout{ov::PartialShape{10, 1024}, data_types::i8, format::bfyx},
layout{ov::PartialShape{1024, 1000}, data_types::i8, format::bfyx},
layout{ov::PartialShape{1000, 1024}, data_types::i8, format::bfyx},
data_types::f16, false, false,
layout{ov::PartialShape{10, 1000}, data_types::f16, format::bfyx}
},

20
src/plugins/intel_gpu/tests/test_cases/fully_connected_gpu_test.cpp
View File

@ -1776,9 +1776,9 @@ TEST(fully_connected_gpu, dynamic) {
const int32_t input_f = 3, input_b = 1, weight_b = 4;
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f, 1, 1}, data_types::f32,format::bfyx };
auto input_data = engine.allocate_memory(layout{ ov::PartialShape{ input_b, input_f, 1, 1}, data_types::f32,format::bfyx });
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f, 1, 1 }, data_types::f32,format::bfyx });
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f }, data_types::f32,format::bfyx };
auto input_data = engine.allocate_memory(layout{ ov::PartialShape{ input_b, input_f }, data_types::f32,format::bfyx });
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f }, data_types::f32,format::bfyx });
set_values(input_data, { -0.5f, 2.0f, 0.5f });
set_values(weights_data, { 1.5f, 1.0f, 0.5f, -1.0f, 0.0f, 0.5f, 0.5f, -0.5f, -2.0f, -0.5f, 1.0f, 1.5f });
@ -1818,11 +1818,11 @@ TEST(fully_connected_gpu, dynamic_multi_inference_same_shape) {
auto& engine = get_test_engine();
const int32_t input_f = 3, input_b = 1, weight_b = 4;
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f, 1, 1}, data_types::f32,format::bfyx };
auto input_actual_layout = layout{ ov::PartialShape{ input_b, input_f, 1, 1}, data_types::f32,format::bfyx };
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f }, data_types::f32,format::bfyx };
auto input_actual_layout = layout{ ov::PartialShape{ input_b, input_f }, data_types::f32,format::bfyx };
auto input_data1 = engine.allocate_memory(input_actual_layout);
auto input_data2 = engine.allocate_memory(input_actual_layout);
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f, 1, 1 }, data_types::f32,format::bfyx });
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f }, data_types::f32,format::bfyx });
set_values(input_data1, { 0.5f, -2.0f, -0.5f });
set_values(input_data2, { -0.5f, 2.0f, 0.5f });
@ -1893,12 +1893,12 @@ TEST(fully_connected_gpu, dynamic_multi_inference_different_shape) {
const int32_t input_f = 3, weight_b = 4;
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f, 1, 1}, data_types::f32,format::bfyx };
auto input_actual_layout1 = layout{ ov::PartialShape{ 2, input_f, 1, 1}, data_types::f32,format::bfyx};
auto input_actual_layout2 = layout{ ov::PartialShape{ 1, input_f, 1, 1}, data_types::f32,format::bfyx};
auto input_dyn_layout = layout{ ov::PartialShape{ ov::Dimension(1, 10), input_f }, data_types::f32,format::bfyx };
auto input_actual_layout1 = layout{ ov::PartialShape{ 2, input_f }, data_types::f32,format::bfyx};
auto input_actual_layout2 = layout{ ov::PartialShape{ 1, input_f }, data_types::f32,format::bfyx};
auto input_data1 = engine.allocate_memory(input_actual_layout1);
auto input_data2 = engine.allocate_memory(input_actual_layout2);
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f, 1, 1 }, data_types::f32,format::bfyx});
auto weights_data = engine.allocate_memory({ ov::PartialShape{ weight_b, input_f }, data_types::f32,format::bfyx});
set_values(input_data1, { 0.5f, -2.0f, -0.5f,
-0.5f, 2.0f, 0.5f });