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.

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

Move rand distr #1577

Merged
merged 8 commits into from
Feb 6, 2025
Merged

Move rand distr #1577

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e819abb
delete rand_distr stuff
benjamin-lieser Feb 5, 2025
a714d8a
path ignore in benches.yml
benjamin-lieser Feb 5, 2025
3e63311
remove rand_distr dependency from benches
benjamin-lieser Feb 5, 2025
73b1998
fix import and size_of call
benjamin-lieser Feb 5, 2025
3b7b7d2
fmt
benjamin-lieser Feb 5, 2025
a642e8b
restore weighted.rs
benjamin-lieser Feb 5, 2025
32a73f9
bump serde_json dev dependency
benjamin-lieser Feb 5, 2025
ee92cb8
remove ziggurat_tables.py
benjamin-lieser Feb 6, 2025
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
2 changes: 0 additions & 2 deletions .github/workflows/benches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on:
branches: [ master ]
paths-ignore:
- "**.md"
- "distr_test/**"
- "examples/**"
pull_request:
branches: [ master ]
paths-ignore:
- "**.md"
- "distr_test/**"
- "examples/**"

defaults:
Expand Down
43 changes: 0 additions & 43 deletions .github/workflows/distr_test.yml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ on:
paths-ignore:
- "**.md"
- "benches/**"
- "distr_test/**"
pull_request:
branches: [ master, '0.[0-9]+' ]
paths-ignore:
- "**.md"
- "benches/**"
- "distr_test/**"

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down Expand Up @@ -47,8 +45,6 @@ jobs:
run: cargo doc --all-features --no-deps
- name: rand_core
run: cargo doc --all-features --package rand_core --no-deps
- name: rand_distr
run: cargo doc --all-features --package rand_distr --no-deps
- name: rand_chacha
run: cargo doc --all-features --package rand_chacha --no-deps
- name: rand_pcg
Expand Down Expand Up @@ -122,11 +118,6 @@ jobs:
cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml
cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml --no-default-features
cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml --no-default-features --features=os_rng
- name: Test rand_distr
run: |
cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --features=serde
cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --no-default-features
cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --no-default-features --features=std,std_math
- name: Test rand_pcg
run: cargo test --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde
- name: Test rand_chacha
Expand Down Expand Up @@ -162,7 +153,6 @@ jobs:
cross test --no-fail-fast --target ${{ matrix.target }} --features=serde,log,small_rng
cross test --no-fail-fast --target ${{ matrix.target }} --examples
cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml
cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --features=serde
cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde
cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_chacha/Cargo.toml

Expand All @@ -182,7 +172,6 @@ jobs:
cargo miri test --manifest-path rand_core/Cargo.toml
cargo miri test --manifest-path rand_core/Cargo.toml --features=serde
cargo miri test --manifest-path rand_core/Cargo.toml --no-default-features
#cargo miri test --manifest-path rand_distr/Cargo.toml # no unsafe and lots of slow tests
cargo miri test --manifest-path rand_pcg/Cargo.toml --features=serde
cargo miri test --manifest-path rand_chacha/Cargo.toml --no-default-features

Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ log = ["dep:log"]
[workspace]
members = [
"rand_core",
"rand_distr",
"rand_chacha",
"rand_pcg",
]
Expand Down
9 changes: 0 additions & 9 deletions benches/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ publish = false
rand = { path = "..", features = ["small_rng", "nightly"] }
rand_pcg = { path = "../rand_pcg" }
rand_chacha = { path = "../rand_chacha" }
rand_distr = { path = "../rand_distr" }
criterion = "0.5"
criterion-cycles-per-byte = "0.6"

Expand All @@ -22,10 +21,6 @@ harness = false
name = "bool"
harness = false

[[bench]]
name = "distr"
harness = false

[[bench]]
name = "generators"
harness = false
Expand All @@ -49,7 +44,3 @@ harness = false
[[bench]]
name = "uniform_float"
harness = false

[[bench]]
name = "weighted"
harness = false
benjamin-lieser marked this conversation as resolved.
Show resolved Hide resolved
194 changes: 0 additions & 194 deletions benches/benches/distr.rs
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions benches/benches/standard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
use core::time::Duration;
use criterion::measurement::WallTime;
use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
use rand::distr::{Alphanumeric, StandardUniform};
use rand::distr::{Alphanumeric, Open01, OpenClosed01, StandardUniform};
use rand::prelude::*;
use rand_distr::{Open01, OpenClosed01};
use rand_pcg::Pcg64Mcg;

criterion_group!(
Expand All @@ -25,7 +24,7 @@ fn bench_ty<T, D>(g: &mut BenchmarkGroup<WallTime>, name: &str)
where
D: Distribution<T> + Default,
{
g.throughput(criterion::Throughput::Bytes(size_of::<T>() as u64));
g.throughput(criterion::Throughput::Bytes(core::mem::size_of::<T>() as u64));
g.bench_function(name, |b| {
let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());

Expand Down
Loading
Loading