-
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from coreylowman/add-sampling
Adds rand_distr::Distribution implementations for f16 & bf16
- Loading branch information
Showing
5 changed files
with
140 additions
and
3 deletions.
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| use crate::{bf16, f16}; | ||
|
|
||
| use rand::{distributions::Distribution, Rng}; | ||
| use rand_distr::uniform::UniformFloat; | ||
|
|
||
| macro_rules! impl_distribution_via_f32 { | ||
| ($Ty:ty, $Distr:ty) => { | ||
| impl Distribution<$Ty> for $Distr { | ||
| fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> $Ty { | ||
| <$Ty>::from_f32(<Self as Distribution<f32>>::sample(self, rng)) | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| impl_distribution_via_f32!(f16, rand_distr::Standard); | ||
| impl_distribution_via_f32!(f16, rand_distr::StandardNormal); | ||
| impl_distribution_via_f32!(f16, rand_distr::Exp1); | ||
| impl_distribution_via_f32!(f16, rand_distr::Open01); | ||
| impl_distribution_via_f32!(f16, rand_distr::OpenClosed01); | ||
|
|
||
| impl_distribution_via_f32!(bf16, rand_distr::Standard); | ||
| impl_distribution_via_f32!(bf16, rand_distr::StandardNormal); | ||
| impl_distribution_via_f32!(bf16, rand_distr::Exp1); | ||
| impl_distribution_via_f32!(bf16, rand_distr::Open01); | ||
| impl_distribution_via_f32!(bf16, rand_distr::OpenClosed01); | ||
|
|
||
| #[derive(Debug, Clone, Copy)] | ||
| pub struct Float16Sampler(UniformFloat<f32>); | ||
|
|
||
| impl rand_distr::uniform::SampleUniform for f16 { | ||
| type Sampler = Float16Sampler; | ||
| } | ||
|
|
||
| impl rand_distr::uniform::UniformSampler for Float16Sampler { | ||
| type X = f16; | ||
| fn new<B1, B2>(low: B1, high: B2) -> Self | ||
| where | ||
| B1: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| B2: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| { | ||
| Self(UniformFloat::new( | ||
| low.borrow().to_f32(), | ||
| high.borrow().to_f32(), | ||
| )) | ||
| } | ||
| fn new_inclusive<B1, B2>(low: B1, high: B2) -> Self | ||
| where | ||
| B1: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| B2: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| { | ||
| Self(UniformFloat::new_inclusive( | ||
| low.borrow().to_f32(), | ||
| high.borrow().to_f32(), | ||
| )) | ||
| } | ||
| fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X { | ||
| f16::from_f32(self.0.sample(rng)) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, Copy)] | ||
| pub struct BFloat16Sampler(UniformFloat<f32>); | ||
|
|
||
| impl rand_distr::uniform::SampleUniform for bf16 { | ||
| type Sampler = BFloat16Sampler; | ||
| } | ||
|
|
||
| impl rand_distr::uniform::UniformSampler for BFloat16Sampler { | ||
| type X = bf16; | ||
| fn new<B1, B2>(low: B1, high: B2) -> Self | ||
| where | ||
| B1: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| B2: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| { | ||
| Self(UniformFloat::new( | ||
| low.borrow().to_f32(), | ||
| high.borrow().to_f32(), | ||
| )) | ||
| } | ||
| fn new_inclusive<B1, B2>(low: B1, high: B2) -> Self | ||
| where | ||
| B1: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| B2: rand_distr::uniform::SampleBorrow<Self::X> + Sized, | ||
| { | ||
| Self(UniformFloat::new_inclusive( | ||
| low.borrow().to_f32(), | ||
| high.borrow().to_f32(), | ||
| )) | ||
| } | ||
| fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Self::X { | ||
| bf16::from_f32(self.0.sample(rng)) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| use rand::{thread_rng, Rng}; | ||
| use rand_distr::{Standard, StandardNormal, Uniform}; | ||
|
|
||
| #[test] | ||
| fn test_sample_f16() { | ||
| let mut rng = thread_rng(); | ||
| let _: f16 = rng.sample(Standard); | ||
| let _: f16 = rng.sample(StandardNormal); | ||
| let _: f16 = rng.sample(Uniform::new(f16::from_f32(0.0), f16::from_f32(1.0))); | ||
| #[cfg(feature = "num-traits")] | ||
| let _: f16 = | ||
| rng.sample(rand_distr::Normal::new(f16::from_f32(0.0), f16::from_f32(1.0)).unwrap()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_sample_bf16() { | ||
| let mut rng = thread_rng(); | ||
| let _: bf16 = rng.sample(Standard); | ||
| let _: bf16 = rng.sample(StandardNormal); | ||
| let _: bf16 = rng.sample(Uniform::new(bf16::from_f32(0.0), bf16::from_f32(1.0))); | ||
| #[cfg(feature = "num-traits")] | ||
| let _: bf16 = | ||
| rng.sample(rand_distr::Normal::new(bf16::from_f32(0.0), bf16::from_f32(1.0)).unwrap()); | ||
| } | ||
| } |