@@ -2343,7 +2343,7 @@ TEST_P(ConvolutionEltwiseActivationFusion, Accuracy)
2343
2343
if (eltwiseOp != " sum" && weightedEltwise)
2344
2344
throw SkipTestException (" weighted eltwise not supported" );
2345
2345
LayerParams eltwiseParams;
2346
- TestLayerFusion::makeDefaultTestEltwiseLayer (eltwiseParams, eltwiseOp, false );
2346
+ TestLayerFusion::makeDefaultTestEltwiseLayer (eltwiseParams, eltwiseOp, weightedEltwise );
2347
2347
2348
2348
std::string actType = get<3 >(GetParam ());
2349
2349
LayerParams activationParams;
@@ -2353,7 +2353,7 @@ TEST_P(ConvolutionEltwiseActivationFusion, Accuracy)
2353
2353
Target targetId = get<1 >(get<4 >(GetParam ()));
2354
2354
2355
2355
// bug: https://github.com/opencv/opencv/issues/17945
2356
- if (eltwiseOp != " sum" && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
2356
+ if (( eltwiseOp != " sum" || weightedEltwise) && backendId == DNN_BACKEND_OPENCV && (targetId == DNN_TARGET_OPENCL || targetId == DNN_TARGET_OPENCL_FP16))
2357
2357
applyTestTag (CV_TEST_TAG_DNN_SKIP_OPENCL);
2358
2358
2359
2359
// bug: https://github.com/opencv/opencv/issues/17953
@@ -2440,7 +2440,7 @@ TEST_P(ConvolutionActivationEltwiseFusion, Accuracy)
2440
2440
if (eltwiseOp != " sum" && weightedEltwise)
2441
2441
throw SkipTestException (" weighted eltwise not supported" );
2442
2442
LayerParams eltwiseParams;
2443
- TestLayerFusion::makeDefaultTestEltwiseLayer (eltwiseParams, eltwiseOp, false );
2443
+ TestLayerFusion::makeDefaultTestEltwiseLayer (eltwiseParams, eltwiseOp, weightedEltwise );
2444
2444
2445
2445
Backend backendId = get<0 >(get<4 >(GetParam ()));
2446
2446
Target targetId = get<1 >(get<4 >(GetParam ()));
0 commit comments