|
|
@ -8,65 +8,69 @@ |
|
|
|
#include "../test_precomp.hpp" |
|
|
|
#include "../test_precomp.hpp" |
|
|
|
#include "../common/gapi_operators_tests.hpp" |
|
|
|
#include "../common/gapi_operators_tests.hpp" |
|
|
|
|
|
|
|
|
|
|
|
#define CORE_FLUID cv::gapi::core::fluid::kernels() |
|
|
|
namespace |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
#define CORE_FLUID [] () { return cv::compile_args(cv::gapi::core::fluid::kernels()); } |
|
|
|
|
|
|
|
} // anonymous namespace
|
|
|
|
|
|
|
|
|
|
|
|
namespace opencv_test |
|
|
|
namespace opencv_test |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(MathOperatorTestFluid, MathOperatorMatMatTest, |
|
|
|
INSTANTIATE_TEST_CASE_P(MathOperatorTestFluid, MathOperatorMatMatTest, |
|
|
|
Combine(Values(AbsExact().to_compare_f()), |
|
|
|
Combine(Values(CV_8UC1, CV_16SC1, CV_32FC1), |
|
|
|
Values( opPlusM, opMinusM, opDivM, |
|
|
|
|
|
|
|
opGreater, opLess, opGreaterEq, opLessEq, opEq, opNotEq), |
|
|
|
|
|
|
|
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), |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
Values(cv::compile_args(CORE_FLUID)))); |
|
|
|
Values(CORE_FLUID), |
|
|
|
|
|
|
|
Values(AbsExact().to_compare_f()), |
|
|
|
|
|
|
|
Values( opPlusM, opMinusM, opDivM, |
|
|
|
|
|
|
|
opGreater, opLess, opGreaterEq, opLessEq, opEq, opNotEq))); |
|
|
|
|
|
|
|
|
|
|
|
//FIXME: Some Mat/Scalar Fluid kernels are not there yet!
|
|
|
|
//FIXME: Some Mat/Scalar Fluid kernels are not there yet!
|
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_MathOperatorTestFluid, MathOperatorMatScalarTest, |
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_MathOperatorTestFluid, MathOperatorMatScalarTest, |
|
|
|
Combine(Values(AbsExact().to_compare_f()), |
|
|
|
Combine(Values(CV_8UC1, CV_16SC1, CV_32FC1), |
|
|
|
Values( opPlus, opPlusR, opMinus, opMinusR, opMul, opMulR, // FIXIT avoid division by values near zero: opDiv, opDivR,
|
|
|
|
|
|
|
|
opGT, opLT, opGE, opLE, opEQ, opNE, |
|
|
|
|
|
|
|
opGTR, opLTR, opGER, opLER, opEQR, opNER), |
|
|
|
|
|
|
|
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), |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
Values(-1, CV_8U, CV_32F), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
Values(cv::compile_args(CORE_FLUID)))); |
|
|
|
Values(CORE_FLUID), |
|
|
|
|
|
|
|
Values(AbsExact().to_compare_f()), |
|
|
|
|
|
|
|
Values( opPlus, opPlusR, opMinus, opMinusR, opMul, opMulR, // FIXIT avoid division by values near zero: opDiv, opDivR,
|
|
|
|
|
|
|
|
opGT, opLT, opGE, opLE, opEQ, opNE, |
|
|
|
|
|
|
|
opGTR, opLTR, opGER, opLER, opEQR, opNER))); |
|
|
|
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(BitwiseOperatorTestFluid, MathOperatorMatMatTest, |
|
|
|
INSTANTIATE_TEST_CASE_P(BitwiseOperatorTestFluid, MathOperatorMatMatTest, |
|
|
|
Combine(Values(AbsExact().to_compare_f()), |
|
|
|
Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
Values( opAnd, opOr, opXor ), |
|
|
|
|
|
|
|
Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
|
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
Values(-1), |
|
|
|
Values(-1), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
Values(cv::compile_args(CORE_FLUID)))); |
|
|
|
Values(CORE_FLUID), |
|
|
|
|
|
|
|
Values(AbsExact().to_compare_f()), |
|
|
|
|
|
|
|
Values( opAnd, opOr, opXor ))); |
|
|
|
|
|
|
|
|
|
|
|
//FIXME: Some Mat/Scalar Fluid kernels are not there yet!
|
|
|
|
//FIXME: Some Mat/Scalar Fluid kernels are not there yet!
|
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_BitwiseOperatorTestFluid, MathOperatorMatScalarTest, |
|
|
|
INSTANTIATE_TEST_CASE_P(DISABLED_BitwiseOperatorTestFluid, MathOperatorMatScalarTest, |
|
|
|
Combine(Values(AbsExact().to_compare_f()), |
|
|
|
Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
Values( opAND, opOR, opXOR, opANDR, opORR, opXORR ), |
|
|
|
|
|
|
|
Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
|
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
Values(-1), |
|
|
|
Values(-1), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
Values(cv::compile_args(CORE_FLUID)))); |
|
|
|
Values(CORE_FLUID), |
|
|
|
|
|
|
|
Values(AbsExact().to_compare_f()), |
|
|
|
|
|
|
|
Values( opAND, opOR, opXOR, opANDR, opORR, opXORR ))); |
|
|
|
|
|
|
|
|
|
|
|
INSTANTIATE_TEST_CASE_P(BitwiseNotOperatorTestFluid, NotOperatorTest, |
|
|
|
INSTANTIATE_TEST_CASE_P(BitwiseNotOperatorTestFluid, NotOperatorTest, |
|
|
|
Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
Values(cv::Size(1280, 720), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(640, 480), |
|
|
|
cv::Size(128, 128)), |
|
|
|
cv::Size(128, 128)), |
|
|
|
|
|
|
|
Values(SAME_TYPE), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
/*init output matrices or not*/ testing::Bool(), |
|
|
|
Values(cv::compile_args(CORE_FLUID)))); |
|
|
|
Values(CORE_FLUID))); |
|
|
|
} |
|
|
|
} |
|
|
|