Skip to content

Replace double atomic in USAC#24499

Merged
asmorkalov merged 7 commits intoopencv:4.xfrom
ivashmak:usac_bug_fix
Nov 20, 2023
Merged

Replace double atomic in USAC#24499
asmorkalov merged 7 commits intoopencv:4.xfrom
ivashmak:usac_bug_fix

Conversation

@ivashmak
Copy link
Copy Markdown
Contributor

@ivashmak ivashmak commented Nov 5, 2023

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 Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the 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

Reference to issue with atomic variable: #24281
Reference to bug with essential matrix: #24482

@asmorkalov
Copy link
Copy Markdown
Contributor

@ivashmak I reworked your solution a bit and replaced divider and int cast with floating point arithmetic. It fixes the original linkage issue, but original code is not thread safe by design.

Lines like this contain data raises, even if best_score_all is atomic:

if (best_score_all > new_score.score) best_score_all = new_score.score;
quality->setBestScore(std::min(best_score_thread.score, (double)best_score_all));

Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

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

👍

@asmorkalov
Copy link
Copy Markdown
Contributor

@ivashmak I fixed remaining warnings and PR ready for merge. I'll contribute data race with the next PR.

@asmorkalov asmorkalov self-assigned this Nov 20, 2023
asmorkalov pushed a commit to asmorkalov/opencv that referenced this pull request Nov 20, 2023
@asmorkalov asmorkalov added the port/backport done Label for maintainers. Authors of PR can ignore this label Nov 20, 2023
@asmorkalov asmorkalov merged commit 1692880 into opencv:4.x Nov 20, 2023
asmorkalov pushed a commit to asmorkalov/opencv that referenced this pull request Nov 20, 2023
IskXCr pushed a commit to Haosonn/opencv that referenced this pull request Dec 20, 2023
Replace double atomic in USAC opencv#24499

### Pull Request Readiness Checklist

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

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

Reference to issue with atomic variable: opencv#24281
Reference to bug with essential matrix: opencv#24482
@asmorkalov asmorkalov mentioned this pull request Jan 19, 2024
thewoz pushed a commit to thewoz/opencv that referenced this pull request May 29, 2024
Replace double atomic in USAC opencv#24499

### Pull Request Readiness Checklist

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

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake

Reference to issue with atomic variable: opencv#24281
Reference to bug with essential matrix: opencv#24482
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug category: calib3d port/backport done Label for maintainers. Authors of PR can ignore this

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants