Commit 39d7ecc9 authored by Alexander Alekhin's avatar Alexander Alekhin

perf: disabled checks for magic numbers

Results are not bit-exact
parent dac37a0b
...@@ -27,8 +27,8 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Detect, ORB_IMAGES) ...@@ -27,8 +27,8 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Detect, ORB_IMAGES)
OCL_TEST_CYCLE() detector->detect(frame, points, mask); OCL_TEST_CYCLE() detector->detect(frame, points, mask);
std::sort(points.begin(), points.end(), comparators::KeypointGreater()); EXPECT_GT(points.size(), 20u);
SANITY_CHECK_KEYPOINTS(points, 1e-5); SANITY_CHECK_NOTHING();
} }
OCL_PERF_TEST_P(ORBFixture, ORB_Extract, ORB_IMAGES) OCL_PERF_TEST_P(ORBFixture, ORB_Extract, ORB_IMAGES)
...@@ -47,13 +47,14 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Extract, ORB_IMAGES) ...@@ -47,13 +47,14 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Extract, ORB_IMAGES)
Ptr<ORB> detector = ORB::create(1500, 1.3f, 1); Ptr<ORB> detector = ORB::create(1500, 1.3f, 1);
vector<KeyPoint> points; vector<KeyPoint> points;
detector->detect(frame, points, mask); detector->detect(frame, points, mask);
std::sort(points.begin(), points.end(), comparators::KeypointGreater()); EXPECT_GT(points.size(), 20u);
UMat descriptors; UMat descriptors;
OCL_TEST_CYCLE() detector->compute(frame, points, descriptors); OCL_TEST_CYCLE() detector->compute(frame, points, descriptors);
SANITY_CHECK(descriptors); EXPECT_EQ((size_t)descriptors.rows, points.size());
SANITY_CHECK_NOTHING();
} }
OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES) OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES)
...@@ -61,12 +62,6 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES) ...@@ -61,12 +62,6 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES)
string filename = getDataPath(GetParam()); string filename = getDataPath(GetParam());
Mat mframe = imread(filename, IMREAD_GRAYSCALE); Mat mframe = imread(filename, IMREAD_GRAYSCALE);
double desc_eps = 1e-6;
#ifdef ANDROID
if (cv::ocl::Device::getDefault().isNVidia())
desc_eps = 2;
#endif
if (mframe.empty()) if (mframe.empty())
FAIL() << "Unable to load source image " << filename; FAIL() << "Unable to load source image " << filename;
...@@ -81,9 +76,9 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES) ...@@ -81,9 +76,9 @@ OCL_PERF_TEST_P(ORBFixture, ORB_Full, ORB_IMAGES)
OCL_TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false); OCL_TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false);
::perf::sort(points, descriptors); EXPECT_GT(points.size(), 20u);
SANITY_CHECK_KEYPOINTS(points, 1e-5); EXPECT_EQ((size_t)descriptors.rows, points.size());
SANITY_CHECK(descriptors, desc_eps); SANITY_CHECK_NOTHING();
} }
} // ocl } // ocl
......
...@@ -27,8 +27,9 @@ PERF_TEST_P(orb, detect, testing::Values(ORB_IMAGES)) ...@@ -27,8 +27,9 @@ PERF_TEST_P(orb, detect, testing::Values(ORB_IMAGES))
TEST_CYCLE() detector->detect(frame, points, mask); TEST_CYCLE() detector->detect(frame, points, mask);
sort(points.begin(), points.end(), comparators::KeypointGreater()); EXPECT_GT(points.size(), 20u);
SANITY_CHECK_KEYPOINTS(points, 1e-5);
SANITY_CHECK_NOTHING();
} }
PERF_TEST_P(orb, extract, testing::Values(ORB_IMAGES)) PERF_TEST_P(orb, extract, testing::Values(ORB_IMAGES))
...@@ -45,13 +46,15 @@ PERF_TEST_P(orb, extract, testing::Values(ORB_IMAGES)) ...@@ -45,13 +46,15 @@ PERF_TEST_P(orb, extract, testing::Values(ORB_IMAGES))
Ptr<ORB> detector = ORB::create(1500, 1.3f, 1); Ptr<ORB> detector = ORB::create(1500, 1.3f, 1);
vector<KeyPoint> points; vector<KeyPoint> points;
detector->detect(frame, points, mask); detector->detect(frame, points, mask);
sort(points.begin(), points.end(), comparators::KeypointGreater());
EXPECT_GT(points.size(), 20u);
Mat descriptors; Mat descriptors;
TEST_CYCLE() detector->compute(frame, points, descriptors); TEST_CYCLE() detector->compute(frame, points, descriptors);
SANITY_CHECK(descriptors); EXPECT_EQ((size_t)descriptors.rows, points.size());
SANITY_CHECK_NOTHING();
} }
PERF_TEST_P(orb, full, testing::Values(ORB_IMAGES)) PERF_TEST_P(orb, full, testing::Values(ORB_IMAGES))
...@@ -71,7 +74,7 @@ PERF_TEST_P(orb, full, testing::Values(ORB_IMAGES)) ...@@ -71,7 +74,7 @@ PERF_TEST_P(orb, full, testing::Values(ORB_IMAGES))
TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false); TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false);
perf::sort(points, descriptors); EXPECT_GT(points.size(), 20u);
SANITY_CHECK_KEYPOINTS(points, 1e-5); EXPECT_EQ((size_t)descriptors.rows, points.size());
SANITY_CHECK(descriptors); SANITY_CHECK_NOTHING();
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment