Skip to content

Improve calculation of the scale parameter for the uniform float distribution. #1301

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

Improve calculation of the scale parameter for the uniform float distribution. #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0a631f
Improve calculation of the `scale` parameter for the uniform float di…
WarrenWeckesser Mar 18, 2023
36bb4df
Merge branch 'master' into gh1299-uniform-hang
WarrenWeckesser Mar 18, 2023
d94fca8
Move the implementation of compute_scale() to utils.rs.
WarrenWeckesser Mar 19, 2023
4b7eca0
Move the tests for compute_scale() to utils.rs.
WarrenWeckesser Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions src/distributions/uniform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ use core::ops::{Range, RangeInclusive};
use core::convert::TryFrom;

use crate::distributions::float::IntoFloat;
use crate::distributions::utils::{BoolAsSIMD, FloatAsSIMD, FloatSIMDUtils, IntAsSIMD, WideningMultiply};
use crate::distributions::utils::{
BoolAsSIMD, FloatAsSIMD, FloatSIMDUtils, IntAsSIMD, ScaleComputable, WideningMultiply,
};
use crate::distributions::Distribution;
#[cfg(feature = "simd_support")]
use crate::distributions::Standard;
Expand Down Expand Up @@ -849,22 +851,12 @@ macro_rules! uniform_float_impl {
if !(low.all_lt(high)) {
return Err(Error::EmptyRange);
}
let max_rand = <$ty>::splat(
(::core::$u_scalar::MAX >> $bits_to_discard).into_float_with_exponent(0) - 1.0,
);

let mut scale = high - low;
if !(scale.all_finite()) {
if !((high - low).all_finite()) {
return Err(Error::NonFinite);
}

loop {
let mask = (scale * max_rand + low).ge_mask(high);
if !mask.any() {
break;
}
scale = scale.decrease_masked(mask);
}
let scale = <$ty>::compute_scale(low, high);

debug_assert!(<$ty>::splat(0.0).all_le(scale));

Expand Down
Loading