arrowspace 0.15.0__tar.gz → 0.21.0__tar.gz

{arrowspace-0.15.0 → arrowspace-0.21.0}/Cargo.lock

@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "arrowspace"
-version = "0.15.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f0d5ec06ec0ff1d04461bf07210c05a72670b43e3888842cef04567b593b50"
+checksum = "e9b48bd6b33d9a9387fdc7f73406fa7f02a6c22e99999f6e195688d398d0dbc3"
 dependencies = [
  "approx 0.5.1",
  "dashmap",
@@ -105,6 +105,7 @@ dependencies = [
  "rand_chacha",
  "rand_distr",
  "rayon",
+ "serde",
  "smartcore",
  "sprs",
 ]
@@ -219,6 +220,12 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -227,9 +234,12 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "indoc"
-version = "1.0.9"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -258,7 +268,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -423,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "numpy"
-version = "0.19.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389"
+checksum = "0fa24ffc88cf9d43f7269d6b6a0d0a00010924a8cc90604a21ef9c433b66998d"
 dependencies = [
  "libc",
  "ndarray",
@@ -433,6 +443,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "pyo3",
+ "pyo3-build-config",
  "rustc-hash",
 ]
 
@@ -457,16 +468,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.9.11"
@@ -515,24 +516,25 @@ dependencies = [
 
 [[package]]
 name = "pyarrowspace"
-version = "0.15.0"
+version = "0.21.0"
 dependencies = [
  "arrowspace",
  "numpy",
  "pyo3",
+ "rayon",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.19.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
- "parking_lot",
+ "once_cell",
+ "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -541,19 +543,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.19.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.19.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -561,25 +562,27 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.19.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.19.2"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
+ "heck",
  "proc-macro2",
+ "pyo3-build-config",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -717,9 +720,15 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "scopeguard"
@@ -729,31 +738,32 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.227"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80ece43fc6fbed4eb5392ab50c07334d3e577cbf40997ee896fe7af40bba4245"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_core"
-version = "1.0.227"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a576275b607a2c86ea29e410193df32bc680303c82f31e275bbfcafe8b33be5"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.227"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e694923b8824cf0e9b382adf0f60d4e05f348f357b38833a3fa5ed7c2ede04"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -791,17 +801,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.106"
@@ -815,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "unicode-ident"
@@ -827,9 +826,9 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
 name = "unindent"
-version = "0.1.11"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
 name = "utf8parse"
@@ -1022,5 +1021,5 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]

{arrowspace-0.15.0 → arrowspace-0.21.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyarrowspace"
-version = "0.15.0"
+version = "0.21.0"
 edition = "2024"
 readme = "README.md"
 
@@ -14,6 +14,7 @@ name = "arrowspace"
 crate-type = ["cdylib"]
 
 [dependencies]
-arrowspace = "0.15.0"
-pyo3 = { version = "*", features = ["extension-module"] }
-numpy = "0.19"
+arrowspace = { version = "0.21.0" } # , path = "../arrowspace-rs"}
+pyo3 = { version = "0.27.1", features = ["extension-module"] }
+numpy = "0.27.0"
+rayon = "1.8"

{arrowspace-0.15.0 → arrowspace-0.21.0}/PKG-INFO

@@ -1,8 +1,10 @@
 Metadata-Version: 2.4
 Name: arrowspace
-Version: 0.15.0
+Version: 0.21.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 License-File: LICENSE
 Requires-Python: >=3.8
+Project-URL: Homepage, https://github.com/tuned-org-uk/pyarrowspace
+Project-URL: Repository, https://github.com/tuned-org-uk/pyarrowspace.git

{arrowspace-0.15.0 → arrowspace-0.21.0}/pyproject.toml

@@ -11,5 +11,18 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dynamic = ["version"]
+
+[project.urls]
+Homepage = "https://github.com/tuned-org-uk/pyarrowspace"
+Repository = "https://github.com/tuned-org-uk/pyarrowspace.git"
+
 [tool.maturin]
 features = ["pyo3/extension-module"]
+
+exclude = [
+    "tests/",           # Exclude the entire 'tests' directory
+    ".github/",            # Exclude the 'docs' directory
+    "**/*.pyc",         # Exclude all compiled Python files
+    "*.md",
+    ".gitignore"
+]

arrowspace-0.21.0/src/energyparams.rs

@@ -0,0 +1,45 @@
+use ::arrowspace::energymaps::EnergyParams;
+use pyo3::prelude::*;
+use pyo3::types::PyDict;
+
+pub fn parse_energy_params(dict_opt: Option<&Bound<'_, PyDict>>) -> PyResult<EnergyParams> {
+    let mut params = EnergyParams::default();
+    
+    if let Some(d) = dict_opt {
+        if let Some(v) = d.get_item("optical_tokens")? {
+            params.optical_tokens = v.extract::<usize>().ok();
+        }
+        if let Some(v) = d.get_item("trim_quantile")? {
+            params.trim_quantile = v.extract().ok().unwrap_or(params.trim_quantile);
+        }
+        if let Some(v) = d.get_item("eta")? {
+            params.eta = v.extract().ok().unwrap_or(params.eta);
+        }
+        if let Some(v) = d.get_item("steps")? {
+            params.steps = v.extract().ok().unwrap_or(params.steps);
+        }
+        if let Some(v) = d.get_item("split_quantile")? {
+            params.split_quantile = v.extract().ok().unwrap_or(params.split_quantile);
+        }
+        if let Some(v) = d.get_item("neighbor_k")? {
+            params.neighbor_k = v.extract().ok().unwrap_or(params.neighbor_k);
+        }
+        if let Some(v) = d.get_item("split_tau")? {
+            params.split_tau = v.extract().ok().unwrap_or(params.split_tau);
+        }
+        if let Some(v) = d.get_item("w_lambda")? {
+            params.w_lambda = v.extract().ok().unwrap_or(params.w_lambda);
+        }
+        if let Some(v) = d.get_item("w_disp")? {
+            params.w_disp = v.extract().ok().unwrap_or(params.w_disp);
+        }
+        if let Some(v) = d.get_item("w_dirichlet")? {
+            params.w_dirichlet = v.extract().ok().unwrap_or(params.w_dirichlet);
+        }
+        if let Some(v) = d.get_item("candidate_m")? {
+            params.candidate_m = v.extract().ok().unwrap_or(params.candidate_m);
+        }
+    }
+    
+    Ok(params)
+}

arrowspace-0.21.0/src/helpers.rs

@@ -0,0 +1,60 @@
+use pyo3::prelude::*;
+use pyo3::types::PyDict;
+use numpy::PyReadonlyArray2;
+
+use std::sync::atomic::{AtomicBool, Ordering};
+static DEBUG: AtomicBool = AtomicBool::new(false);
+
+
+#[pyfunction]
+pub fn set_debug(enabled: bool) {
+    DEBUG.store(enabled, Ordering::Relaxed);
+}
+
+
+pub fn dbg_println(s: impl AsRef<str>) {
+    if cfg!(debug_assertions) {
+        println!("{}", s.as_ref());
+    }
+}
+
+pub fn parse_graph_params(dict_opt: Option<&Bound<'_, PyDict>>) -> PyResult<Option<(f64, usize, usize, f64, Option<f64>)>> {
+    let Some(d) = dict_opt else {
+        return Ok(None);
+    };
+
+    let eps = d
+        .get_item("eps")?
+        .and_then(|v| v.extract::<f64>().ok())
+        .unwrap_or(0.2);
+    let k = d
+        .get_item("k")?
+        .and_then(|v| v.extract::<usize>().ok())
+        .unwrap_or(8);
+    let topk = d
+        .get_item("topk")?
+        .and_then(|v| v.extract::<usize>().ok())
+        .unwrap_or(3);
+    let p = d
+        .get_item("p")?
+        .and_then(|v| v.extract::<f64>().ok())
+        .unwrap_or(2.0);
+    let sigma = match d.get_item("sigma")? {
+        Some(v) => v.extract::<f64>().ok(),
+        None => None,
+    };
+
+    Ok(Some((eps, k, topk, p, sigma)))
+}
+
+pub fn pyarray2_to_vecvec(arr: PyReadonlyArray2<f64>) -> PyResult<Vec<Vec<f64>>> {
+    let a = arr.as_array();
+    let (nrows, ncols) = (a.shape()[0], a.shape()[1]);
+    
+    let mut rows = Vec::with_capacity(nrows);
+    for i in 0..nrows {
+        let row_view = a.row(i);
+        rows.push(row_view.to_vec());
+    }
+    Ok(rows)
+}