interpn 0.6.3__tar.gz → 0.7.0__tar.gz

{interpn-0.6.3 → interpn-0.7.0}/.github/workflows/test-python.yml

@@ -12,33 +12,38 @@ jobs:
       matrix:
         target: [x86_64]
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
           - "3.14"
+        sync-args: [--locked]
+
+        include:
+         - target: x86_64
+           python-version: "3.10.0"
+           sync-args: --resolution=lowest-direct
+
     steps:
     - uses: actions/checkout@v3
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install
-      run: |
-        uv venv
-        uv pip install -e .[test,bench]
+      run: uv sync --extra pydantic --group test --group bench ${{ matrix.sync-args }}
       
     - name: Format
-      run: uv run ruff check; uv run ruff format --check
+      run: |
+        uv run --no-sync ruff check
+        uv run --no-sync ruff format --check
 
     - name: Static typing
-      run: uv run pyright ./src
+      run: uv run --no-sync pyright ./src
 
     - name: Test (without PGO)
-      run: |
-        uv run pytest .
+      run: uv run --no-sync pytest
 
   test_pgo:
     runs-on: ${{ matrix.platform.runner }}
@@ -50,18 +55,16 @@ jobs:
           - runner: ubuntu-24.04-arm  # aarch64
           - runner: macos-15-intel  # x86_64
           - runner: macos-14  # aarch64
-        python-version: ["3.9"]
     steps:
     - uses: actions/checkout@v3
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: "3.10"
 
     - name: Install
       run: |
-        uv venv
-        uv pip install .[test,bench]
+        uv sync --locked --no-editable --extra pydantic --group test --group bench
         rustup component add llvm-tools-preview
 
     - name: Profile-Guided Optimization (PGO)

{interpn-0.6.3 → interpn-0.7.0}/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## 0.7.0 2025-10-25
+
+Implement `interpn` convenience function that defers directly
+to `raw` functions without serializable wrapper classes.
+
+This enables use without pydantic for dep-constrained environments.
+
+Contributions
+* [Clément Robert](https://github.com/neutrinoceros)
+  * #40
+  * #41
+  * #42
+  * #44
+  * #45
+  * #46
+
+### Added
+
+* Python
+  * Add type stubs for `raw` module
+  * Add `interpn` function that defers directly to `raw` functions without serializable wrapper classes
+
+### Changed
+
+* Python
+  * !Move pydantic dep to `serde` optional group
+  * !Move optional dev dep groups to dependency groups (no longer installable via `.[dep]` syntax)
+  * !Import serializable wrapper classes into top level module only if pydantic is found
+  * !Drop support for python 3.9, which is leaving long-term support soon
+  * Update PGO profile data
+* Rust
+  * Use abi3-py310 for python bindings
+
+## 0.6.4 2025-10-24
+
+Implement N-dimensional nearest-neighbor interpolation on regular and rectilinear grids.
+
+### Added
+
+* Rust
+  * Add `nearest` module with regular- and rectilinear- grid methods in up to 6 dimensions
+  * Reduce code duplication for fixed-dim array indexing
+  * Update pyo3 and numpy rust deps
+* Python
+  * Add bindings, tests, benchmarks, and quality-of-fit plots for `NearestRegular` and `NearestRectilinear`
+  * Update PGO profile data to include new functions
+
 ## 0.6.3 2025-10-22
 
 Unpin max supported python version due to use of stable ABI3,

{interpn-0.6.3 → interpn-0.7.0}/Cargo.lock

@@ -221,7 +221,7 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "interpn"
-version = "0.6.2"
+version = "0.7.0"
 dependencies = [
  "criterion",
  "crunchy",
@@ -355,9 +355,9 @@ dependencies = [
 
 [[package]]
 name = "numpy"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2dba356160b54f5371b550575b78130a54718b4c6e46b3f33a6da74a27e78b"
+checksum = "0fa24ffc88cf9d43f7269d6b6a0d0a00010924a8cc90604a21ef9c433b66998d"
 dependencies = [
  "libc",
  "ndarray",
@@ -435,18 +435,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
@@ -461,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
  "python3-dll-a",
  "target-lexicon",
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -481,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -493,9 +493,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -641,18 +641,28 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -661,14 +671,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -679,9 +690,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",

{interpn-0.6.3 → interpn-0.7.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "interpn"
-version = "0.6.2"
+version = "0.7.0"
 edition = "2024"
 authors = ["James Logan <jlogan03@gmail.com>"]
 license = "MIT OR Apache-2.0"
@@ -20,8 +20,8 @@ num-traits = { version = "0.2.19", default-features = false, features = ["libm"]
 crunchy = { version = "0.2.4", default-features = false, features = ["limit_256"] }
 
 # Python bindings
-pyo3 = { version = "0.26.0", features = ["extension-module", "abi3-py39", "generate-import-lib"], optional = true }
-numpy = { version = "0.26.0", optional = true }
+pyo3 = { version = "0.27.1", features = ["extension-module", "abi3-py310", "generate-import-lib"], optional = true }
+numpy = { version = "0.27.0", optional = true }
 
 # Test-only utils
 itertools = { version = "0.14.0", optional = true }

{interpn-0.6.3 → interpn-0.7.0}/PKG-INFO

@@ -1,37 +1,23 @@
 Metadata-Version: 2.4
 Name: interpn
-Version: 0.6.3
+Version: 0.7.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Dist: numpy>=2
-Requires-Dist: pydantic>=2.12
-Requires-Dist: pytest>=8.4.2 ; extra == 'test'
-Requires-Dist: pytest-cov>=7.0.0 ; extra == 'test'
-Requires-Dist: ruff>=0.13.3 ; extra == 'test'
-Requires-Dist: pyright==1.1.337 ; extra == 'test'
-Requires-Dist: mktestdocs>=0.2.1 ; extra == 'test'
-Requires-Dist: scipy>=1.11.4 ; extra == 'test'
-Requires-Dist: matplotlib>=3.8 ; extra == 'test'
-Requires-Dist: scipy>=1.11.4 ; extra == 'bench'
-Requires-Dist: matplotlib>=3.8 ; extra == 'bench'
-Requires-Dist: memory-profiler>=0.61.0 ; extra == 'bench'
-Requires-Dist: mkdocs>=1.5.3 ; extra == 'doc'
-Requires-Dist: mkdocstrings-python>=1.7.5 ; extra == 'doc'
-Requires-Dist: mkdocs-material>=9.4.10 ; extra == 'doc'
-Provides-Extra: test
-Provides-Extra: bench
-Provides-Extra: doc
+Requires-Dist: numpy>=1.21.2
+Requires-Dist: pydantic>=2.2.0 ; extra == 'pydantic'
+Provides-Extra: pydantic
 License-File: LICENSE-MIT
 License-File: LICENSE-APACHE
 Summary: N-dimensional interpolation/extrapolation methods
 Home-Page: https://github.com/jlogan03/interpn/
 Author-email: James Logan <jlogan03@gmail.com>
 License-Expression: MIT OR Apache-2.0
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: repository, https://github.com/jlogan03/interpn
 Project-URL: documentation, https://interpn.readthedocs.io/
+Project-URL: changelog, https://github.com/jlogan03/interpn/blob/main/CHANGELOG.md
 
 # InterpN
 
@@ -53,6 +39,7 @@ effective when examining small numbers of observation points. See the
 
 | Feature →<br>↓ Interpolant Method | Regular<br>Grid | Rectilinear<br>Grid | Json<br>Serialization |
 |-----------------------------------|-----------------|---------------------|-----------------------|
+| Nearest-Neighbor                  |   ✅            |     ✅              | ✅                    |
 | Linear                            |   ✅            |     ✅              | ✅                    |
 | Cubic                             |   ✅            |     ✅              | ✅                    |
 
@@ -77,9 +64,9 @@ pip install interpn
 
 ## Profile-Guided Optimization
 
-To build the extension with profile-guided optimization using pre-built profiles, do `sh ./scripts/pgo_install.sh`.
-You can also generate your own PGO profiles like `sh ./scripts/pgo_profile.sh`.
-after installing these extra compiler dependencies:
+To build the extension with profile-guided optimization using pre-built profiles, do `sh ./scripts/distr_pgo_install.sh`.
+You can also generate your own PGO profiles like `sh ./scripts/distr_pgo_profile.sh`.
+after installing this extra compiler dependency:
 
 ```bash
 rustup component add llvm-tools-preview

{interpn-0.6.3 → interpn-0.7.0}/README.md

@@ -18,6 +18,7 @@ effective when examining small numbers of observation points. See the
 
 | Feature →<br>↓ Interpolant Method | Regular<br>Grid | Rectilinear<br>Grid | Json<br>Serialization |
 |-----------------------------------|-----------------|---------------------|-----------------------|
+| Nearest-Neighbor                  |   ✅            |     ✅              | ✅                    |
 | Linear                            |   ✅            |     ✅              | ✅                    |
 | Cubic                             |   ✅            |     ✅              | ✅                    |
 
@@ -42,9 +43,9 @@ pip install interpn
 
 ## Profile-Guided Optimization
 
-To build the extension with profile-guided optimization using pre-built profiles, do `sh ./scripts/pgo_install.sh`.
-You can also generate your own PGO profiles like `sh ./scripts/pgo_profile.sh`.
-after installing these extra compiler dependencies:
+To build the extension with profile-guided optimization using pre-built profiles, do `sh ./scripts/distr_pgo_install.sh`.
+You can also generate your own PGO profiles like `sh ./scripts/distr_pgo_profile.sh`.
+after installing this extra compiler dependency:
 
 ```bash
 rustup component add llvm-tools-preview

{interpn-0.6.3 → interpn-0.7.0}/benches/bench.rs

@@ -3,8 +3,8 @@
 use criterion::*;
 use gridgen::*;
 use interpn::{
-    Linear1D, LinearHoldLast1D, MultilinearRegular, RectilinearGrid1D, RegularGrid1D, multicubic,
-    multilinear,
+    Linear1D, LinearHoldLast1D, MultilinearRegular, NearestRectilinear, NearestRegular,
+    RectilinearGrid1D, RegularGrid1D, multicubic, multilinear, nearest,
     one_dim::{
         Interp1D,
         hold::{Left1D, Nearest1D},
@@ -135,6 +135,70 @@ macro_rules! bench_interp_specific {
             },
         );
 
+        $group.bench_with_input(
+            BenchmarkId::new(
+                format!(
+                    "Nearest Regular {}x{}D, {}",
+                    $gridsize, $ndims, scan_or_shuffle
+                ),
+                $size,
+            ),
+            $size,
+            |b, &size| {
+                let (grids, z) = gen_grid($ndims, $gridsize, 0.0);
+                let m: usize = ((size as f64).powf(1.0 / ($ndims as f64)) + 2.0) as usize;
+                let gridobs_t = match $kind {
+                    Kind::Interp => gen_interp_obs_grid(&grids, m, true),
+                    Kind::Extrap => gen_extrap_obs_grid(&grids, m, true),
+                };
+                let obs: Vec<&[f64]> = gridobs_t.iter().map(|x| &x[..size]).collect();
+                let mut out = vec![0.0; size];
+
+                let dims = [$gridsize; $ndims];
+                let mut starts = [0.0; $ndims];
+                let mut steps = [0.0; $ndims];
+                (0..$ndims).for_each(|i| starts[i] = grids[i][0]);
+                (0..$ndims).for_each(|i| steps[i] = grids[i][1] - grids[i][0]);
+
+                b.iter(|| {
+                    black_box({
+                        nearest::regular::interpn(&dims, &starts, &steps, &z, &obs[..], &mut out)
+                            .unwrap()
+                    })
+                });
+            },
+        );
+
+        $group.bench_with_input(
+            BenchmarkId::new(
+                format!(
+                    "Nearest Rectilinear {}x{}D, {}",
+                    $gridsize, $ndims, scan_or_shuffle
+                ),
+                $size,
+            ),
+            $size,
+            |b, &size| {
+                let (grids, z) = gen_grid($ndims, $gridsize, 1e-3);
+
+                let m: usize = ((size as f64).powf(1.0 / ($ndims as f64)) + 2.0) as usize;
+                let gridobs_t = match $kind {
+                    Kind::Interp => gen_interp_obs_grid(&grids, m, true),
+                    Kind::Extrap => gen_extrap_obs_grid(&grids, m, true),
+                };
+                let obs: Vec<&[f64]> = gridobs_t.iter().map(|x| &x[..size]).collect();
+                let mut out = vec![0.0; size];
+
+                let gridslice: Vec<&[f64]> = grids.iter().map(|x| &x[..]).collect();
+
+                b.iter(|| {
+                    black_box(
+                        nearest::rectilinear::interpn(&gridslice, &z, &obs, &mut out).unwrap(),
+                    )
+                });
+            },
+        );
+
         $group.bench_with_input(
             BenchmarkId::new(
                 format!(
@@ -426,41 +490,8 @@ fn bench_interp(c: &mut Criterion) {
     }
 }
 
-fn bench_extrap(c: &mut Criterion) {
-    //
-    // Shuffled (un-ordered observation points)
-    //
-    for gridsize in [10] {
-        let mut group = c.benchmark_group(format!("Extrap_1D_Shuffled_{gridsize}-grid"));
-        for size in [1, 100, 1_000_000].iter() {
-            group.throughput(Throughput::Elements(*size as u64));
-            bench_interp_specific!(group, 1, gridsize, size, Kind::Extrap);
-        }
-        group.finish();
-    }
-
-    for gridsize in [10] {
-        let mut group = c.benchmark_group(format!("Extrap_2D_Shuffled_{gridsize}-grid"));
-        for size in [1, 100, 1_000_000].iter() {
-            group.throughput(Throughput::Elements(*size as u64));
-            bench_interp_specific!(group, 2, gridsize, size, Kind::Extrap);
-        }
-        group.finish();
-    }
-
-    for gridsize in [10] {
-        let mut group = c.benchmark_group(format!("Extrap_3D_Shuffled_{gridsize}-grid"));
-        for size in [1, 100, 1_000_000].iter() {
-            group.throughput(Throughput::Elements(*size as u64));
-            bench_interp_specific!(group, 3, gridsize, size, Kind::Extrap);
-        }
-        group.finish();
-    }
-}
-
 criterion_group!(benches_interp, bench_interp);
-criterion_group!(benches_extrap, bench_extrap);
-criterion_main!(benches_interp, benches_extrap,);
+criterion_main!(benches_interp);
 
 mod randn {
     use rand::Rng;