Skip to content

CUDA: avoid bit-exact test on Jetson #2588

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 1 commit into from
Jul 5, 2020
Merged

CUDA: avoid bit-exact test on Jetson #2588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 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 @@ -172,7 +172,14 @@ CUDA_TEST_P(CUDA_SURF, Descriptor)
}

INSTANTIATE_TEST_CASE_P(CUDA_Features2D, CUDA_SURF, testing::Combine(
testing::Values(SURF_HessianThreshold(100.0), SURF_HessianThreshold(500.0), SURF_HessianThreshold(1000.0)),
testing::Values(
#if defined (__x86_64__) || defined (_M_X64)
SURF_HessianThreshold(100.0), SURF_HessianThreshold(500.0),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conditional compilation is not allowed inside macros on MSVS:

C:\build\precommit_custom_windows\3.4\opencv_contrib\modules\xfeatures2d\test\test_surf.cuda.cpp(186,1): error C2121: '#': invalid character: possibly the result of a macro expansion [C:\build\precommit_custom_windows\build\modules\xfeatures2d\opencv_test_xfeatures2d.vcxproj]
C:\build\precommit_custom_windows\3.4\opencv_contrib\modules\xfeatures2d\test\test_surf.cuda.cpp(174,1): error C2143: syntax error: missing ')' before 'if' [C:\build\precommit_custom_windows\build\modules\xfeatures2d\opencv_test_xfeatures2d.vcxproj]
C:\build\precommit_custom_windows\3.4\opencv_contrib\modules\xfeatures2d\test\test_surf.cuda.cpp(174,1): error C2672: 'testing::Values': no matching overloaded function found [C:\build\precommit_custom_windows\build\modules\xfeatures2d\opencv_test_xfeatures2d.vcxproj]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed modification on #2591

#else
// hessian computation is not bit-exact and lower threshold causes difference count of detection
SURF_HessianThreshold(813.0),
#endif
SURF_HessianThreshold(1000.0)),
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