|
|
@ -24,12 +24,35 @@ INSTANTIATE_TEST_CASE_P(MathOpTestFluid, MathOpTest, |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
Values(CORE_FLUID), |
|
|
|
Values(CORE_FLUID), |
|
|
|
Values(ADD, SUB, DIV, MUL), |
|
|
|
Values(DIV, MUL), |
|
|
|
testing::Bool(), |
|
|
|
testing::Bool(), |
|
|
|
Values(1.0), |
|
|
|
Values(1.0), |
|
|
|
testing::Bool())); |
|
|
|
testing::Bool())); |
|
|
|
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(SubTestFluid, MathOpTest, |
|
|
|
// FIXME: Accuracy test for SUB math operation fails on FullHD and HD CV_16SC1 input cv::Mat,
|
|
|
|
|
|
|
|
// double-presicion input cv::Scalar and CV_32FC1 output cv::Mat on Mac.
|
|
|
|
|
|
|
|
// Accuracy test for ADD math operation fails on HD CV_16SC1 input cv::Mat,
|
|
|
|
|
|
|
|
// double-presicion input cv::Scalar and CV_32FC1 output cv::Mat on Mac.
|
|
|
|
|
|
|
|
// As failures are sporadic, disabling all instantiation cases for SUB and ADD.
|
|
|
|
|
|
|
|
// Github ticket: https://github.com/opencv/opencv/issues/18373.
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_MathOpTestFluid, MathOpTest, |
|
|
|
|
|
|
|
Combine(Values(CV_8UC3, CV_8UC1, CV_16SC1, CV_32FC1), |
|
|
|
|
|
|
|
Values(cv::Size(1920, 1080), |
|
|
|
|
|
|
|
cv::Size(1280, 720), |
|
|
|
|
|
|
|
cv::Size(640, 480), |
|
|
|
|
|
|
|
cv::Size(128, 128)), |
|
|
|
|
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
|
|
|
|
Values(CORE_FLUID), |
|
|
|
|
|
|
|
Values(ADD, SUB), |
|
|
|
|
|
|
|
testing::Bool(), |
|
|
|
|
|
|
|
Values(1.0), |
|
|
|
|
|
|
|
testing::Bool())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// FIXME: Accuracy test for SUB math operation fails on CV_16SC1 input cv::Mat, double-presicion
|
|
|
|
|
|
|
|
// input cv::Scalar and CV_32FC1 output cv::Mat on Mac.
|
|
|
|
|
|
|
|
// As failures are sporadic, disabling all instantiation cases for SUB operation.
|
|
|
|
|
|
|
|
// Github ticket: https://github.com/opencv/opencv/issues/18373.
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_SubTestFluid, MathOpTest, |
|
|
|
Combine(Values(CV_8UC1, CV_16SC1 , CV_32FC1), |
|
|
|
Combine(Values(CV_8UC1, CV_16SC1 , CV_32FC1), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(640, 480), |
|
|
|