Skip to content

Commit

Permalink
[IE CLDNN] Adjust fusing tests for FP deconvolution
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-chaiko
alex-chaiko committed Nov 6, 2020
1 parent 5551683 commit 41a0fd7
Showing 1 changed file with 84 additions and 73 deletions.
157 changes: 84 additions & 73 deletions inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,17 @@ class ConvEltwTest : public ::BaseFusingTest<conv_eltw_test_params> {
network_not_fused.set_input_data("input", input_prim);

compare(network_not_fused, network_fused, p);
auto find_prim = [](primitive_info& p) -> bool {
// Add more ids when needed
if (p.original_id == "deconv_prim")
return true;
return false;
};

auto pi_fused = network_fused.get_primitives_info();
auto info_fused = std::find_if(pi_fused.begin(), pi_fused.end(), find_prim);
if (info_fused != pi_fused.end())
std::cout << "kernel: " << info_fused->kernel_id << std::endl;
}

layout get_input_layout(conv_eltw_test_params& p) {
Expand Down Expand Up @@ -4230,23 +4241,23 @@ TEST_P(deconv_scale_actv_quant_i8, basic) {

INSTANTIATE_TEST_CASE_P(fusings_gpu, deconv_scale_actv_quant_i8,
::testing::ValuesIn(std::vector<deconv_test_params>{
deconv_test_params{ CASE_DECONV_FP32_1, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_2, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_4, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_5, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_6, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_7, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_8, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_1, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_2, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_4, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_5, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_6, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_7, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_8, 2, 5 },

deconv_test_params{ CASE_DECONV_FP16_1, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_2, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_4, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_5, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_6, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_7, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_8, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_1, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_2, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_4, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_5, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_6, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_7, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_8, 2, 5 },

deconv_test_params{ CASE_DECONV_U8S8_1, 2, 5 },
deconv_test_params{ CASE_DECONV_U8S8_2, 2, 5 },
Expand All @@ -4266,26 +4277,26 @@ INSTANTIATE_TEST_CASE_P(fusings_gpu, deconv_scale_actv_quant_i8,
deconv_test_params{ CASE_DECONV_S8S8_7, 2, 5 },
deconv_test_params{ CASE_DECONV_S8S8_8, 2, 5 },

deconv_test_params{ CASE_DECONV_FP32_3D_1, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_2, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_3, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_4, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_5, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_6, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_7, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_8, 3, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_1, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_2, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_3, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_4, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_5, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_6, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_7, 2, 5 },
deconv_test_params{ CASE_DECONV_FP32_3D_8, 2, 5 },
// FIXME no quantize implementation for bs_fs_yx_bsv16_fsv16 format AND add_required_reorders pass completely ruins data types
// add_required_reorders pass tries to reorder everything to output type if no format exists, this ruins fp32 -> int8 quantize
//deconv_test_params{ CASE_DECONV_FP32_3D_9, 3, 5 },

deconv_test_params{ CASE_DECONV_FP16_3D_1, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_2, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_3, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_4, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_5, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_6, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_7, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_8, 3, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_1, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_2, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_3, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_4, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_5, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_6, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_7, 2, 5 },
deconv_test_params{ CASE_DECONV_FP16_3D_8, 2, 5 },
//deconv_test_params{ CASE_DECONV_FP16_3D_9, 3, 5 },

deconv_test_params{ CASE_DECONV_U8S8_3D_1, 2, 5 },
Expand Down Expand Up @@ -4341,23 +4352,23 @@ TEST_P(deconv_scale_actv_quant_u8_eltw_scale_actv_quant_i8, basic) {

INSTANTIATE_TEST_CASE_P(fusings_gpu, deconv_scale_actv_quant_u8_eltw_scale_actv_quant_i8,
::testing::ValuesIn(std::vector<deconv_test_params>{
deconv_test_params{ CASE_DECONV_FP32_1, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_2, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_4, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_5, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_6, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_7, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_8, 4, 9 },

deconv_test_params{ CASE_DECONV_FP16_1, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_2, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_4, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_5, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_6, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_7, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_8, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_1, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_2, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_4, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_5, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_6, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_7, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_8, 2, 9 },

deconv_test_params{ CASE_DECONV_FP16_1, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_2, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_4, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_5, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_6, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_7, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_8, 2, 9 },

deconv_test_params{ CASE_DECONV_U8S8_1, 2, 9 },
deconv_test_params{ CASE_DECONV_U8S8_2, 2, 9 },
Expand All @@ -4377,24 +4388,24 @@ INSTANTIATE_TEST_CASE_P(fusings_gpu, deconv_scale_actv_quant_u8_eltw_scale_actv_
deconv_test_params{ CASE_DECONV_S8S8_7, 2, 9 },
deconv_test_params{ CASE_DECONV_S8S8_8, 2, 9 },

deconv_test_params{ CASE_DECONV_FP32_3D_1, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_2, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_3, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_4, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_5, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_6, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_7, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_8, 4, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_1, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_2, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_3, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_4, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_5, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_6, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_7, 2, 9 },
deconv_test_params{ CASE_DECONV_FP32_3D_8, 2, 9 },
// deconv_test_params{ CASE_DECONV_FP32_3D_9, 6, 9 },

deconv_test_params{ CASE_DECONV_FP16_3D_1, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_2, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_3, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_4, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_5, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_6, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_7, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_8, 4, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_1, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_2, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_3, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_4, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_5, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_6, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_7, 2, 9 },
deconv_test_params{ CASE_DECONV_FP16_3D_8, 2, 9 },
// deconv_test_params{ CASE_DECONV_FP16_3D_9, 6, 9 },

deconv_test_params{ CASE_DECONV_U8S8_3D_1, 2, 9 },
Expand Down Expand Up @@ -4445,14 +4456,14 @@ TEST_P(deconv_scale_activation_quantize_i8_eltwise_quantize_u8, basic) {

INSTANTIATE_TEST_CASE_P(fusings_gpu, deconv_scale_activation_quantize_i8_eltwise_quantize_u8,
::testing::ValuesIn(std::vector<conv_eltw_test_params>{
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_1, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_2, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_3, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_4, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_5, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_6, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_7, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_8, 4, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_1, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_2, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_3, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_4, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_5, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_6, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_7, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_FP32_8, 2, 7},

conv_eltw_test_params{CASE_DECONV_ELTW_i8_1, 2, 7},
conv_eltw_test_params{CASE_DECONV_ELTW_i8_2, 2, 7},
Expand Down

0 comments on commit 41a0fd7

Please sign in to comment.