mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move global skip out of if loop, and add opencv_deny_list

Browse Source
This commit is contained in:
zihaomu 2023-03-13 22:16:51 +08:00
parent e03e2e7f94
commit ee3740af00
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/test/test_common.hpp
View File

@ -47,6 +47,7 @@
#define CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE "dnn_skip_onnx_conformance" #define CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE "dnn_skip_onnx_conformance"
#define CV_TEST_TAG_DNN_SKIP_PARSER "dnn_skip_parser" #define CV_TEST_TAG_DNN_SKIP_PARSER "dnn_skip_parser"
#define CV_TEST_TAG_DNN_SKIP_GLOBAL "dnn_skip_global"
#define CV_TEST_TAG_DNN_SKIP_TIMVX "dnn_skip_timvx" #define CV_TEST_TAG_DNN_SKIP_TIMVX "dnn_skip_timvx"
#define CV_TEST_TAG_DNN_SKIP_CANN "dnn_skip_cann" #define CV_TEST_TAG_DNN_SKIP_CANN "dnn_skip_cann"

15
modules/dnn/test/test_onnx_conformance.cpp
View File

@ -937,6 +937,7 @@ public:
static std::set<std::string> parser_deny_list; static std::set<std::string> parser_deny_list;
static std::set<std::string> global_deny_list; static std::set<std::string> global_deny_list;
static std::set<std::string> opencv_deny_list;
static std::set<std::string> opencl_fp16_deny_list; static std::set<std::string> opencl_fp16_deny_list;
static std::set<std::string> opencl_deny_list; static std::set<std::string> opencl_deny_list;
static std::set<std::string> cpu_deny_list; static std::set<std::string> cpu_deny_list;
@ -1001,6 +1002,10 @@ public:
#include "test_onnx_conformance_layer_filter_opencv_all_denylist.inl.hpp" #include "test_onnx_conformance_layer_filter_opencv_all_denylist.inl.hpp"
}; };
opencv_deny_list = {
#include "test_onnx_conformance_layer_filter_opencv_denylist.inl.hpp"
};
opencl_fp16_deny_list = { opencl_fp16_deny_list = {
#include "test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp" #include "test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp"
}; };
@ -1036,6 +1041,7 @@ public:
std::set<std::string> Test_ONNX_conformance::parser_deny_list; std::set<std::string> Test_ONNX_conformance::parser_deny_list;
std::set<std::string> Test_ONNX_conformance::global_deny_list; std::set<std::string> Test_ONNX_conformance::global_deny_list;
std::set<std::string> Test_ONNX_conformance::opencv_deny_list;
std::set<std::string> Test_ONNX_conformance::opencl_fp16_deny_list; std::set<std::string> Test_ONNX_conformance::opencl_fp16_deny_list;
std::set<std::string> Test_ONNX_conformance::opencl_deny_list; std::set<std::string> Test_ONNX_conformance::opencl_deny_list;
std::set<std::string> Test_ONNX_conformance::cpu_deny_list; std::set<std::string> Test_ONNX_conformance::cpu_deny_list;
@ -1057,14 +1063,21 @@ TEST_P(Test_ONNX_conformance, Layer_Test)
bool checkLayersFallbacks = true; bool checkLayersFallbacks = true;
bool checkAccuracy = true; bool checkAccuracy = true;
// SKIP when the test case is in the parser deny list.
if (parser_deny_list.find(name) != parser_deny_list.end()) if (parser_deny_list.find(name) != parser_deny_list.end())
{ {
applyTestTag(CV_TEST_TAG_DNN_SKIP_PARSER, CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE); applyTestTag(CV_TEST_TAG_DNN_SKIP_PARSER, CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE);
} }
// SKIP when the test case is in the global deny list.
if (global_deny_list.find(name) != global_deny_list.end())
{
applyTestTag(CV_TEST_TAG_DNN_SKIP_GLOBAL, CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE);
}
if (backend == DNN_BACKEND_OPENCV) if (backend == DNN_BACKEND_OPENCV)
{ {
if (global_deny_list.find(name) != global_deny_list.end()) if (opencv_deny_list.find(name) != opencv_deny_list.end())
{ {
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCV_BACKEND, CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE); applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCV_BACKEND, CV_TEST_TAG_DNN_SKIP_ONNX_CONFORMANCE);
} }

0
modules/dnn/test/test_onnx_conformance_layer_filter_opencv_denylist.inl.hpp Normal file
View File