Skip to content

[QUALCOMM_QNN] support interp_nearest, interp_bilinear, add, sub, mul, div, max, min, pow #9157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhupengyang merged 1 commit into from
Jun 22, 2022
Merged

[QUALCOMM_QNN] support interp_nearest, interp_bilinear, add, sub, mul, div, max, min, pow #9157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lite/backends/nnadapter/nnadapter/src/optimizer/convert_datalayout_nchw_to_nhwc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@ void NCHW2NHWCDataLayoutConverter::Apply(core::Model* model) {
switch (operation->type) {
case NNADAPTER_ADD:
case NNADAPTER_DIV:
case NNADAPTER_MAX:
case NNADAPTER_MIN:
case NNADAPTER_MUL:
case NNADAPTER_SUB:
ConvertElementwise(operation);
Expand Down
3 changes: 3 additions & 0 deletions lite/backends/nnadapter/nnadapter/src/optimizer/convert_quantization_symm_to_asymm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ NNADAPTER_EXPORT void ConvertQuantizationSymmToAsymm(core::Model* model) {
case NNADAPTER_DIV:
case NNADAPTER_FULLY_CONNECTED:
case NNADAPTER_MAT_MUL:
case NNADAPTER_MAX:
case NNADAPTER_MIN:
case NNADAPTER_MUL:
case NNADAPTER_POW:
case NNADAPTER_SUB: {
ConvertOperandSymmToAsymm(input_operands[0], 128);
ConvertOperandSymmToAsymm(input_operands[1], 128);
Expand Down
22 changes: 12 additions & 10 deletions lite/kernels/nnadapter/converter/all.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,31 +107,31 @@ REGISTER_CONVERTER(elementwise_sub,
"rockchip_npu,mediatek_apu,huawei_kirin_npu,huawei_ascend_"
"npu,amlogic_npu,imagination_nna,cambricon_mlu,verisilicon_"
"timvx,kunlunxin_xtcl,android_nnapi,intel_openvino,google_"
"xnnpack,nvidia_tensorrt,eeasytech_npu");
"xnnpack,nvidia_tensorrt,eeasytech_npu,qualcomm_qnn");
REGISTER_CONVERTER(elementwise_mul,
ConvertElementwise,
"rockchip_npu,mediatek_apu,huawei_kirin_npu,huawei_ascend_"
"npu,amlogic_npu,imagination_nna,cambricon_mlu,verisilicon_"
"timvx,kunlunxin_xtcl,android_nnapi,intel_openvino,google_"
"xnnpack,nvidia_tensorrt,eeasytech_npu");
"xnnpack,nvidia_tensorrt,eeasytech_npu,qualcomm_qnn");
REGISTER_CONVERTER(elementwise_div,
ConvertElementwise,
"rockchip_npu,mediatek_apu,huawei_kirin_npu,huawei_ascend_"
"npu,amlogic_npu,imagination_nna,verisilicon_timvx,"
"kunlunxin_xtcl,cambricon_mlu,android_nnapi,intel_openvino,"
"google_xnnpack,nvidia_tensorrt");
"google_xnnpack,nvidia_tensorrt,qualcomm_qnn");
REGISTER_CONVERTER(elementwise_max,
ConvertElementwise,
"huawei_ascend_npu,huawei_kirin_npu,imagination_nna,"
"kunlunxin_xtcl,intel_openvino");
"kunlunxin_xtcl,intel_openvino,qualcomm_qnn");
REGISTER_CONVERTER(elementwise_min,
ConvertElementwise,
"huawei_ascend_npu,huawei_kirin_npu,imagination_nna,"
"kunlunxin_xtcl,intel_openvino");
"kunlunxin_xtcl,intel_openvino,qualcomm_qnn");
REGISTER_CONVERTER(elementwise_pow,
ConvertElementwise,
"huawei_ascend_npu,huawei_kirin_npu,cambricon_mlu,intel_"
"openvino,nvidia_tensorrt");
"openvino,nvidia_tensorrt,qualcomm_qnn");
REGISTER_CONVERTER(fusion_elementwise_add_activation,
ConvertElementwise,
"rockchip_npu,mediatek_apu,huawei_kirin_npu,huawei_ascend_"
Expand Down Expand Up @@ -347,19 +347,21 @@ REGISTER_CONVERTER(calib, ConvertCalib, "huawei_ascend_npu,cambricon_mlu");
REGISTER_CONVERTER(nearest_interp,
ConvertInterpolate,
"huawei_ascend_npu,verisilicon_timvx,cambricon_mlu,huawei_"
"kirin_npu,nvidia_tensorrt,eeasytech_npu");
"kirin_npu,nvidia_tensorrt,eeasytech_npu,qualcomm_qnn");
REGISTER_CONVERTER(nearest_interp_v2,
ConvertInterpolate,
"huawei_ascend_npu,verisilicon_timvx,cambricon_mlu,huawei_"
"kirin_npu,nvidia_tensorrt,eeasytech_npu,intel_openvino");
"kirin_npu,nvidia_tensorrt,eeasytech_npu,intel_openvino,"
"qualcomm_qnn");
REGISTER_CONVERTER(bilinear_interp,
ConvertInterpolate,
"huawei_ascend_npu,verisilicon_timvx,cambricon_mlu,huawei_"
"kirin_npu,nvidia_tensorrt,eeasytech_npu");
"kirin_npu,nvidia_tensorrt,eeasytech_npu,qualcomm_qnn");
REGISTER_CONVERTER(bilinear_interp_v2,
ConvertInterpolate,
"huawei_ascend_npu,verisilicon_timvx,cambricon_mlu,huawei_"
"kirin_npu,nvidia_tensorrt,eeasytech_npu,intel_openvino");
"kirin_npu,nvidia_tensorrt,eeasytech_npu,intel_openvino,"
"qualcomm_qnn");
REGISTER_CONVERTER(flatten,
ConvertFlatten,
"rockchip_npu,mediatek_apu,huawei_kirin_npu,huawei_ascend_"
Expand Down
7 changes: 7 additions & 0 deletions lite/tests/kernels/elementwise_compute_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,13 @@ TEST(Elementwise, precision) {
abs_error = 1e-2;
#elif defined(NNADAPTER_WITH_INTEL_OPENVINO)
abs_error = 1e-5;
#elif defined(NNADAPTER_WITH_QUALCOMM_QNN)
abs_error = 1e-5;
for (auto elt_type : std::vector<std::string>{
"add", "sub", "mul", "div", "max", "min", "pow"}) {
TestElt(place, abs_error, elt_type, {2, 3, 4, 5}, {2, 3, 4, 5}, 0);
}
return;
#else
return;
#endif
Expand Down
6 changes: 6 additions & 0 deletions lite/tests/kernels/interp_compute_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,12 @@ TEST(Interp, precision) {
TestInterpOuthw(place, abs_error);
TestInterpScale(place, abs_error);
return;
#elif defined(NNADAPTER_WITH_QUALCOMM_QNN)
abs_error = 2e-5;
TestInterpOuthw(place, abs_error);
TestInterpScale(place, abs_error);
TestInterpAlignCorners(place, abs_error);
return;
#else
return;
#endif
Expand Down