-
Notifications
You must be signed in to change notification settings - Fork 195
Fix: don't sample elements with weight 0 #983
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
Open
graidl
wants to merge
13
commits into
JuliaStats:master
Choose a base branch
from
graidl:fix-weighted-sampling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−0
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
194e88f
Fix: don't sample elements with weight 0
graidl 069b79f
Alternative: replace sum(wv)
graidl 6582fa0
Revert "Alternative: replace sum(wv)"
graidl c78063e
Test included
graidl 54388a9
Removed accidentally committed file
graidl c3f6c74
findlast avoided, test uses StableRNG
graidl 5668851
Added warning in test if issue not triggered
graidl c0b32f3
Situation commented and warning adapted
graidl 011c073
Warning message changed
graidl 2393aac
Test simplified by providing sum
graidl ff8740b
Merge branch 'master' into fix-weighted-sampling
graidl 3e75e5d
Merge branch 'master' into fix-weighted-sampling
graidl 32059eb
Merge branch 'master' into fix-weighted-sampling
graidl 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 hidden or 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
This file contains hidden or 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 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -298,6 +298,18 @@ end | |||||||||||||
| end | ||||||||||||||
| end | ||||||||||||||
|
|
||||||||||||||
| @testset "issue #982" begin | ||||||||||||||
| # Issue #982 was triggered in conjunction with SIMD support under certain circumstances, | ||||||||||||||
| # in particular with the following weights when sum(w) == 0.662413f0. | ||||||||||||||
| # The following mimics this case. | ||||||||||||||
| w = Float32[0.0437019, 0.04302464, 0.039748967, 0.040406376, 0.042578973, | ||||||||||||||
| 0.040906563, 0.039586294, 0.04302464, 0.042357873, 0.04302464, 0.039262936, | ||||||||||||||
| 0.040406376, 0.040406376, 0.041919112, 0.041484896, 0.04057242, 0.0] | ||||||||||||||
|
Comment on lines
+305
to
+307
Member
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.
Suggested change
|
||||||||||||||
| rng = StableRNG(889858990530) | ||||||||||||||
| s = sample(rng, Weights(w, 0.662413f0)) | ||||||||||||||
| @test s == length(w) - 1 | ||||||||||||||
| @test sample(rng, Weights([1, 2, 0, 0], 10000)) == 2 # another more trivial test | ||||||||||||||
|
Member
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.
Suggested change
|
||||||||||||||
| end | ||||||||||||||
| # Custom weights without `values` field | ||||||||||||||
| struct YAUnitWeights <: AbstractWeights{Int, Int, Vector{Int}} | ||||||||||||||
| n::Int | ||||||||||||||
|
|
||||||||||||||
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.