Make gen portable

.clippy.toml

@@ -11,6 +11,7 @@ allowed-duplicate-crates = [
   "objc2-foundation",
   "proc-macro-utils", # TODO: can be resolved by updating leptos crates to 0.7.0
   "serde_qs", # TODO: can be resolved by updating leptos crates to 0.7.0
+  "rand_core",
   "rustix",
   "linux-raw-sys", # needed by rustix@0.38
   "thiserror",

Cargo.toml

@@ -35,7 +35,7 @@ js-sys = "0.3.69"
 leptos = "0.6.11"
 leptos_meta = {version = "0.6.11", features = ["csr"]}
 leptos_router = {version = "0.6.11", features = ["csr"]}
-rand = {version = "0.8.5", features = ["small_rng"]}
+rand_xoshiro = "0.7.0"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1.0.115"
 unicode-segmentation = "1.10"
@@ -106,7 +106,6 @@ open = {version = "5", optional = true}
 parking_lot = "0.12.1"
 paste = "1.0.14"
 pathdiff = "0.2.1"
-rand.workspace = true
 rawrrr = {version = "0.2.1", optional = true}
 rayon = "1.9.0"
 regex = "1.10.3"
@@ -181,8 +180,10 @@ wasm-bindgen = {workspace = true, optional = true}
 web-sys = {version = "0.3.60", optional = true}
 
 # Window dependencies
+ahash = "0.8.12"
 eframe = {version = "0.29.1", optional = true, features = ["persistence"]}
 native-dialog = {version = "0.7.0", optional = true}
+rand_xoshiro = "0.7.0"
 rmp-serde = {version = "1.3.0", optional = true}
 
 [features]

site/Cargo.toml

@@ -23,7 +23,7 @@ js-sys.workspace = true
 leptos.workspace = true
 leptos_meta.workspace = true
 leptos_router.workspace = true
-rand.workspace = true
+rand_xoshiro.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 uiua = {path = "..", default-features = false, features = ["batteries", "web"]}

site/src/main.rs

@@ -19,7 +19,10 @@ use js_sys::Date;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
-use rand::prelude::*;
+use rand_xoshiro::{
+    rand_core::{RngCore, SeedableRng},
+    Xoshiro256Plus,
+};
 use uiua::{now, ConstantDef, Primitive, SysOp};
 use uiua_editor::{
     binding_name_class, lang,
@@ -261,9 +264,23 @@ pub fn MainPage() -> impl IntoView {
     let indices = if visits < 4 {
         vec![0, rich_prims.len() - 3, rich_prims.len() - 1]
     } else {
-        let mut rng = SmallRng::seed_from_u64(visits as u64);
         let mut indices: Vec<usize> = (0..rich_prims.len()).collect();
-        indices.shuffle(&mut rng);
+        {
+            // Shuffle indices
+            let l = indices.len();
+            let upper = l.next_power_of_two();
+            let mut rng = Xoshiro256Plus::seed_from_u64(visits as u64);
+
+            for i in 0..indices.len() {
+                let index = loop {
+                    let r = rng.next_u64() as usize % upper;
+                    if r < l {
+                        break r;
+                    }
+                };
+                indices.swap(i, index);
+            }
+        }
         indices.truncate(3);
         indices.sort_unstable();
         indices

src/algorithm/dyadic/mod.rs

@@ -8,14 +8,19 @@ use core::f64;
 use std::{
     borrow::Cow,
     cmp::Ordering,
-    hash::{DefaultHasher, Hash, Hasher},
+    hash::{Hash, Hasher},
     iter::{once, repeat_n},
     mem::{replace, swap, take},
 };
 
+use ahash::AHasher;
 use bytemuck::allocation::cast_vec;
 use ecow::{eco_vec, EcoVec};
-use rand::prelude::*;
+use rand_xoshiro::{
+    rand_core::{RngCore, SeedableRng},
+    Xoshiro256Plus,
+};
+
 #[cfg(not(target_arch = "wasm32"))]
 use rayon::prelude::*;
 use smallvec::SmallVec;
@@ -2109,10 +2114,10 @@ impl Value {
     }
     /// Generate randomly seeded arrays
     pub fn gen(&self, seed: &Self, env: &Uiua) -> UiuaResult<Value> {
-        let mut hasher = DefaultHasher::new();
+        let mut hasher = AHasher::default();
         seed.hash(&mut hasher);
         let seed = hasher.finish();
-        let mut rng = SmallRng::seed_from_u64(seed);
+        let mut rng = Xoshiro256Plus::seed_from_u64(seed);
 
         const SHAPE_REQ: &str = "Shape must be an array of natural \
             numbers with at most rank 2";
@@ -2122,7 +2127,7 @@ impl Value {
             let elem_count = validate_size::<f64>(shape.iter().copied(), env)?;
             let mut data = eco_vec![0.0; elem_count];
             for x in data.make_mut() {
-                *x = rng.gen();
+                *x = f64::from_bits(rng.next_u64() >> 12 | 0x3FF0_0000_0000_0000) - 1.0;
             }
             Ok(Array::new(shape, data))
         };
@@ -2168,7 +2173,15 @@ impl Value {
             0 => Err(env.error("Cannot pick random row of an empty array").fill()),
             1 => Ok(self.row(0)),
             len => {
-                let i = RNG.with_borrow_mut(|rng| rng.gen_range(0..len));
+                let i = RNG.with_borrow_mut(|rng| {
+                    let upper = len.next_power_of_two();
+                    loop {
+                        let r = rng.next_u64() as usize % upper;
+                        if r < len {
+                            break r;
+                        }
+                    }
+                });
                 Ok(self.row(i))
             }
         }

src/algorithm/monadic/sort.rs

@@ -1,7 +1,7 @@
 use std::{cmp::Ordering, ptr};
 
 use ecow::EcoVec;
-use rand::Rng;
+use rand_xoshiro::rand_core::RngCore;
 use rayon::prelude::*;
 
 use crate::{algorithm::ArrayCmpSlice, random_with, val_as_arr, Array, ArrayValue, Value};
@@ -232,7 +232,16 @@ impl<T: ArrayValue> Array<T> {
             let row_len = self.row_len();
             let slice = self.data.as_mut_slice();
             for i in (1..row_count).rev() {
-                let j = rng.gen_range(0..=i);
+                let j = {
+                    let upper = i.next_power_of_two();
+                    loop {
+                        let r = rng.next_u64() as usize % upper;
+                        if r <= i {
+                            break r;
+                        }
+                    }
+                };
+
                 if i == j {
                     continue;
                 }

src/constant.rs

@@ -5,7 +5,10 @@ use std::{
 };
 
 use ecow::EcoVec;
-use rand::prelude::*;
+use rand_xoshiro::{
+    rand_core::{RngCore, SeedableRng},
+    Xoshiro256Plus,
+};
 
 use crate::{
     parse_doc_line_fragments, Array, Boxed, PrimDocFragment, SysBackend, Value, WILDCARD_NAN,
@@ -485,7 +488,9 @@ fn music_constant(backend: &dyn SysBackend) -> Value {
         hat_mask.push((hat_bits & 1) as f64);
         hat_bits >>= 1;
     }
-    let mut rng = SmallRng::seed_from_u64(0);
+    let mut rng = Xoshiro256Plus::seed_from_u64(0);
+    let mut rand_wrench =
+        || 2.0 * f64::from_bits(rng.next_u64() >> 12 | 0x3FF0_0000_0000_0000) - 3.0; // gen_range(-1..=1)
     let sr = backend.audio_sample_rate();
     (0..(BEAT * 2.0 * 16.0 * sr as f64) as usize)
         .map(|s| {
@@ -499,11 +504,11 @@ fn music_constant(backend: &dyn SysBackend) -> Value {
             let h = if (h * secs % 1.0) < 0.5 { 1.0 } else { -1.0 } / 3.0; // Square wave
             let kick = ((secs % BEAT).powf(0.4) * 40.0 * TAU).sin();
             let hat = 0.3
-                * rng.gen_range(-1.0..=1.0)
+                * rand_wrench()
                 * hat_mask[(4.0 * beat) as usize % 32]
                 * (0.0..=0.1).contains(&(secs % (BEAT / 4.0) / (BEAT / 4.0))) as u8 as f64;
             let snare = 0.5
-                * rng.gen_range(-1.0..=1.0)
+                * rand_wrench()
                 * ((0.5..=0.6).contains(&(secs % (2.0 * BEAT) / (2.0 * BEAT))) as u8 as f64);
 
             0.5 * (m + h + kick + hat + snare)

src/run_prim.rs

@@ -20,7 +20,10 @@ use std::{
     },
 };
 
-use rand::prelude::*;
+use rand_xoshiro::{
+    rand_core::{RngCore, SeedableRng},
+    Xoshiro256Plus,
+};
 
 use crate::{
     algorithm::{self, ga::GaOp, loops, reduce, table, zip, *},
@@ -1783,22 +1786,22 @@ fn undo_regex(env: &mut Uiua) -> UiuaResult {
 }
 
 thread_local! {
-    pub(crate) static RNG: RefCell<SmallRng> = RefCell::new(SmallRng::from_entropy());
+    pub(crate) static RNG: RefCell<Xoshiro256Plus> = RefCell::new(Xoshiro256Plus::seed_from_u64(f64::to_bits(crate::now())))
 }
 
 /// Generate a random number, equivalent to [`Primitive::Rand`]
 pub fn random() -> f64 {
-    random_with(|rng| rng.gen())
+    random_with(|rng| f64::from_bits(rng.next_u64() >> 12 | 0x3FF0_0000_0000_0000) - 1.0)
 }
 
 /// Access the interpreter's random number generator for the thread
-pub fn random_with<T>(f: impl FnOnce(&mut SmallRng) -> T) -> T {
+pub fn random_with<T>(f: impl FnOnce(&mut Xoshiro256Plus) -> T) -> T {
     RNG.with(|rng| f(&mut rng.borrow_mut()))
 }
 
 /// Seed the random number generator
 pub fn seed_random(seed: u64) {
-    random_with(|rng| *rng = SmallRng::seed_from_u64(seed));
+    random_with(|rng| *rng = Xoshiro256Plus::seed_from_u64(seed));
 }
 
 fn stack_n(env: &mut Uiua, n: usize, inverse: bool) -> UiuaResult {

tests/monadic.ua

@@ -267,3 +267,8 @@ ReprTest! ←^ ˙$"\"_\" repr _" °□⊢
 ⍤⤙≍ ⟜⍜binary∘ ⇡257
 ⍤⤙≍ ⟜⍜binary∘ ÷⟜⇡256
 ⍤⤙≍ ⟜⍜binary∘ ×π ⇡256
+
+# Rand/Gen
+⍤⤙≍1 /×♭×⊃≥₀≤₁ gen1000_1000 0
+⍤⤙≍1 /×♭×⊃≥₀≤₁⍥₁₀₀₀₀⚂
+⍤⤙≍ 1000_1000 △gen1000_1000 0