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

[GPU] Added mish, hardswish, exp onednn activations (#8160)

Browse Source 
Merged by agreement with Pavel
This commit is contained in:
Ilya Znamenskiy 2021-10-27 19:32:04 +03:00 committed by GitHub
parent 1fa0d525d9
commit f34e1e332f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 102 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inference-engine/thirdparty/clDNN/src/impls/onednn/utils.cpp vendored
View File

@ -210,15 +210,17 @@ dnnl::memory::format_tag get_format_by_desc(dnnl::memory::desc desc) {
dnnl::algorithm convert_activation_func(cldnn::activation_func func) {
switch (func) {
case cldnn::activation_func::relu: return dnnl::algorithm::eltwise_relu;
case cldnn::activation_func::relu_negative_slope: return dnnl::algorithm::eltwise_relu;
case cldnn::activation_func::gelu: return dnnl::algorithm::eltwise_gelu;
case cldnn::activation_func::elu: return dnnl::algorithm::eltwise_elu;
case cldnn::activation_func::mish: return dnnl::algorithm::eltwise_mish;
case cldnn::activation_func::swish: return dnnl::algorithm::eltwise_swish;
case cldnn::activation_func::hswish: return dnnl::algorithm::eltwise_hardswish;
case cldnn::activation_func::abs: return dnnl::algorithm::eltwise_abs;
case cldnn::activation_func::exp: return dnnl::algorithm::eltwise_exp;
case cldnn::activation_func::logistic: return dnnl::algorithm::eltwise_logistic;
case cldnn::activation_func::clamp: return dnnl::algorithm::eltwise_clip;
case cldnn::activation_func::relu_negative_slope: return dnnl::algorithm::eltwise_relu;
case cldnn::activation_func::hyperbolic_tan: return dnnl::algorithm::eltwise_tanh;
case cldnn::activation_func::swish: return dnnl::algorithm::eltwise_swish;
case cldnn::activation_func::abs: return dnnl::algorithm::eltwise_abs;
case cldnn::activation_func::gelu: return dnnl::algorithm::eltwise_gelu;
case cldnn::activation_func::hswish: return dnnl::algorithm::eltwise_hardswish;
default: throw std::runtime_error("Unsupported activation func for onednn primitive " + std::to_string(static_cast<int>(func)));
}
}

98
inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp vendored
View File

@ -9181,8 +9181,8 @@ INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_int8_eltwise_onednn,
bc_test_params{CASE_CONV3D_S8S8_5, 3, 4},
}));
class conv_fp32_activation_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_onednn, basic) {
class conv_fp32_activation_abs_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_abs_onednn, basic) {
auto p = GetParam();
create_topologies(input_layout("input", get_input_layout(p)),
data("weights", get_mem(get_weights_layout(p))),
@ -9196,7 +9196,99 @@ TEST_P(conv_fp32_activation_onednn, basic) {
execute(p);
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_onednn,
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_abs_onednn,
::testing::ValuesIn(std::vector<bc_test_params>{
bc_test_params{CASE_CONV_FP16_1, 2, 3},
bc_test_params{CASE_CONV_FP16_2, 2, 3},
bc_test_params{CASE_CONV_FP16_3, 2, 3},
bc_test_params{CASE_CONV_FP16_4, 2, 3},
}));
class conv_fp32_activation_mish_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_mish_onednn, basic) {
auto p = GetParam();
create_topologies(input_layout("input", get_input_layout(p)),
data("weights", get_mem(get_weights_layout(p))),
data("bias", get_mem(get_bias_layout(p))),
convolution("conv_prim", "input", {"weights"}, {"bias"}, p.groups, p.stride, p.pad, p.dilation),
activation("activation", "conv_prim", activation_func::mish),
reorder("reorder_bfyx", "activation", p.default_format, data_types::f32)
);
tolerance = 1e-2f;
execute(p);
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_mish_onednn,
::testing::ValuesIn(std::vector<bc_test_params>{
bc_test_params{CASE_CONV_FP16_1, 2, 3},
bc_test_params{CASE_CONV_FP16_2, 2, 3},
bc_test_params{CASE_CONV_FP16_3, 2, 3},
bc_test_params{CASE_CONV_FP16_4, 2, 3},
}));
class conv_fp32_activation_swish_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_swish_onednn, basic) {
auto p = GetParam();
create_topologies(input_layout("input", get_input_layout(p)),
data("weights", get_mem(get_weights_layout(p))),
data("bias", get_mem(get_bias_layout(p))),
convolution("conv_prim", "input", {"weights"}, {"bias"}, p.groups, p.stride, p.pad, p.dilation),
activation("activation", "conv_prim", activation_func::swish),
reorder("reorder_bfyx", "activation", p.default_format, data_types::f32)
);
tolerance = 1e-2f;
execute(p);
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_swish_onednn,
::testing::ValuesIn(std::vector<bc_test_params>{
bc_test_params{CASE_CONV_FP16_1, 2, 3},
bc_test_params{CASE_CONV_FP16_2, 2, 3},
bc_test_params{CASE_CONV_FP16_3, 2, 3},
bc_test_params{CASE_CONV_FP16_4, 2, 3},
}));
class conv_fp32_activation_hswish_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_hswish_onednn, basic) {
auto p = GetParam();
create_topologies(input_layout("input", get_input_layout(p)),
data("weights", get_mem(get_weights_layout(p))),
data("bias", get_mem(get_bias_layout(p))),
convolution("conv_prim", "input", {"weights"}, {"bias"}, p.groups, p.stride, p.pad, p.dilation),
activation("activation", "conv_prim", activation_func::hswish),
reorder("reorder_bfyx", "activation", p.default_format, data_types::f32)
);
tolerance = 1e-2f;
execute(p);
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_hswish_onednn,
::testing::ValuesIn(std::vector<bc_test_params>{
bc_test_params{CASE_CONV_FP16_1, 2, 3},
bc_test_params{CASE_CONV_FP16_2, 2, 3},
bc_test_params{CASE_CONV_FP16_3, 2, 3},
bc_test_params{CASE_CONV_FP16_4, 2, 3},
}));
class conv_fp32_activation_exp_onednn : public ConvFusingTestOneDNN {};
TEST_P(conv_fp32_activation_exp_onednn, basic) {
auto p = GetParam();
create_topologies(input_layout("input", get_input_layout(p)),
data("weights", get_mem(get_weights_layout(p))),
data("bias", get_mem(get_bias_layout(p))),
convolution("conv_prim", "input", {"weights"}, {"bias"}, p.groups, p.stride, p.pad, p.dilation),
activation("activation", "conv_prim", activation_func::exp),
reorder("reorder_bfyx", "activation", p.default_format, data_types::f32)
);
tolerance = 1e-2f;
execute(p);
}
INSTANTIATE_TEST_SUITE_P(fusings_gpu, conv_fp32_activation_exp_onednn,
::testing::ValuesIn(std::vector<bc_test_params>{
bc_test_params{CASE_CONV_FP16_1, 2, 3},
bc_test_params{CASE_CONV_FP16_2, 2, 3},