From a18d793dbd56780630ecdbd3b33e30bf0cf0336c Mon Sep 17 00:00:00 2001 From: Abduragim Shtanchaev <44877829+Abdurrahheem@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:14:25 +0400 Subject: [PATCH] Merge pull request #26110 from Abdurrahheem:ash/hardmax-backend-fix Switch off OpenVINO backend for Hardmax #26110 Fix Hardmax Issue with backend mentioned in #26107 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [ ] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake --- modules/dnn/src/layers/{harmax.cpp => hardmax.cpp} | 2 -- ...onnx_conformance_layer_filter__openvino.inl.hpp | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) rename modules/dnn/src/layers/{harmax.cpp => hardmax.cpp} (99%) diff --git a/modules/dnn/src/layers/harmax.cpp b/modules/dnn/src/layers/hardmax.cpp similarity index 99% rename from modules/dnn/src/layers/harmax.cpp rename to modules/dnn/src/layers/hardmax.cpp index 3958361e14..f44f38b27f 100644 --- a/modules/dnn/src/layers/harmax.cpp +++ b/modules/dnn/src/layers/hardmax.cpp @@ -2,7 +2,6 @@ #include #include "../precomp.hpp" #include "layers_common.hpp" -#include "../ie_ngraph.hpp" namespace cv { @@ -18,7 +17,6 @@ public: axis = params.get("axis", -1); } - virtual bool supportBackend(int backendId) CV_OVERRIDE { return backendId == DNN_BACKEND_OPENCV; diff --git a/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp b/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp index 42f4b8a198..6de80de4a3 100644 --- a/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp +++ b/modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp @@ -550,6 +550,20 @@ CASE(test_edge_pad) // no filter CASE(test_einsum_batch_diagonal) SKIP; +CASE(test_hardmax_axis_0) + SKIP; +CASE(test_hardmax_axis_1) + SKIP; +CASE(test_hardmax_axis_2) + SKIP; +CASE(test_hardmax_default_axis) + SKIP; +CASE(test_hardmax_example) + SKIP; +CASE(test_hardmax_negative_axis) + SKIP; +CASE(test_hardmax_one_hot) + SKIP; CASE(test_einsum_batch_matmul) // no filter CASE(test_einsum_inner_prod)