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

bump rand to 0.9.0-beta.3; renamed "gen" to "random"; test bigrand; fix test lints #317

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ categories = [ "algorithms", "data-structures", "science" ]
license = "MIT OR Apache-2.0"
name = "num-bigint"
repository = "https://github.com/rust-num/num-bigint"
version = "0.4.6"
version = "0.5.0"
readme = "README.md"
exclude = ["/ci/*", "/.github/*"]
edition = "2021"
rust-version = "1.60"

[features]
default = ["std"]
default = ["std", "rand"]
std = ["num-integer/std", "num-traits/std"]
arbitrary = ["dep:arbitrary"]
quickcheck = ["dep:quickcheck"]
Expand Down Expand Up @@ -56,7 +56,7 @@ features = ["i128"]

[dependencies.rand]
optional = true
version = "0.8"
version = " =0.9.0"
default-features = false

[dependencies.serde]
Expand All @@ -73,3 +73,6 @@ default-features = false
optional = true
version = "1"
default-features = false

[dev-dependencies]
rand = { version = " =0.9.0", features = ["thread_rng"]}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Add this to your `Cargo.toml`:

```toml
[dependencies]
num-bigint = "0.4"
num-bigint = "0.5"
```

## Features
Expand All @@ -29,12 +29,12 @@ if your compiler is not new enough.
feature is enabled. To enable it include rand as

```toml
rand = "0.8"
num-bigint = { version = "0.4", features = ["rand"] }
rand = " =0.9.0-beta.3"
num-bigint = { version = "0.5", features = ["rand"] }
```

Note that you must use the version of `rand` that `num-bigint` is compatible
with: `0.8`.
with: ` =0.9.0-beta.3`.

## Releases

Expand Down
36 changes: 18 additions & 18 deletions benches/bigint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ use rng::get_rng;

fn multiply_bench(b: &mut Bencher, xbits: u64, ybits: u64) {
let mut rng = get_rng();
let x = rng.gen_bigint(xbits);
let y = rng.gen_bigint(ybits);
let x = rng.random_bigint(xbits);
let y = rng.random_bigint(ybits);

b.iter(|| &x * &y);
}

fn divide_bench(b: &mut Bencher, xbits: u64, ybits: u64) {
let mut rng = get_rng();
let x = rng.gen_bigint(xbits);
let y = rng.gen_bigint(ybits);
let x = rng.random_bigint(xbits);
let y = rng.random_bigint(ybits);

b.iter(|| &x / &y);
}

fn remainder_bench(b: &mut Bencher, xbits: u64, ybits: u64) {
let mut rng = get_rng();
let x = rng.gen_bigint(xbits);
let y = rng.gen_bigint(ybits);
let x = rng.random_bigint(xbits);
let y = rng.random_bigint(ybits);

b.iter(|| &x % &y);
}
Expand Down Expand Up @@ -186,7 +186,7 @@ fn fib_to_string(b: &mut Bencher) {

fn to_str_radix_bench(b: &mut Bencher, radix: u32, bits: u64) {
let mut rng = get_rng();
let x = rng.gen_bigint(bits);
let x = rng.random_bigint(bits);
b.iter(|| x.to_str_radix(radix));
}

Expand Down Expand Up @@ -222,7 +222,7 @@ fn to_str_radix_36(b: &mut Bencher) {

fn from_str_radix_bench(b: &mut Bencher, radix: u32) {
let mut rng = get_rng();
let x = rng.gen_bigint(1009);
let x = rng.random_bigint(1009);
let s = x.to_str_radix(radix);
assert_eq!(x, BigInt::from_str_radix(&s, radix).unwrap());
b.iter(|| BigInt::from_str_radix(&s, radix));
Expand Down Expand Up @@ -256,7 +256,7 @@ fn from_str_radix_36(b: &mut Bencher) {
fn rand_bench(b: &mut Bencher, bits: u64) {
let mut rng = get_rng();

b.iter(|| rng.gen_bigint(bits));
b.iter(|| rng.random_bigint(bits));
}

#[bench]
Expand Down Expand Up @@ -327,7 +327,7 @@ fn shr(b: &mut Bencher) {
fn hash(b: &mut Bencher) {
use std::collections::HashSet;
let mut rng = get_rng();
let v: Vec<BigInt> = (1000..2000).map(|bits| rng.gen_bigint(bits)).collect();
let v: Vec<BigInt> = (1000..2000).map(|bits| rng.random_bigint(bits)).collect();
b.iter(|| {
let h: HashSet<&BigInt> = v.iter().collect();
assert_eq!(h.len(), v.len());
Expand Down Expand Up @@ -399,8 +399,8 @@ const RFC3526_2048BIT_MODP_GROUP: &str = "\
#[bench]
fn modpow(b: &mut Bencher) {
let mut rng = get_rng();
let base = rng.gen_biguint(2048);
let e = rng.gen_biguint(2048);
let base = rng.random_biguint(2048);
let e = rng.random_biguint(2048);
let m = BigUint::from_str_radix(RFC3526_2048BIT_MODP_GROUP, 16).unwrap();

b.iter(|| base.modpow(&e, &m));
Expand All @@ -409,8 +409,8 @@ fn modpow(b: &mut Bencher) {
#[bench]
fn modpow_even(b: &mut Bencher) {
let mut rng = get_rng();
let base = rng.gen_biguint(2048);
let e = rng.gen_biguint(2048);
let base = rng.random_biguint(2048);
let e = rng.random_biguint(2048);
// Make the modulus even, so monty (base-2^32) doesn't apply.
let m = BigUint::from_str_radix(RFC3526_2048BIT_MODP_GROUP, 16).unwrap() - 1u32;

Expand All @@ -420,31 +420,31 @@ fn modpow_even(b: &mut Bencher) {
#[bench]
fn to_u32_digits(b: &mut Bencher) {
let mut rng = get_rng();
let n = rng.gen_biguint(2048);
let n = rng.random_biguint(2048);

b.iter(|| n.to_u32_digits());
}

#[bench]
fn iter_u32_digits(b: &mut Bencher) {
let mut rng = get_rng();
let n = rng.gen_biguint(2048);
let n = rng.random_biguint(2048);

b.iter(|| n.iter_u32_digits().max());
}

#[bench]
fn to_u64_digits(b: &mut Bencher) {
let mut rng = get_rng();
let n = rng.gen_biguint(2048);
let n = rng.random_biguint(2048);

b.iter(|| n.to_u64_digits());
}

#[bench]
fn iter_u64_digits(b: &mut Bencher) {
let mut rng = get_rng();
let n = rng.gen_biguint(2048);
let n = rng.random_biguint(2048);

b.iter(|| n.iter_u64_digits().max());
}
4 changes: 2 additions & 2 deletions benches/gcd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use rng::get_rng;

fn bench(b: &mut Bencher, bits: u64, gcd: fn(&BigUint, &BigUint) -> BigUint) {
let mut rng = get_rng();
let x = rng.gen_biguint(bits);
let y = rng.gen_biguint(bits);
let x = rng.random_biguint(bits);
let y = rng.random_biguint(bits);

assert_eq!(euclid(&x, &y), x.gcd(&y));

Expand Down
6 changes: 3 additions & 3 deletions benches/rng/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl RngCore for XorShiftStar {
}
}

fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
Ok(self.fill_bytes(dest))
}
// fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
// Ok(self.fill_bytes(dest))
// }
}
6 changes: 3 additions & 3 deletions benches/roots.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn check(x: &BigUint, n: u32) {
}

fn bench_sqrt(b: &mut Bencher, bits: u64) {
let x = get_rng().gen_biguint(bits);
let x = get_rng().random_biguint(bits);
eprintln!("bench_sqrt({})", x);

check(&x, 2);
Expand Down Expand Up @@ -65,7 +65,7 @@ fn big4k_sqrt(b: &mut Bencher) {
}

fn bench_cbrt(b: &mut Bencher, bits: u64) {
let x = get_rng().gen_biguint(bits);
let x = get_rng().random_biguint(bits);
eprintln!("bench_cbrt({})", x);

check(&x, 3);
Expand Down Expand Up @@ -93,7 +93,7 @@ fn big4k_cbrt(b: &mut Bencher) {
}

fn bench_nth_root(b: &mut Bencher, bits: u64, n: u32) {
let x = get_rng().gen_biguint(bits);
let x = get_rng().random_biguint(bits);
eprintln!("bench_{}th_root({})", n, x);

check(&x, n);
Expand Down
Loading