dnn(test): enable tests from issue 17953
This commit is contained in:
parent
8ee5f2ad89
commit
e87a0baa4b
@ -2349,13 +2349,6 @@ TEST_P(ConvolutionEltwiseActivationFusion, Accuracy)
|
|||||||
if ((eltwiseOp != "sum" || weightedEltwise) && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
if ((eltwiseOp != "sum" || weightedEltwise) && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
||||||
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
||||||
|
|
||||||
// bug: https://github.com/opencv/opencv/issues/17953
|
|
||||||
if (eltwiseOp == "sum" && actType == "ChannelsPReLU" && bias_term == false &&
|
|
||||||
backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
|
||||||
{
|
|
||||||
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
|
||||||
}
|
|
||||||
|
|
||||||
// bug: https://github.com/opencv/opencv/issues/17964
|
// bug: https://github.com/opencv/opencv/issues/17964
|
||||||
if (actType == "Power" && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
if (actType == "Power" && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
||||||
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
||||||
@ -2442,13 +2435,6 @@ TEST_P(ConvolutionActivationEltwiseFusion, Accuracy)
|
|||||||
if (actType == "Power" && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
if (actType == "Power" && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
||||||
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
||||||
|
|
||||||
// bug: https://github.com/opencv/opencv/issues/17953
|
|
||||||
if (actType == "ChannelsPReLU" && bias_term == false &&
|
|
||||||
backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
|
|
||||||
{
|
|
||||||
applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL);
|
|
||||||
}
|
|
||||||
|
|
||||||
Net net;
|
Net net;
|
||||||
int convId = net.addLayer(convParams.name, convParams.type, convParams);
|
int convId = net.addLayer(convParams.name, convParams.type, convParams);
|
||||||
int activId = net.addLayer(activationParams.name, activationParams.type, activationParams);
|
int activId = net.addLayer(activationParams.name, activationParams.type, activationParams);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user