pyrestoolbox 3.8.5__tar.gz → 3.8.7__tar.gz

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/.github/workflows/build-wheels.yml

@@ -27,18 +27,10 @@ jobs:
           python-version: "3.12"
 
       - name: Install Rust toolchain
-        if: matrix.os != 'windows-latest'
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.os == 'macos-14' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Install Rust toolchain (Windows GNU)
-        if: matrix.os == 'windows-latest'
-        run: |
-          rustup toolchain install stable-x86_64-pc-windows-gnu
-          rustup default stable-x86_64-pc-windows-gnu
-        shell: bash
-
       - name: Build wheels via cibuildwheel
         uses: pypa/cibuildwheel@v2.23
         env:
@@ -50,23 +42,12 @@ jobs:
           CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
           # maturin needs Rust in the build container
           CIBW_BEFORE_ALL_LINUX: >
-            yum install -y m4 diffutils &&
             curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           CIBW_ENVIRONMENT_LINUX: 'PATH="$HOME/.cargo/bin:$PATH"'
           # macOS: build native arch only per runner (no cross-compilation)
           CIBW_ARCHS_MACOS: "arm64"
           CIBW_ARCHS_LINUX: "x86_64"
           CIBW_ARCHS_WINDOWS: "AMD64"
-          # Windows: use gnu target so GMP can build with MinGW GCC.
-          # MSYS2 is pre-installed on windows-latest runners.
-          CIBW_BEFORE_ALL_WINDOWS: >
-            C:\msys64\usr\bin\pacman.exe -S --noconfirm
-            mingw-w64-x86_64-gcc
-            m4
-            diffutils
-            make
-          CIBW_ENVIRONMENT_WINDOWS: >
-            PATH="C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin;$PATH"
           # Rust cross-compile env for macOS x86_64 on arm64 runner
           CIBW_ENVIRONMENT_MACOS: >
             CARGO_BUILD_TARGET="aarch64-apple-darwin"
@@ -80,9 +61,10 @@ jobs:
           # missing OpenBLAS (this broke the v3.6.0 first build attempt - the
           # skip is load-bearing, do not remove it). Linux import + full-suite
           # coverage lives in .github/workflows/tests.yml instead.
-          # Also skip macOS (MPFR symbol issue) and cp39 (dependency
-          # ilt-inversion may not have matching wheels on PyPI yet).
-          CIBW_TEST_SKIP: "*-manylinux* *-macosx* cp39-*"
+          # Also skip cp39 (dependency ilt-inversion may not have matching
+          # wheels on PyPI yet). macOS tests run again: the skip was for an
+          # MPFR symbol issue, and the crate no longer links GMP/MPFR.
+          CIBW_TEST_SKIP: "*-manylinux* cp39-*"
 
       - uses: actions/upload-artifact@v6
         with:

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/.github/workflows/tests.yml

@@ -30,9 +30,18 @@ jobs:
         run: python3 -m pytest pyrestoolbox/tests/ -q
 
   # ── Full test suite with Rust extension (includes parity tests) ──────
+  # Linux plus macOS and Windows: the extension is pure Rust (astro-float), so
+  # every platform builds it with the default toolchain and runs the suite.
   test-with-rust:
-    name: Rust-accelerated (parity tests)
-    runs-on: ubuntu-latest
+    name: Rust-accelerated (parity tests)${{ matrix.os != 'ubuntu-latest' && format(' - {0}', matrix.os) || '' }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-14, windows-latest]
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v5
 
@@ -43,9 +52,6 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Install m4 (needed by gmp-mpfr-sys for the rug crate)
-        run: sudo apt-get update -qq && sudo apt-get install -y -qq m4
-
       - name: Install dependencies
         run: pip install numpy scipy pandas tabulate openpyxl mpmath ilt-inversion pytest maturin
 
@@ -55,13 +61,13 @@ jobs:
       # Tests import the repo source tree, so the compiled extension must
       # live inside it for the Rust paths to load.
       - name: Copy extension into source tree
-        run: unzip -o dist/*.whl "pyrestoolbox/_native*" -d .
+        run: python -c "import glob, zipfile; z = zipfile.ZipFile(glob.glob('dist/*.whl')[0]); [z.extract(n, '.') for n in z.namelist() if n.startswith('pyrestoolbox/_native')]"
 
       - name: Verify Rust extension loads
-        run: python3 -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], s"
+        run: python -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], s"
 
       - name: Run full test suite (Rust + parity)
-        run: python3 -m pytest pyrestoolbox/tests/ -q
+        run: python -m pytest pyrestoolbox/tests/ -q
 
   # ── MCP server (separate distribution in mcp/) on both SDK majors ────
   # The server picks FastMCP (1.x) or MCPServer (2.x) at import; test both so
@@ -117,9 +123,6 @@ jobs:
         with:
           components: clippy
 
-      - name: Install m4 (needed by gmp-mpfr-sys for the rug crate)
-        run: sudo apt-get update -qq && sudo apt-get install -y -qq m4
-
       - name: Clippy
         run: cargo clippy --all-targets -- -D warnings
 

pyrestoolbox-3.8.7/Cargo.lock

@@ -0,0 +1,409 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "astro-float"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cf6ecd69dd6fbe3763187ff2fa2b0e475b79f04ed86f631a7bc6b04ede0355e"
+dependencies = [
+ "astro-float-macro",
+ "astro-float-num",
+]
+
+[[package]]
+name = "astro-float-macro"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c007205ae7076600c8a59022866990afac02ff186f9031839f67ecce4df2146"
+dependencies = [
+ "astro-float-num",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "astro-float-num"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7f6a0312e8f5845f84241b21bd2394d49940b6bc333c6a84f992e6dc9ebb85"
+dependencies = [
+ "itertools",
+ "lazy_static",
+ "rand",
+ "serde",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
+
+[[package]]
+name = "either"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "indoc"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
+
+[[package]]
+name = "libc"
+version = "0.2.184"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "pyrestoolbox-native"
+version = "3.8.7"
+dependencies = [
+ "astro-float",
+ "pyo3",
+ "rayon",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[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.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unindent"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyrestoolbox-native"
-version = "3.8.5"
+version = "3.8.7"
 edition = "2021"
 license = "GPL-3.0-or-later"
 description = "Rust acceleration extensions for pyResToolbox"
@@ -11,8 +11,9 @@ name = "_native"
 crate-type = ["cdylib"]
 
 [dependencies]
+astro-float = "0.9.6"
 pyo3 = { version = "0.23", features = ["extension-module"] }
-rug = { version = "1", default-features = false, features = ["float"] }
+rayon = "1.12.0"
 
 [profile.release]
 opt-level = 3

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrestoolbox
-Version: 3.8.5
+Version: 3.8.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -9,10 +9,11 @@ Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: pandas
 Requires-Dist: tabulate
-Requires-Dist: ilt-inversion
-Requires-Dist: mpmath
-Requires-Dist: gmpy2
 Requires-Dist: openpyxl
+Requires-Dist: ilt-inversion ; extra == 'aquifer'
+Requires-Dist: mpmath ; extra == 'aquifer'
+Requires-Dist: gmpy2 ; extra == 'aquifer'
+Provides-Extra: aquifer
 License-File: LICENSE
 Summary: pyResToolbox - A collection of Reservoir Engineering Utilities
 Keywords: restoolbox,petroleum,reservoir
@@ -64,7 +65,7 @@ All public PVT, flow rate, and simulation table functions support both oilfield
 Rust Acceleration (Optional)
 ----------------------------
 
-pyResToolbox includes optional Rust-compiled extensions that accelerate computationally intensive algorithms. When the compiled extension is present and loadable, these functions run automatically through Rust with no API changes. When the extension is unavailable, all functions fall back silently to the pure Python implementation.
+pyResToolbox includes optional Rust-compiled extensions that accelerate computationally intensive algorithms. When the compiled extension is present and loadable, these functions run automatically through Rust with no API changes. When the extension is unavailable, all functions fall back silently to the pure Python implementation. The one exception is ``simtools.influence_tables``, whose pure-Python fallback needs the optional ``aquifer`` extra (``pip install 'pyrestoolbox[aquifer]'``).
 
 **Accelerated functions:**
 

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/README.rst

@@ -39,7 +39,7 @@ All public PVT, flow rate, and simulation table functions support both oilfield
 Rust Acceleration (Optional)
 ----------------------------
 
-pyResToolbox includes optional Rust-compiled extensions that accelerate computationally intensive algorithms. When the compiled extension is present and loadable, these functions run automatically through Rust with no API changes. When the extension is unavailable, all functions fall back silently to the pure Python implementation.
+pyResToolbox includes optional Rust-compiled extensions that accelerate computationally intensive algorithms. When the compiled extension is present and loadable, these functions run automatically through Rust with no API changes. When the extension is unavailable, all functions fall back silently to the pure Python implementation. The one exception is ``simtools.influence_tables``, whose pure-Python fallback needs the optional ``aquifer`` extra (``pip install 'pyrestoolbox[aquifer]'``).
 
 **Accelerated functions:**
 

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pyrestoolbox"
-version = "3.8.5"
+version = "3.8.7"
 description = "pyResToolbox - A collection of Reservoir Engineering Utilities"
 license = {text = "GPL-3.0-or-later"}
 authors = [{name = "Mark W. Burgoyne", email = "mark.w.burgoyne@gmail.com"}]
@@ -21,13 +21,14 @@ dependencies = [
     "scipy",
     "pandas",
     "tabulate",
-    "ilt-inversion",
-    "mpmath",
-    "gmpy2",
     "openpyxl",
 ]
 readme = "README.rst"
 
+[project.optional-dependencies]
+# Pure-Python fallback for simtools.influence_tables (the Rust extension needs none of these)
+aquifer = ["ilt-inversion", "mpmath", "gmpy2"]
+
 [project.urls]
 Homepage = "https://github.com/mwburgoyne/pyResToolbox"
 

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/pyrestoolbox/docs/changelist.rst

@@ -1,3 +1,15 @@
+Changelist in 3.8.7:
+
+- **SIMTOOLS: ``influence_tables`` Rust path runs on all CPU threads.** The Bessel evaluations, transform values and GWR accelerations are spread across threads (output identical at any thread count). On a 4-core, 8-thread machine the 126-point table takes 0.06 s at M=7 (0.19 s on one thread, 0.09 s for the 3.8.6 MPFR build) and 0.51 s at M=32 (1.81 s, 1.51 s). For comparison, gwr_inversion 2.0.0's built-in bounded radial transform takes 0.40 s at M=7 on one core and 0.15 s with ``workers=8``, at identical accuracy. ``RAYON_NUM_THREADS`` limits the thread count; see the ``influence_tables`` documentation.
+
+- **PACKAGING: the Rust extension no longer needs a C toolchain, and macOS wheels are tested again.** The multiprecision arithmetic behind ``simtools.influence_tables`` moved from the ``rug`` crate (GMP and MPFR, compiled from C) to the pure-Rust ``astro-float`` crate. Windows wheels now build with the standard MSVC Rust toolchain instead of MinGW and MSYS2, building from the sdist needs only Rust (no ``m4``), and the macOS wheel import tests that were skipped for an MPFR linking issue run again. Results agree with the MPFR build to the last bit of f64 output at M of 18 and above, and to within 2.8e-10 (relative) at M=7 and 1.4e-13 at M=12, about four orders of magnitude below the inversion's own error. On one thread it is slower than the MPFR build, partly recovered by evaluating each argument's four Bessel functions from one set of power series and sharing the values at sqrt(s) across ReD: a 126-point table takes 0.19 s at the default M=7 against 0.09 s before (2.1x), narrowing to 1.2x at M=32 (1.81 vs 1.51 s).
+
+Changelist in 3.8.6:
+
+- **SIMTOOLS: ``influence_tables`` Rust path now holds the precision the inversion needs (results move).** The Rust Gaver-Wynn-Rho inversion evaluates the Van Everdingen-Hurst transform with its own MPFR Bessel functions, and those carried less precision than GWR needs (about 2.1M digits). The series-to-asymptotic switch was fixed at x = 25, where the asymptotic expansion is good to only about 22 digits; the K-series ran with half the guard bits its cancellation needs; pi in the asymptotic prefactors and Euler's constant in the K0 series were f64 or 50-digit constants; and the I1 asymptotic expansion had a sign error. The switch now depends on the working precision, the guard bits match the cancellation, all constants are MPFR, and the I1 sign is corrected. Against a reference converged to 1e-14, the worst point on a 126-point table (ReD 1.5-20, tD 0.01-200) is now 2.2e-5 at M=7 (was 4.5e-5), 1.4e-8 at M=12 (was 1.6e-4), 3.2e-11 at M=18 (was 6.7e-3) and 2e-16 at M=32 (ReD 1.5 at tD 0.044 returned 20.07 against 0.2175), the same convergence as the pure-Python path. At the default M=7 the README example table (ReD 1.5-1000) moves by up to 4.6e-5 relative (ReD 1.5, tD 0.027: 0.172801 to 0.172809), 6e-7 on average. Run time is unchanged or a little shorter (121 against 138 ms for that table at M=7).
+
+- **PACKAGING: ``ilt-inversion``, ``mpmath`` and ``gmpy2`` are now an optional extra (``pip install 'pyrestoolbox[aquifer]'``).** Only ``simtools.influence_tables`` uses them, and only on its pure-Python path; the Rust extension in every prebuilt wheel does the inverse Laplace transform and Bessel functions itself in MPFR. ``import pyrestoolbox.simtools`` no longer loads ``ilt`` or ``mpmath``. Without the Rust extension and without the extra, ``influence_tables`` raises ``ImportError`` naming the extra; every other function is unaffected. Existing environments keep working, since upgrading does not uninstall the three packages.
+
 Changelist in 3.8.5:
 
 - **NODAL: gas VLP uses the ``gas_pvt`` Z-factor and viscosity methods (results move when a GasPVT is passed).** ``fbhp``, ``fthp``, ``outflow_curve``, ``operating_point`` and the simtools VFP tables took only the gas SG and Sutton/Wichert-Aziz pseudo-criticals from a ``GasPVT``; the march always ran Hall-Yarborough Z with Lee-Gonzalez-Eakin viscosity, so ``zmethod='BNS'`` (or the GasPVT default, DAK with PMC) was silently ignored, as were H2 and He (which raised a warning). The march now evaluates Z and viscosity exactly as ``gas_pvt.z()`` and ``gas_pvt.viscosity()`` do, at every step and in the zero-rate static column, in Python and Rust (the Rust march builds the same Z/viscosity evaluator as ``gas_dmp``, so every method stays accelerated; the two paths agree to 1e-9 relative). Calls without ``gas_pvt`` are bit-identical. Example (THP 1000 psia, 5 MMscf/d, 100 bbl/d water, 5000 ft of 2.441 in tubing, 80-200 degF, SG 0.65), Beggs-Brill BHP: 1475.3 psia before, 1459.3 with ``GasPVT(sg=0.65)`` (DAK/PMC), 1508.2 with ``zmethod='BNS'``; WG 1444.8, 1444.1, 1446.2. Beggs-Brill moves most because the distributed-to-segregated boundary sits mid-well here and the gradient steps 27% across it. The pure-Python fallback is about 15 times slower with a ``gas_pvt`` (about 40 ms per ``fbhp``), since each step calls ``gas_z`` and ``gas_ug``. No documented example passes a ``gas_pvt`` to the VLP functions, so none moves; one nodal test that asserted a sweet ``GasPVT`` equals the ``gsg``-only answer now compares an HY/SUT ``GasPVT`` (within 4e-5).

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/pyrestoolbox/docs/simtools.rst

@@ -152,6 +152,8 @@ pyrestoolbox.simtools.influence_tables
 
 Solves Van Everdingin & Hurst Constant Terminal Rate solution via inverse Laplace transform and optionally writes out ECLIPSE styled AQUTAB include file.
 
+The Rust extension (in every prebuilt wheel) does the inversion with no extra packages, using all available CPU threads; set the environment variable ``RAYON_NUM_THREADS`` before importing pyrestoolbox to limit them (for example ``RAYON_NUM_THREADS=1`` when running several processes side by side). The result does not depend on the thread count. Without it, the pure-Python fallback needs the optional ``aquifer`` extra (``ilt-inversion``, ``mpmath``, ``gmpy2``): ``pip install 'pyrestoolbox[aquifer]'``. Calling ``influence_tables`` on the pure-Python path without them raises ``ImportError``.
+
 Returns a tuple of;
     1. Dimensionless time list
     2. list of lists of dimensionless pressures at each dimensionless time for each dimensionless radius

{pyrestoolbox-3.8.5 → pyrestoolbox-3.8.7}/pyrestoolbox/simtools/_aquifer.py

@@ -30,8 +30,6 @@ from typing import Union, Tuple
 import numpy as np
 import numpy.typing as npt
 from tabulate import tabulate
-from ilt import gwr
-from mpmath import mp
 
 from pyrestoolbox._accelerator import RUST_AVAILABLE, _rust_module
 
@@ -74,7 +72,17 @@ def influence_tables(
     if RUST_AVAILABLE:
         pDs = _rust_module.influence_tables_rust(tD.tolist(), list(ReDs), M)
     else:
-        # Python fallback via ilt library
+        # Python fallback via ilt library (optional extra: pyrestoolbox[aquifer])
+        try:
+            from ilt import gwr
+            from mpmath import mp
+        except ImportError as e:
+            raise ImportError(
+                "influence_tables needs the Rust extension or the optional "
+                "inverse-Laplace dependencies; install them with "
+                "pip install 'pyrestoolbox[aquifer]'"
+            ) from e
+
         def laplace_Ps(s: float, ReD: float):
             x = mp.sqrt(s)
             # pre-calculate duplicated bessel function for greater efficiency