compile-ready wasm

Author: krukah

Cargo.lock

@@ -11,34 +11,57 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-colored = "2.0"
 petgraph = "0.6.5"
-dialoguer = "0.11.0"
-rand = { version = "0.8.5", features = ["small_rng"] }
 bytes = "1.0"
-num_cpus = "1.16.0"
 log = "0.4.22"
-rayon = "1.10.0"
 byteorder = "1.5.0"
-indicatif = "0.17.8"
-simplelog = "0.12.2"
-tokio = { version = "1.0", features = ["full"] }
-tokio-postgres = "0.7"
 futures = "0.3"
-clap = { version = "4.0", features = ["derive"] }
-actix-web = "4.4"
-actix-cors = "0.6"
-serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-env_logger = "0.11.6"
+rand = { version = "0.8.5", features = ["small_rng"] }
+colored = { version = "2.0", optional = true }
+dialoguer = { version = "0.11.0", optional = true }
+num_cpus = { version = "1.16.0", optional = true }
+rayon = { version = "1.10.0", optional = true }
+indicatif = { version = "0.17.8", optional = true }
+simplelog = { version = "0.12.2", optional = true }
+tokio = { version = "1.0", features = ["full"], optional = true }
+tokio-postgres = { version = "0.7", optional = true }
+clap = { version = "4.0", features = ["derive"], optional = true }
+actix-web = { version = "4.4", optional = true }
+actix-cors = { version = "0.6", optional = true }
+serde = { version = "1.0", features = ["derive"] }
+env_logger = { version = "0.11.6", optional = true }
+js-sys = "0.3"
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4"
+console_error_panic_hook = "0.1.7"
+getrandom = { version = "0.2", features = ["js"] }
+
+[lib]
+crate-type = ["cdylib", "rlib"]
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }
+wasm-bindgen-test = "0.3"
 
 [[bench]]
 name = "benchmarks"
 harness = false
 
 [features]
-default = []
+default = ["native"]
 shortdeck = []
+native = [
+    "colored",
+    "dialoguer",
+    "num_cpus",
+    "rayon",
+    "indicatif",
+    "simplelog",
+    "tokio",
+    "tokio-postgres",
+    "clap",
+    "actix-web",
+    "actix-cors",
+    "env_logger"
+]

Cargo.toml

@@ -7,7 +7,6 @@ use super::transitions::Decomp;
 use crate::cards::isomorphism::Isomorphism;
 use crate::cards::isomorphisms::IsomorphismIterator;
 use crate::cards::street::Street;
-use crate::save::upload::Table;
 use crate::Energy;
 use rand::distributions::Distribution;
 use rand::distributions::WeightedIndex;
@@ -23,9 +22,11 @@ pub struct Layer {
 }
 
 impl Layer {
+    #[cfg(feature = "native")]
     /// all-in-one entry point for learning the kmeans abstraction and
     /// writing to disk in pgcopy
     pub fn learn() {
+        use crate::save::upload::Table;
         Street::all()
             .into_iter()
             .rev()
@@ -43,6 +44,7 @@ impl Layer {
         &self.kmeans
     }
 
+    #[cfg(feature = "native")]
     /// primary clustering algorithm loop
     fn cluster(mut self) -> Self {
         log::info!("{:<32}{:<32}", "initialize  kmeans", self.street());
@@ -63,6 +65,7 @@ impl Layer {
         self
     }
 
+    #[cfg(feature = "native")]
     /// initializes the centroids for k-means clustering using the k-means++ algorithm
     /// 1. choose 1st centroid randomly from the dataset
     /// 2. choose nth centroid with probability proportional to squared distance of nearest neighbors
@@ -75,17 +78,17 @@ impl Layer {
         use std::hash::DefaultHasher;
         use std::hash::Hash;
         use std::hash::Hasher;
-        // deterministic pseudo-random clustering
-        let ref mut hasher = DefaultHasher::default();
-        self.street().hash(hasher);
-        let ref mut rng = SmallRng::seed_from_u64(hasher.finish());
         // don't do any abstraction on preflop
         let k = self.street().k();
         let n = self.points().len();
         if self.street() == Street::Pref {
             assert!(n == k);
             return self.points().clone();
         }
+        // deterministic pseudo-random clustering
+        let ref mut hasher = DefaultHasher::default();
+        self.street().hash(hasher);
+        let ref mut rng = SmallRng::seed_from_u64(hasher.finish());
         // kmeans++ initialization
         let progress = crate::progress(k * n);
         let mut potentials = vec![1.; n];
@@ -116,6 +119,8 @@ impl Layer {
         println!();
         histograms
     }
+
+    #[cfg(feature = "native")]
     /// calculates the next step of the kmeans iteration by
     /// determining K * N optimal transport calculations and
     /// taking the nearest neighbor
@@ -192,8 +197,10 @@ impl Layer {
     }
     /// in ObsIterator order, get a mapping of
     /// Isomorphism -> Abstraction
+    #[cfg(feature = "native")]
     fn lookup(&self) -> Lookup {
         log::info!("{:<32}{:<32}", "calculating lookup", self.street());
+        use crate::save::upload::Table;
         use rayon::iter::IntoParallelRefIterator;
         use rayon::iter::ParallelIterator;
         let street = self.street();
@@ -226,7 +233,9 @@ impl Layer {
             .into()
     }
 }
-impl Table for Layer {
+
+#[cfg(feature = "native")]
+impl crate::save::upload::Table for Layer {
     fn done(street: Street) -> bool {
         Lookup::done(street) && Decomp::done(street) && Metric::done(street)
     }

src/clustering/layer.rs

@@ -4,8 +4,6 @@ use crate::cards::observation::Observation;
 use crate::cards::street::Street;
 use crate::clustering::abstraction::Abstraction;
 use crate::clustering::histogram::Histogram;
-use crate::save::upload::Table;
-use rayon::iter::ParallelIterator;
 use std::collections::BTreeMap;
 
 #[derive(Default)]
@@ -14,6 +12,17 @@ use std::collections::BTreeMap;
 /// to precompute this mapping.
 pub struct Lookup(BTreeMap<Isomorphism, Abstraction>);
 
+impl From<Lookup> for BTreeMap<Isomorphism, Abstraction> {
+    fn from(lookup: Lookup) -> BTreeMap<Isomorphism, Abstraction> {
+        lookup.0
+    }
+}
+impl From<BTreeMap<Isomorphism, Abstraction>> for Lookup {
+    fn from(map: BTreeMap<Isomorphism, Abstraction>) -> Self {
+        Self(map)
+    }
+}
+
 impl Lookup {
     /// lookup the pre-computed abstraction for the outer observation
     pub fn lookup(&self, obs: &Observation) -> Abstraction {
@@ -22,9 +31,11 @@ impl Lookup {
             .cloned()
             .expect(&format!("precomputed abstraction missing for {obs}"))
     }
+    #[cfg(feature = "native")]
     /// generate the entire space of inner layers
     pub fn projections(&self) -> Vec<Histogram> {
         use rayon::iter::IntoParallelIterator;
+        use rayon::iter::ParallelIterator;
         IsomorphismIterator::from(self.street().prev())
             .collect::<Vec<Isomorphism>>()
             .into_par_iter()
@@ -45,13 +56,15 @@ impl Lookup {
         self.0.keys().next().expect("non empty").0.street()
     }
 }
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[ignore]
     #[test]
     fn persistence() {
+        use crate::save::upload::Table;
         let street = Street::Pref;
         let lookup = Lookup::grow(street);
         lookup.save();
@@ -63,18 +76,8 @@ mod tests {
     }
 }
 
-impl From<Lookup> for BTreeMap<Isomorphism, Abstraction> {
-    fn from(lookup: Lookup) -> BTreeMap<Isomorphism, Abstraction> {
-        lookup.0
-    }
-}
-impl From<BTreeMap<Isomorphism, Abstraction>> for Lookup {
-    fn from(map: BTreeMap<Isomorphism, Abstraction>) -> Self {
-        Self(map)
-    }
-}
-
-impl Table for Lookup {
+#[cfg(feature = "native")]
+impl crate::save::upload::Table for Lookup {
     fn name() -> String {
         "isomorphism".to_string()
     }
@@ -135,6 +138,7 @@ impl Table for Lookup {
     /// abstractions for Preflop are cequivalent to just enumerating isomorphisms
     fn grow(street: Street) -> Self {
         use rayon::iter::IntoParallelIterator;
+        use rayon::iter::ParallelIterator;
         match street {
             Street::Rive => IsomorphismIterator::from(Street::Rive)
                 .collect::<Vec<_>>()