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

Add gamma function to f32 and f64 #99747

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,9 @@ dependencies = [

[[package]]
name = "compiler_builtins"
version = "0.1.98"
version = "0.1.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfbefa16407456e5cad1ad066c84dfcb980afe4437103a0007d1c2f136130210"
checksum = "d6c0f24437059853f0fa64afc51f338f93647a3de4cf3358ba1bb4171a199775"
dependencies = [
"cc",
"rustc-std-workspace-core",
Expand Down
2 changes: 1 addition & 1 deletion library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" }
core = { path = "../core", public = true }
libc = { version = "0.2.146", default-features = false, features = ['rustc-dep-of-std'], public = true }
compiler_builtins = { version = "0.1.98" }
compiler_builtins = { version = "0.1.100" }
profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" }
hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep-of-std'] }
Expand Down
42 changes: 42 additions & 0 deletions library/std/src/f32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -957,4 +957,46 @@ impl f32 {
pub fn atanh(self) -> f32 {
0.5 * ((2.0 * self) / (1.0 - self)).ln_1p()
}

/// Gamma function.
///
/// # Examples
///
/// ```
/// #![feature(float_gamma)]
/// let x = 5.0f32;
///
/// let abs_difference = (x.gamma() - 24.0).abs();
///
/// assert!(abs_difference <= f32::EPSILON);
/// ```
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[unstable(feature = "float_gamma", issue = "99842")]
#[inline]
pub fn gamma(self) -> f32 {
unsafe { cmath::tgammaf(self) }
}

/// Returns the natural logarithm of the gamma function.
Copy link
Member

Choose a reason for hiding this comment

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

This is wrong, it returns the natural log of the absolute value of the gamma function.

Copy link
Member

Choose a reason for hiding this comment

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

#[test]
fn test_ln_gamma() {
    assert_approx_eq!(1.0f64.ln_gamma().0, 0.0f64);
    assert_eq!(1.0f64.ln_gamma().1, 1);
    assert_approx_eq!(2.0f64.ln_gamma().0, 0.0f64);
    assert_eq!(2.0f64.ln_gamma().1, 1);
    assert_approx_eq!(3.0f64.ln_gamma().0, 2.0f64.ln());
    assert_eq!(3.0f64.ln_gamma().1, 1);
    assert_approx_eq!((-0.5f64).ln_gamma().0, (2.0 * consts::PI.sqrt()).ln());
    assert_eq!((-0.5f64).ln_gamma().1, -1);
}

? am I just missing something, if so why does the final test case pass...

Copy link
Member

Choose a reason for hiding this comment

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

Γ(-0.5f64) is negative, its natural log should be undefined

Copy link
Member

Choose a reason for hiding this comment

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

...well, it sounds obvious now that you've said it, so...!
#114754

///
/// # Examples
///
/// ```
/// #![feature(float_gamma)]
/// let x = 2.0f32;
///
/// let abs_difference = (x.ln_gamma().0 - 0.0).abs();
///
/// assert!(abs_difference <= f32::EPSILON);
/// ```
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[unstable(feature = "float_gamma", issue = "99842")]
#[inline]
pub fn ln_gamma(self) -> (f32, i32) {
let mut signgamp: i32 = 0;
let x = unsafe { cmath::lgammaf_r(self, &mut signgamp) };
(x, signgamp)
}
}
32 changes: 32 additions & 0 deletions library/std/src/f32/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,38 @@ fn test_atanh() {
assert_approx_eq!((-0.5f32).atanh(), -0.54930614433405484569762261846126285f32);
}

#[test]
fn test_gamma() {
// precision can differ between platforms
assert_approx_eq!(1.0f32.gamma(), 1.0f32);
assert_approx_eq!(2.0f32.gamma(), 1.0f32);
assert_approx_eq!(3.0f32.gamma(), 2.0f32);
assert_approx_eq!(4.0f32.gamma(), 6.0f32);
assert_approx_eq!(5.0f32.gamma(), 24.0f32);
assert_approx_eq!(0.5f32.gamma(), consts::PI.sqrt());
assert_approx_eq!((-0.5f32).gamma(), -2.0 * consts::PI.sqrt());
assert_eq!(0.0f32.gamma(), f32::INFINITY);
assert_eq!((-0.0f32).gamma(), f32::NEG_INFINITY);
assert!((-1.0f32).gamma().is_nan());
assert!((-2.0f32).gamma().is_nan());
assert!(f32::NAN.gamma().is_nan());
assert!(f32::NEG_INFINITY.gamma().is_nan());
assert_eq!(f32::INFINITY.gamma(), f32::INFINITY);
assert_eq!(171.71f32.gamma(), f32::INFINITY);
}

#[test]
fn test_ln_gamma() {
assert_approx_eq!(1.0f32.ln_gamma().0, 0.0f32);
assert_eq!(1.0f32.ln_gamma().1, 1);
assert_approx_eq!(2.0f32.ln_gamma().0, 0.0f32);
assert_eq!(2.0f32.ln_gamma().1, 1);
assert_approx_eq!(3.0f32.ln_gamma().0, 2.0f32.ln());
assert_eq!(3.0f32.ln_gamma().1, 1);
assert_approx_eq!((-0.5f32).ln_gamma().0, (2.0 * consts::PI.sqrt()).ln());
assert_eq!((-0.5f32).ln_gamma().1, -1);
}

#[test]
fn test_real_consts() {
use super::consts;
Expand Down
42 changes: 42 additions & 0 deletions library/std/src/f64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -957,4 +957,46 @@ impl f64 {
pub fn atanh(self) -> f64 {
0.5 * ((2.0 * self) / (1.0 - self)).ln_1p()
}

/// Gamma function.
///
/// # Examples
///
/// ```
/// #![feature(float_gamma)]
/// let x = 5.0f64;
///
/// let abs_difference = (x.gamma() - 24.0).abs();
///
/// assert!(abs_difference <= f64::EPSILON);
/// ```
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[unstable(feature = "float_gamma", issue = "99842")]
#[inline]
pub fn gamma(self) -> f64 {
unsafe { cmath::tgamma(self) }
}

/// Returns the natural logarithm of the gamma function.
///
/// # Examples
///
/// ```
/// #![feature(float_gamma)]
/// let x = 2.0f64;
///
/// let abs_difference = (x.ln_gamma().0 - 0.0).abs();
///
/// assert!(abs_difference <= f64::EPSILON);
/// ```
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[unstable(feature = "float_gamma", issue = "99842")]
#[inline]
pub fn ln_gamma(self) -> (f64, i32) {
let mut signgamp: i32 = 0;
let x = unsafe { cmath::lgamma_r(self, &mut signgamp) };
(x, signgamp)
}
}
32 changes: 32 additions & 0 deletions library/std/src/f64/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,38 @@ fn test_atanh() {
assert_approx_eq!((-0.5f64).atanh(), -0.54930614433405484569762261846126285f64);
}

#[test]
fn test_gamma() {
// precision can differ between platforms
assert_approx_eq!(1.0f64.gamma(), 1.0f64);
assert_approx_eq!(2.0f64.gamma(), 1.0f64);
assert_approx_eq!(3.0f64.gamma(), 2.0f64);
assert_approx_eq!(4.0f64.gamma(), 6.0f64);
assert_approx_eq!(5.0f64.gamma(), 24.0f64);
Comment on lines +641 to +645
Copy link
Member

Choose a reason for hiding this comment

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

...for what platform is this ever imprecise?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure what guarantees different platforms provide around preciseness (or if it can change over time), but we can try with assert_eq!

Copy link
Contributor Author

@ankane ankane Jul 31, 2023

Choose a reason for hiding this comment

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

Looks like it fails on x86_64-unknown-linux-gnu (at least for f32)

Copy link
Member

Choose a reason for hiding this comment

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

My disappointment is immeasurable and my day is ruined.

Well, okay. Can you add a comment to this effect and then squash down the first 6 commits before the one that includes the compiler_builtins bump?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated and squashed

Copy link
Member

Choose a reason for hiding this comment

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

Thank you!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No problem, thanks for helping move this along!

assert_approx_eq!(0.5f64.gamma(), consts::PI.sqrt());
assert_approx_eq!((-0.5f64).gamma(), -2.0 * consts::PI.sqrt());
assert_eq!(0.0f64.gamma(), f64::INFINITY);
assert_eq!((-0.0f64).gamma(), f64::NEG_INFINITY);
assert!((-1.0f64).gamma().is_nan());
assert!((-2.0f64).gamma().is_nan());
assert!(f64::NAN.gamma().is_nan());
assert!(f64::NEG_INFINITY.gamma().is_nan());
assert_eq!(f64::INFINITY.gamma(), f64::INFINITY);
assert_eq!(171.71f64.gamma(), f64::INFINITY);
}

#[test]
fn test_ln_gamma() {
assert_approx_eq!(1.0f64.ln_gamma().0, 0.0f64);
assert_eq!(1.0f64.ln_gamma().1, 1);
assert_approx_eq!(2.0f64.ln_gamma().0, 0.0f64);
assert_eq!(2.0f64.ln_gamma().1, 1);
assert_approx_eq!(3.0f64.ln_gamma().0, 2.0f64.ln());
assert_eq!(3.0f64.ln_gamma().1, 1);
assert_approx_eq!((-0.5f64).ln_gamma().0, (2.0 * consts::PI.sqrt()).ln());
assert_eq!((-0.5f64).ln_gamma().1, -1);
}

#[test]
fn test_real_consts() {
use super::consts;
Expand Down
1 change: 1 addition & 0 deletions library/std/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@
#![feature(exact_size_is_empty)]
#![feature(exclusive_wrapper)]
#![feature(extend_one)]
#![feature(float_gamma)]
#![feature(float_minimum_maximum)]
#![feature(float_next_up_down)]
#![feature(hasher_prefixfree_extras)]
Expand Down
4 changes: 4 additions & 0 deletions library/std/src/sys/unix/cmath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ extern "C" {
pub fn tanf(n: f32) -> f32;
pub fn tanh(n: f64) -> f64;
pub fn tanhf(n: f32) -> f32;
pub fn tgamma(n: f64) -> f64;
pub fn tgammaf(n: f32) -> f32;
pub fn lgamma_r(n: f64, s: &mut i32) -> f64;
pub fn lgammaf_r(n: f32, s: &mut i32) -> f32;
}
6 changes: 5 additions & 1 deletion library/std/src/sys/windows/cmath.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![cfg(not(test))]

use libc::{c_double, c_float};
use libc::{c_double, c_float, c_int};

extern "C" {
pub fn acos(n: c_double) -> c_double;
Expand All @@ -23,6 +23,10 @@ extern "C" {
pub fn sinh(n: c_double) -> c_double;
pub fn tan(n: c_double) -> c_double;
pub fn tanh(n: c_double) -> c_double;
pub fn tgamma(n: c_double) -> c_double;
pub fn tgammaf(n: c_float) -> c_float;
pub fn lgamma_r(n: c_double, s: &mut c_int) -> c_double;
pub fn lgammaf_r(n: c_float, s: &mut c_int) -> c_float;
}

pub use self::shims::*;
Expand Down
Loading