-
Notifications
You must be signed in to change notification settings - Fork 594
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
More excessively micro micro-optimizations #5616
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -193,18 +193,20 @@ public List<VariantContext> calculateRefConfidence(final Haplotype refHaplotype, | |
final String sampleName = readLikelihoods.getSample(0); | ||
|
||
final int globalRefOffset = refSpan.getStart() - activeRegion.getExtendedSpan().getStart(); | ||
for ( final ReadPileup pileup : refPileups ) { | ||
// Note, we use an indexed for-loop here because this method has a large impact on the profile of HaplotypeCaller runtime in GVCF mode | ||
final int refPileupsSize = refPileups.size(); | ||
for (int i = 0; i < refPileupsSize; i++) { | ||
final ReadPileup pileup = refPileups.get(i); | ||
final Locatable curPos = pileup.getLocation(); | ||
final int offset = curPos.getStart() - refSpan.getStart(); | ||
|
||
final VariantContext overlappingSite = GATKVariantContextUtils.getOverlappingVariantContext(curPos, variantCalls); | ||
final List<VariantContext> currentPriors = getMatchingPriors(curPos, overlappingSite, VCpriors); | ||
if ( overlappingSite != null && overlappingSite.getStart() == curPos.getStart() ) { | ||
final List<VariantContext> currentPriors = VCpriors.isEmpty() ? Collections.emptyList() : getMatchingPriors(curPos, overlappingSite, VCpriors); | ||
if (overlappingSite != null && overlappingSite.getStart() == curPos.getStart()) { | ||
if (applyPriors) { | ||
results.add(PosteriorProbabilitiesUtils.calculatePosteriorProbs(overlappingSite, currentPriors, | ||
numRefSamplesForPrior, options)); | ||
} | ||
else { | ||
} else { | ||
results.add(overlappingSite); | ||
} | ||
} else { | ||
|
@@ -420,9 +422,17 @@ protected static boolean isAltAfterAssembly(final PileupElement element, final b | |
* @param priorList priors within the current ActiveRegion | ||
* @return prior VCs representing the same variant position as call | ||
*/ | ||
List<VariantContext> getMatchingPriors(final Locatable curPos, final VariantContext call, final List<VariantContext> priorList) { | ||
private List<VariantContext> getMatchingPriors(final Locatable curPos, final VariantContext call, final List<VariantContext> priorList) { | ||
final int position = call != null ? call.getStart() : curPos.getStart(); | ||
return priorList.stream().filter(vc -> position == vc.getStart()).collect(Collectors.toList()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a comment that this method is implemented with an old-school for loop instead of streaming for performance reasons (otherwise, someone will probably come along in 2 years and undo this). |
||
final List<VariantContext> matchedPriors = new ArrayList<>(priorList.size()); | ||
// NOTE: a for loop is used here because this method ends up being called per-pileup, per-read and using a loop instead of streaming saves runtime | ||
final int priorsListSize = priorList.size(); | ||
for (int i = 0; i < priorsListSize; i++) { | ||
if (position == priorList.get(i).getStart()) { | ||
matchedPriors.add(priorList.get(i)); | ||
} | ||
} | ||
return matchedPriors; | ||
} | ||
|
||
/** | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add comment here that the old-school for loop is intentional (for-each was found to show up on the profiler).