Skip to content

Merge 3.4 #2595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 8, 2020
Merged

Merge 3.4 #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
53626e7
avoid test failure based on rounding error
tomoaki0705 Jul 2, 2020
d3ea23c
Merge pull request #2581 from tomoaki0705:fixFbs
alalek Jul 2, 2020
32f8801
avoid bit-exact test on Jetson
tomoaki0705 Jul 5, 2020
d98d9d7
Merge pull request #2588 from tomoaki0705:fixCUDASurfFailure
alalek Jul 5, 2020
de211bf
fix compilation error on MSVS
tomoaki0705 Jul 6, 2020
7bfe31a
Merge pull request #2591 from tomoaki0705:fixCUDASurfTestError
alalek Jul 7, 2020
5910cc9
fix compilation error on Jetson
tomoaki0705 Jul 7, 2020
042548e
Merge pull request #2593 from tomoaki0705:fixCUDASurfTestError
alalek Jul 7, 2020
6d801fc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion modules/xfeatures2d/test/test_surf.cuda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,22 @@ CUDA_TEST_P(CUDA_SURF, Descriptor)
EXPECT_GT(matchedRatio, 0.6);
}

#if defined (__x86_64__) || defined (_M_X64)
testing::internal::ValueArray3<SURF_HessianThreshold, SURF_HessianThreshold, SURF_HessianThreshold> thresholdValues =
testing::Values(
SURF_HessianThreshold(100.0),
SURF_HessianThreshold(500.0),
SURF_HessianThreshold(1000.0));
#else
// hessian computation is not bit-exact and lower threshold causes different count of detection
testing::internal::ValueArray2<SURF_HessianThreshold, SURF_HessianThreshold> thresholdValues =
testing::Values(
SURF_HessianThreshold(813.0),
SURF_HessianThreshold(1000.0));
#endif

INSTANTIATE_TEST_CASE_P(CUDA_Features2D, CUDA_SURF, testing::Combine(
testing::Values(SURF_HessianThreshold(100.0), SURF_HessianThreshold(500.0), SURF_HessianThreshold(1000.0)),
thresholdValues,
testing::Values(SURF_Octaves(3), SURF_Octaves(4)),
testing::Values(SURF_OctaveLayers(2), SURF_OctaveLayers(3)),
testing::Values(SURF_Extended(false), SURF_Extended(true)),
Expand Down
16 changes: 16 additions & 0 deletions modules/ximgproc/test/test_fbs_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ TEST(FastBilateralSolverTest, SplatSurfaceAccuracy)
}
}

#define COUNT_EXCEED(MAT1, MAT2, THRESHOLD, PIXEL_COUNT) \
{ \
Mat diff, count; \
absdiff(MAT1.reshape(1), MAT2.reshape(1), diff); \
cvtest::compare(diff, THRESHOLD, count, CMP_GT); \
PIXEL_COUNT = countNonZero(count.reshape(1)); \
PIXEL_COUNT /= MAT1.channels(); \
}

TEST(FastBilateralSolverTest, ReferenceAccuracy)
{
string dir = getDataDir() + "cv/edgefilter";
Expand All @@ -104,7 +113,14 @@ TEST(FastBilateralSolverTest, ReferenceAccuracy)
double totalMaxError = 1.0/64.0*src.total()*src.channels();

EXPECT_LE(cvtest::norm(res, ref, NORM_L2), totalMaxError);
#if defined (__x86_64__) || defined (_M_X64)
EXPECT_LE(cvtest::norm(res, ref, NORM_INF), 1);
#else
// fastBilateralSolverFilter is not bit-exact
int pixelCount = 0;
COUNT_EXCEED(res, ref, 2, pixelCount);
EXPECT_LE(pixelCount, (int)(res.cols*res.rows*1/100));
#endif
}

INSTANTIATE_TEST_CASE_P(FullSet, FastBilateralSolverTest,Combine(Values(szODD, szQVGA), SrcTypes::all(), GuideTypes::all()));
Expand Down