Skip to content
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.

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

Feature/compute vectorised score for global alignment #1379

Merged

Conversation

rrahn
Copy link
Contributor

@rrahn rrahn commented Nov 23, 2019

Fixes #1351

Implements the initial version of vectorised alignments.
🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉

Depends on PR #1378 and issue #1375

Accordingly, only the last 9 commits are relevant.

On macos (catalina) the CI breaks because of the allocator bug. This should be fixed once #1362 is merged.

@rrahn rrahn requested a review from joergi-w November 23, 2019 23:06
@rrahn rrahn force-pushed the feature/compute_vectorised_score_for_global_alignment branch from 532b9d9 to 70f8ca5 Compare November 24, 2019 00:11
@codecov
Copy link

codecov bot commented Nov 24, 2019

Codecov Report

Merging #1379 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1379      +/-   ##
==========================================
+ Coverage   97.56%   97.58%   +0.01%     
==========================================
  Files         231      232       +1     
  Lines        8755     8822      +67     
==========================================
+ Hits         8542     8609      +67     
  Misses        213      213
Impacted Files Coverage Δ
.../alignment/pairwise/policy/find_optimum_policy.hpp 100% <ø> (ø) ⬆️
...e/seqan3/alignment/pairwise/detail/type_traits.hpp 100% <ø> (ø) ⬆️
...e/seqan3/alignment/scoring/scoring_scheme_base.hpp 100% <ø> (ø) ⬆️
...clude/seqan3/alignment/pairwise/align_pairwise.hpp 100% <100%> (ø) ⬆️
.../pairwise/execution/alignment_executor_two_way.hpp 98.33% <100%> (ø) ⬆️
...ignment/pairwise/policy/simd_affine_gap_policy.hpp 100% <100%> (ø)
...ignment/pairwise/policy/affine_gap_init_policy.hpp 100% <100%> (ø) ⬆️
.../seqan3/alignment/pairwise/alignment_algorithm.hpp 100% <100%> (ø) ⬆️
...qan3/alignment/pairwise/alignment_configurator.hpp 100% <100%> (ø) ⬆️
...lignment/pairwise/policy/scoring_scheme_policy.hpp 100% <100%> (ø)
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6f7f3c2...940d824. Read the comment docs.

@joergi-w
Copy link
Member

We wanted to keep PRs small... I hope this is not an urgent one, I'll need 2-3 days.

@rrahn
Copy link
Contributor Author

rrahn commented Nov 25, 2019

We wanted to keep PRs small...

I tried to make the commits as small as possible. The biggest commit however could not be reduced without introducing compile errors or failing tests. I did not want to open PRs for one-line commits and then manage all the PRs with several rebases. That is not bearable either. I removed larger components already. Also note that only last 9 commits are relevant. In total it was a 500 line change or something. I hope that is ok.

Copy link
Member

@joergi-w joergi-w left a comment

Choose a reason for hiding this comment

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

Reviewed commits 11-14

@rrahn rrahn requested a review from joergi-w November 26, 2019 15:34
Copy link
Member

@joergi-w joergi-w left a comment

Choose a reason for hiding this comment

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

This is the review for the remaining commits 15-20. As discussed I went through my comments afterwards and applied the suggestion feature where possible.

@rrahn rrahn requested a review from joergi-w November 27, 2019 07:27
@rrahn
Copy link
Contributor Author

rrahn commented Nov 27, 2019

not sure why suddenly the osx builds fail. But maybe this is related to catalina issue with the aligned allocator. Waiting for #1362 to test if the error still occurs.

Copy link
Member

@joergi-w joergi-w 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! Looks good now.

@rrahn rrahn force-pushed the feature/compute_vectorised_score_for_global_alignment branch 2 times, most recently from f847f5a to f208b50 Compare December 5, 2019 07:47
@rrahn
Copy link
Contributor Author

rrahn commented Dec 5, 2019

@smehringer I cleaned the commits now. Only the very first commit is not necessary anymore.

@rrahn
Copy link
Contributor Author

rrahn commented Dec 5, 2019

On mac os build failure is probably related to #1362

@rrahn rrahn requested a review from smehringer December 9, 2019 22:49
Copy link
Member

@smehringer smehringer left a comment

Choose a reason for hiding this comment

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

I forgot: please fix the commit history.
And what about a note in the Changelog?

@rrahn
Copy link
Contributor Author

rrahn commented Dec 10, 2019

And what about a note in the Changelog?

Well I wanted to add this when the stuff is complete with the various configurations.

@rrahn rrahn force-pushed the feature/compute_vectorised_score_for_global_alignment branch from d35d89d to 01042a5 Compare December 10, 2019 11:41
@rrahn
Copy link
Contributor Author

rrahn commented Dec 12, 2019

@smehringer polite ping

@smehringer
Copy link
Member

I guess it cannot be merged yet since it still depends on another PR

@rrahn
Copy link
Contributor Author

rrahn commented Dec 12, 2019

yes. right. I forgot about that as well. Too long ago

@rrahn rrahn force-pushed the feature/compute_vectorised_score_for_global_alignment branch from 01042a5 to 940d824 Compare December 15, 2019 12:14
@rrahn rrahn merged commit 3fc6c03 into seqan:master Dec 15, 2019
@rrahn rrahn deleted the feature/compute_vectorised_score_for_global_alignment branch January 16, 2020 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

### Vectorisation level 1
3 participants