interpn 0.2.0__tar.gz → 0.2.2__tar.gz

{interpn-0.2.0 → interpn-0.2.2}/.github/workflows/CI.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         target: [x64, x86]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         target: [x86_64, aarch64]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

{interpn-0.2.0 → interpn-0.2.2}/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         target: [x86_64]
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4

interpn-0.2.2/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.2.2 2024-07-08
+
+### Changed
+
+* Update python deps incl. numpy >2
+* Update rust deps
+* Support python 3.12

{interpn-0.2.0 → interpn-0.2.2}/Cargo.lock

@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "_interpn"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "interpn",
  "numpy",
@@ -43,9 +43,9 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
 
 [[package]]
 name = "interpn"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ec859d62d17054a7314d5bb47d7e4eeb4648b87b7c1e0e33de1d4df21e0375"
+checksum = "f37cc48f61030a3bed5eb01e583af8ae1248f3e3bf63d05d87a18f27a98a426b"
 dependencies = [
  "num-traits",
 ]
@@ -135,9 +135,9 @@ dependencies = [
 
 [[package]]
 name = "numpy"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331"
+checksum = "ec170733ca37175f5d75a5bea5911d6ff45d2cd52849ce98b685394e4f2f37f4"
 dependencies = [
  "libc",
  "ndarray",
@@ -177,6 +177,12 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -188,15 +194,16 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
  "memoffset",
  "parking_lot",
+ "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -205,9 +212,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -215,9 +222,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -225,9 +232,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -237,12 +244,13 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.20.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
 dependencies = [
  "heck",
  "proc-macro2",
+ "pyo3-build-config",
  "quote",
  "syn",
 ]

{interpn-0.2.0 → interpn-0.2.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "_interpn"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,9 +9,9 @@ name = "_interpn"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.20.0"
-numpy = "0.20.0"
-interpn = {version = "0.4.1", default_features = false}
+pyo3 = "^0.21.0"
+numpy = "^0.21.0"
+interpn = {version = "0.4.2", default_features = false}
 #interpn = { path = "../interpn/interpn" }
 
 [profile.release]

{interpn-0.2.0 → interpn-0.2.2}/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2023 James Logan
+Copyright (c) 2024 James Logan
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

{interpn-0.2.0 → interpn-0.2.2}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.3
 Name: interpn
-Version: 0.2.0
+Version: 0.2.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Dist: numpy >=1
+Requires-Dist: numpy >=2
 Requires-Dist: pydantic >=2.5.2
-Requires-Dist: pytest >=7.4.3 ; extra == 'test'
+Requires-Dist: pytest >=8.0 ; extra == 'test'
 Requires-Dist: coverage >=7.3.2 ; extra == 'test'
-Requires-Dist: ruff >=0.1.6 ; extra == 'test'
-Requires-Dist: pyright >=1.1.337 ; extra == 'test'
+Requires-Dist: ruff >=0.4.10 ; 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'
@@ -26,7 +26,7 @@ License-File: LICENSE-APACHE
 License-File: LICENSE-MIT
 Summary: N-dimensional interpolation/extrapolation methods
 Author-email: jlogan03@gmail.com
-Requires-Python: >=3.9, <3.12
+Requires-Python: >=3.9, <3.13
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 
 # interpn
@@ -39,29 +39,67 @@ Python bindings to the `interpn` Rust library for N-dimensional interpolation an
 [Rust Docs (docs.rs)](https://docs.rs/interpn/latest/interpn/)
 
 ## Features
+
 | Feature →<br>↓ Interpolant Method | Regular<br>Grid | Rectilinear<br>Grid | Json<br>Serialization |
 |-----------------------------------|-----------------|---------------------|-----------------------|
 | Linear                            |   ✅            |     ✅              | ✅                    |
-| Cubic                             |   ✅            |     💡              | ✅                    |
+| Cubic                             |   ✅            |     ✅              | ✅                    |
 
 The methods provided here, while more limited in scope than scipy's, are
+
 * significantly faster for higher dimensions (1-3 orders of magnitude under most conditions)
 * use almost no RAM (and perform no heap allocations at all)
 * produce significantly improved floating-point error (by 1-2 orders of magnitude)
 * are json-serializable using Pydantic
 * can also be used easily in web and embedded applications via the Rust library
+* are permissively licensed
+
+![ND throughput 1 obs](./docs/throughput_vs_dims_1_obs.svg)
 
 See [here](https://interpnpy.readthedocs.io/en/latest/perf/) for more info about quality-of-fit, throughput, and memory usage.
 
+## Installation
+
+```bash
+pip install interpn
+```
+
+## Example: Available Methods
+
+```python
+import interpn
+import numpy as np
+
+# Build grid
+x = np.linspace(0.0, 10.0, 5)
+y = np.linspace(20.0, 30.0, 4)
+grids = [x, y]
+
+xgrid, ygrid = np.meshgrid(x, y, indexing="ij")
+zgrid = (xgrid + 2.0 * ygrid)  # Values at grid points
+
+# Grid inputs for true regular grid
+dims = [x.size, y.size]
+starts = np.array([x[0], y[0]])
+steps = np.array([x[1] - x[0], y[1] - y[0]])
+
+# Initialize different interpolators
+# Call like `linear_regular.eval([xs, ys])`
+linear_regular = interpn.MultilinearRegular.new(dims, starts, steps, zgrid)
+cubic_regular = interpn.MulticubicRegular.new(dims, starts, steps, zgrid)
+linear_rectilinear = interpn.MultilinearRectilinear.new(grids, zgrid)
+cubic_rectilinear = interpn.MulticubicRectilinear.new(grids, zgrid)
+```
 
 ## Example: Multilinear Interpolation on a Regular Grid
+
 ```python
 import interpn
 import numpy as np
 
 # Build grid
 x = np.linspace(0.0, 10.0, 5)
-y = np.linspace(20.0, 30.0, 3)
+y = np.linspace(20.0, 30.0, 4)
 
 xgrid, ygrid = np.meshgrid(x, y, indexing="ij")
 zgrid = (xgrid + 2.0 * ygrid)  # Values at grid points
@@ -75,15 +113,13 @@ steps = np.array([x[1] - x[0], y[1] - y[0]])
 obs = [xgrid.flatten(), ygrid.flatten()]
 
 # Initialize
-interpolator = interpn.MultilinearRegular.new(
-    dims, starts, steps, zgrid.flatten()
-)
+interpolator = interpn.MultilinearRegular.new(dims, starts, steps, zgrid.flatten())
 
 # Interpolate
 out = interpolator.eval(obs)
 
 # Check result
-assert np.all(out == zgrid.flatten())
+assert np.allclose(out, zgrid.flatten(), rtol=1e-13)
 
 # Serialize and deserialize
 roundtrip_interpolator = interpn.MultilinearRegular.model_validate_json(
@@ -97,9 +133,11 @@ assert np.all(out == out2)
 
 
 # License
+
 Licensed under either of
 
 - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
 - MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
 at your option.
+

{interpn-0.2.0 → interpn-0.2.2}/README.md

@@ -8,29 +8,67 @@ Python bindings to the `interpn` Rust library for N-dimensional interpolation an
 [Rust Docs (docs.rs)](https://docs.rs/interpn/latest/interpn/)
 
 ## Features
+
 | Feature →<br>↓ Interpolant Method | Regular<br>Grid | Rectilinear<br>Grid | Json<br>Serialization |
 |-----------------------------------|-----------------|---------------------|-----------------------|
 | Linear                            |   ✅            |     ✅              | ✅                    |
-| Cubic                             |   ✅            |     💡              | ✅                    |
+| Cubic                             |   ✅            |     ✅              | ✅                    |
 
 The methods provided here, while more limited in scope than scipy's, are
+
 * significantly faster for higher dimensions (1-3 orders of magnitude under most conditions)
 * use almost no RAM (and perform no heap allocations at all)
 * produce significantly improved floating-point error (by 1-2 orders of magnitude)
 * are json-serializable using Pydantic
 * can also be used easily in web and embedded applications via the Rust library
+* are permissively licensed
+
+![ND throughput 1 obs](./docs/throughput_vs_dims_1_obs.svg)
 
 See [here](https://interpnpy.readthedocs.io/en/latest/perf/) for more info about quality-of-fit, throughput, and memory usage.
 
+## Installation
+
+```bash
+pip install interpn
+```
+
+## Example: Available Methods
+
+```python
+import interpn
+import numpy as np
+
+# Build grid
+x = np.linspace(0.0, 10.0, 5)
+y = np.linspace(20.0, 30.0, 4)
+grids = [x, y]
+
+xgrid, ygrid = np.meshgrid(x, y, indexing="ij")
+zgrid = (xgrid + 2.0 * ygrid)  # Values at grid points
+
+# Grid inputs for true regular grid
+dims = [x.size, y.size]
+starts = np.array([x[0], y[0]])
+steps = np.array([x[1] - x[0], y[1] - y[0]])
+
+# Initialize different interpolators
+# Call like `linear_regular.eval([xs, ys])`
+linear_regular = interpn.MultilinearRegular.new(dims, starts, steps, zgrid)
+cubic_regular = interpn.MulticubicRegular.new(dims, starts, steps, zgrid)
+linear_rectilinear = interpn.MultilinearRectilinear.new(grids, zgrid)
+cubic_rectilinear = interpn.MulticubicRectilinear.new(grids, zgrid)
+```
 
 ## Example: Multilinear Interpolation on a Regular Grid
+
 ```python
 import interpn
 import numpy as np
 
 # Build grid
 x = np.linspace(0.0, 10.0, 5)
-y = np.linspace(20.0, 30.0, 3)
+y = np.linspace(20.0, 30.0, 4)
 
 xgrid, ygrid = np.meshgrid(x, y, indexing="ij")
 zgrid = (xgrid + 2.0 * ygrid)  # Values at grid points
@@ -44,15 +82,13 @@ steps = np.array([x[1] - x[0], y[1] - y[0]])
 obs = [xgrid.flatten(), ygrid.flatten()]
 
 # Initialize
-interpolator = interpn.MultilinearRegular.new(
-    dims, starts, steps, zgrid.flatten()
-)
+interpolator = interpn.MultilinearRegular.new(dims, starts, steps, zgrid.flatten())
 
 # Interpolate
 out = interpolator.eval(obs)
 
 # Check result
-assert np.all(out == zgrid.flatten())
+assert np.allclose(out, zgrid.flatten(), rtol=1e-13)
 
 # Serialize and deserialize
 roundtrip_interpolator = interpn.MultilinearRegular.model_validate_json(
@@ -66,9 +102,10 @@ assert np.all(out == out2)
 
 
 # License
+
 Licensed under either of
 
 - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
 - MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 
-at your option.
+at your option.