Skip to content

Conversation

tomoaki0705
Copy link
Contributor

@tomoaki0705 tomoaki0705 commented Jul 4, 2020

  • resolves CUDA: Hessian computation is not bit-exact #2587
  • It's another rounding error, so this is a low priority PR.
  • I kept the threshold as low as possible, to make this test pass on Jetson
  • This will loosen the threshold on other combinations, so I'm open for discussion on how to avoid this test failure

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom
buildworker:Custom=linux-4
build_image:Custom=ubuntu-cuda:16.04

@tomoaki0705 tomoaki0705 force-pushed the fixCUDASurfFailure branch from 3bb188a to 32f8801 Compare July 5, 2020 02:22
Copy link
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Thank you!

@opencv-pushbot opencv-pushbot merged commit d98d9d7 into opencv:3.4 Jul 5, 2020
@tomoaki0705 tomoaki0705 deleted the fixCUDASurfFailure branch July 5, 2020 23:03
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

@alalek alalek mentioned this pull request Jul 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants