tract 0.23.0.dev4__tar.gz → 0.23.0.dev5__tar.gz

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tract
-Version: 0.23.0.dev4
+Version: 0.23.0.dev5
 Summary: Python bindings for tract, a neural network inference engine
 Author: Mathieu Poumeyrol, Sonos, and tract contributors
 Author-email: mathieu@poumeyrol.fr

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.23.0-dev.5 (unreleased)
+
+### API — breaking
+
+- **`ndarray` removed from the `tract` and `tract-proxy` public APIs.** `tract::prelude::tract_ndarray`, the `Tensor::view*()` methods, and the automatic `TryFrom<ndarray::Array> for Tensor` impls are gone; neither crate drags an `ndarray` version into its public surface. Downstream crates that want `ndarray` ergonomics invoke **`tract::impl_ndarray_interop!()`** (or **`tract_proxy::impl_ndarray_interop!()`** for the FFI-backed API) at their crate root — the macro expands in the user's scope, so the `ndarray::*` types it references resolve against the *user's* `ndarray` dependency. It generates a `Tract` trait (`arr.tract()? -> tract::Tensor`) and an `Ndarray` trait (`tensor.ndarray::<T>()?` for dynamic-rank view, plus `ndarray0..ndarray6` for rank-specialised views — `ndarray0` is new and covers scalars). The macro also accepts an optional path argument — `tract::impl_ndarray_interop!(ndarray_017)` — for Cargo renames or multi-version setups. Migration: replace `view()` with `ndarray()`, `view1..view6` with `ndarray1..ndarray6`, `tensor(arr)?` / `arr.try_into()?` with `arr.tract()?`.
+
 # 0.23.0-dev.4 — 2026-04-20
 
 ### API

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/Cargo.toml

@@ -37,7 +37,6 @@ members = [
     "examples/nemo-nemotron-asr",
     "examples/nnef-dump-mobilenet-v2",
     "examples/nnef-mobilenet-v2",
-    "examples/nnef-mobilenet-v2-api",
     "examples/onnx-mobilenet-v2",
     "examples/pytorch-albert-v2",
     "examples/pytorch-resnet",
@@ -216,29 +215,29 @@ unicode-normalization = "0.1.19"
 walkdir = "2.3.2"
 zerofrom = "0.1.5"
 tract-api = { version = "=0.23.0-dev.4", path = 'api' }
-tract-core = { version = "=0.23.0-dev.4", path = 'core' }
-tract-cuda = { version = "=0.23.0-dev.4", path = 'cuda' }
-tract-data = { version = "=0.23.0-dev.4", path = 'data' }
-tract-extra = { version = "=0.23.0-dev.4", path = 'extra' }
-tract-gpu = { version = "=0.23.0-dev.4", path = 'gpu' }
-tract-hir = { version = "=0.23.0-dev.4", path = 'hir' }
-tract-libcli = { version = "=0.23.0-dev.4", path = 'libcli' }
-tract-linalg = { version = "=0.23.0-dev.4", path = 'linalg' }
-tract-metal = { version = "=0.23.0-dev.4", path = 'metal' }
-tract-nnef-resources = { version = "=0.23.0-dev.4", path = 'nnef/nnef-resources' }
-tract-nnef = { version = "=0.23.0-dev.4", path = 'nnef' }
-tract-onnx-opl = { version = "=0.23.0-dev.4", path = 'onnx-opl' }
-tract-onnx = { version = "=0.23.0-dev.4", path = 'onnx' }
-tract-pulse-opl = { version = "=0.23.0-dev.4", path = 'pulse-opl' }
-tract-pulse = { version = "=0.23.0-dev.4", path = 'pulse' }
-tract-tensorflow = { version = "=0.23.0-dev.4", path = 'tensorflow' }
-tract-tflite = { version = "=0.23.0-dev.4", path = 'tflite' }
-tract-transformers = { version = "=0.23.0-dev.4", path = 'transformers' }
-tract = { version = "=0.23.0-dev.4", path = 'api/rs' }
-tract-proxy-sys = { version = "=0.23.0-dev.4", path = 'api/proxy/sys' }
-tract-cli = { version = "=0.23.0-dev.4", path = 'cli' }
-tract-ffi = { version = "=0.23.0-dev.4" }
-tract-proxy = { version = "=0.23.0-dev.4" }
+tract-core = { version = "=0.23.0-dev.5", path = 'core' }
+tract-cuda = { version = "=0.23.0-dev.5", path = 'cuda' }
+tract-data = { version = "=0.23.0-dev.5", path = 'data' }
+tract-extra = { version = "=0.23.0-dev.5", path = 'extra' }
+tract-gpu = { version = "=0.23.0-dev.5", path = 'gpu' }
+tract-hir = { version = "=0.23.0-dev.5", path = 'hir' }
+tract-libcli = { version = "=0.23.0-dev.5", path = 'libcli' }
+tract-linalg = { version = "=0.23.0-dev.5", path = 'linalg' }
+tract-metal = { version = "=0.23.0-dev.5", path = 'metal' }
+tract-nnef-resources = { version = "=0.23.0-dev.5", path = 'nnef/nnef-resources' }
+tract-nnef = { version = "=0.23.0-dev.5", path = 'nnef' }
+tract-onnx-opl = { version = "=0.23.0-dev.5", path = 'onnx-opl' }
+tract-onnx = { version = "=0.23.0-dev.5", path = 'onnx' }
+tract-pulse-opl = { version = "=0.23.0-dev.5", path = 'pulse-opl' }
+tract-pulse = { version = "=0.23.0-dev.5", path = 'pulse' }
+tract-tensorflow = { version = "=0.23.0-dev.5", path = 'tensorflow' }
+tract-tflite = { version = "=0.23.0-dev.5", path = 'tflite' }
+tract-transformers = { version = "=0.23.0-dev.5", path = 'transformers' }
+tract = { version = "=0.23.0-dev.5", path = 'api/rs' }
+tract-proxy-sys = { version = "=0.23.0-dev.5", path = 'api/proxy/sys' }
+tract-cli = { version = "=0.23.0-dev.5", path = 'cli' }
+tract-ffi = { version = "=0.23.0-dev.5" }
+tract-proxy = { version = "=0.23.0-dev.5" }
 
 
 [profile.opt-no-lto]

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/Cargo.toml

@@ -17,7 +17,6 @@ anyhow.workspace = true
 boow.workspace = true
 flate2.workspace = true
 half.workspace = true
-ndarray.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-ffi"
-version = "0.23.0-dev.4"
+version = "0.23.0-dev.5"
 license = "MIT OR Apache-2.0"
 authors = ["Mathieu Poumeyrol <kali@zoy.org>"]
 description = "Tiny, no-nonsense, self contained, neural network inference"

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/proxy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-proxy"
-version = "0.23.0-dev.4"
+version = "0.23.0-dev.5"
 license = "MIT OR Apache-2.0"
 authors = ["Mathieu Poumeyrol <kali@zoy.org>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
@@ -16,11 +16,11 @@ include = [ "Cargo.toml", "src/**/*.rs", "LICENSE*" ]
 anyhow.workspace = true
 boow.workspace = true
 home.workspace = true
-ndarray.workspace = true
 tract-api.workspace = true
 tract-proxy-sys.workspace = true
 
 [dev-dependencies]
+ndarray.workspace = true
 reqwest.workspace = true
 rustls.workspace = true
 tempfile.workspace = true

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/proxy/src/lib.rs

@@ -6,7 +6,9 @@ use tract_api::*;
 use tract_proxy_sys as sys;
 
 use anyhow::{Context, Result};
-use ndarray::*;
+
+mod ndarray_interop;
+pub use ndarray_interop::__ndarray_interop;
 
 macro_rules! check {
     ($expr:expr) => {
@@ -593,8 +595,6 @@ impl PartialEq for Tensor {
     }
 }
 
-tensor_from_to_ndarray!();
-
 // FACT
 wrapper!(Fact, TractFact, tract_fact_destroy);
 wrapper_clone!(Fact, tract_fact_clone);

tract-0.23.0.dev5/rust-workspace/api/proxy/src/ndarray_interop.rs

@@ -0,0 +1,140 @@
+/// Generate ndarray interop for [`tract_proxy::Tensor`][crate::Tensor] using the
+/// caller crate's own `ndarray` version.
+///
+/// `tract-proxy` itself has no public `ndarray` dependency: the tensor interface
+/// deals only in shapes, slices, bytes and primitive datums. If your
+/// application wants the ergonomics of `ndarray`, invoke this macro once at the
+/// root of your crate. The macro expands in your crate's scope, so the
+/// `ndarray::*` types referenced in the generated code resolve against *your*
+/// `ndarray` dependency.
+///
+/// The generated surface mirrors `tract::impl_ndarray_interop!` exactly: a
+/// `Tract` trait with `fn tract(self) -> anyhow::Result<tract_proxy::Tensor>`
+/// for `ndarray::ArrayBase`, and an `Ndarray` trait with `ndarray::<T>()` /
+/// `ndarray0..ndarray6::<T>()` on `tract_proxy::Tensor`.
+///
+/// # Invocation
+///
+/// Zero-argument form uses the `ndarray` crate from your crate's
+/// dependencies:
+///
+/// ```ignore
+/// tract_proxy::impl_ndarray_interop!();
+/// ```
+///
+/// Explicit form takes the ndarray root as a path — useful if your
+/// `Cargo.toml` renames the crate or pins multiple versions side by side:
+///
+/// ```ignore
+/// tract_proxy::impl_ndarray_interop!(ndarray_017);
+/// ```
+#[macro_export]
+macro_rules! impl_ndarray_interop {
+    () => {
+        $crate::impl_ndarray_interop!(ndarray);
+    };
+    ($($nd:ident)::+) => {
+        trait Tract {
+            fn tract(self) -> $crate::__ndarray_interop::anyhow::Result<$crate::Tensor>;
+        }
+
+        impl<T, S, D> Tract for $($nd)::+::ArrayBase<S, D>
+        where
+            T: $crate::__ndarray_interop::Datum + Clone + 'static,
+            S: $($nd)::+::RawData<Elem = T> + $($nd)::+::Data,
+            D: $($nd)::+::Dimension,
+        {
+            fn tract(self) -> $crate::__ndarray_interop::anyhow::Result<$crate::Tensor> {
+                use $crate::__ndarray_interop::TensorInterface as _;
+                if let Some(slice) = self.as_slice_memory_order()
+                    && (0..self.ndim()).all(|ix| {
+                        self.strides().get(ix + 1).is_none_or(|next| *next <= self.strides()[ix])
+                    })
+                {
+                    $crate::Tensor::from_slice(self.shape(), slice)
+                } else {
+                    let slice: ::std::vec::Vec<_> = self.iter().cloned().collect();
+                    $crate::Tensor::from_slice(self.shape(), &slice)
+                }
+            }
+        }
+
+        trait Ndarray {
+            fn ndarray<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayViewD<'_, T>>;
+            fn ndarray0<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView0<'_, T>>;
+            fn ndarray1<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView1<'_, T>>;
+            fn ndarray2<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView2<'_, T>>;
+            fn ndarray3<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView3<'_, T>>;
+            fn ndarray4<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView4<'_, T>>;
+            fn ndarray5<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView5<'_, T>>;
+            fn ndarray6<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView6<'_, T>>;
+        }
+
+        impl Ndarray for $crate::Tensor {
+            fn ndarray<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayViewD<'_, T>> {
+                use $crate::__ndarray_interop::TensorInterface as _;
+                let (shape, data) = self.as_shape_and_slice::<T>()?;
+                Ok(unsafe { $($nd)::+::ArrayViewD::from_shape_ptr(shape, data.as_ptr()) })
+            }
+            fn ndarray0<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView0<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray1<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView1<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray2<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView2<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray3<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView3<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray4<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView4<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray5<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView5<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray6<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView6<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+        }
+    };
+}
+
+#[doc(hidden)]
+pub mod __ndarray_interop {
+    pub use ::anyhow;
+    pub use ::tract_api::{Datum, TensorInterface};
+}

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/proxy/sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract-proxy-sys"
-version = "0.23.0-dev.4"
+version = "0.23.0-dev.5"
 license = "MIT OR Apache-2.0"
 authors = ["Mathieu Poumeyrol <kali@zoy.org>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"

tract-0.23.0.dev5/rust-workspace/api/proxy/tests/ndarray_interop.rs

@@ -0,0 +1,32 @@
+// Compile-only check: both forms of `tract_proxy::impl_ndarray_interop!`
+// expand cleanly. Running requires libtract to be available for linking;
+// that's handled by the `mobilenet` test's build path.
+
+mod default_form {
+    tract_proxy::impl_ndarray_interop!();
+
+    #[allow(dead_code)]
+    pub(super) fn sanity(t: &tract_proxy::Tensor) -> anyhow::Result<()> {
+        let arr = ndarray::Array4::<f32>::zeros((1, 3, 4, 5));
+        let _converted: tract_proxy::Tensor = arr.tract()?;
+        let _view = t.ndarray::<f32>()?;
+        let _v4 = t.ndarray4::<f32>()?;
+        let _v0 = t.ndarray0::<f32>()?;
+        Ok(())
+    }
+}
+
+mod explicit_path {
+    // Re-alias the ndarray crate to a different path to prove the explicit
+    // form resolves against the caller-supplied root.
+    use ndarray as my_nd;
+    tract_proxy::impl_ndarray_interop!(my_nd);
+
+    #[allow(dead_code)]
+    pub(super) fn sanity(t: &tract_proxy::Tensor) -> anyhow::Result<()> {
+        let arr = my_nd::Array4::<f32>::zeros((1, 3, 4, 5));
+        let _converted: tract_proxy::Tensor = arr.tract()?;
+        let _view = t.ndarray::<f32>()?;
+        Ok(())
+    }
+}

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tract"
-version = "0.23.0-dev.4"
+version = "0.23.0-dev.5"
 license = "MIT OR Apache-2.0"
 authors = ["Mathieu Poumeyrol <kali@zoy.org>"]
 description = "Tiny, no-nonsense, self contained, TensorFlow and ONNX inference"
@@ -20,7 +20,6 @@ flate2.workspace = true
 half.workspace = true
 icu_normalizer.workspace = true
 icu_properties.workspace = true
-ndarray.workspace = true
 tract-api.workspace = true
 tract-nnef.workspace = true
 tract-onnx-opl.workspace = true

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/rs/src/lib.rs

@@ -11,7 +11,6 @@ use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::{Context, Result};
-use ndarray::{Data, Dimension, RawData};
 use tract_extra::WithTractExtra;
 use tract_libcli::annotations::Annotations;
 use tract_libcli::profile::BenchLimits;
@@ -28,13 +27,15 @@ use tract_transformers::WithTractTransformers;
 
 use tract_api::*;
 
+mod ndarray_interop;
+pub use ndarray_interop::__ndarray_interop;
+
 pub mod prelude {
     // Concrete types
     pub use crate::{
         Dim, Fact, InferenceFact, InferenceModel, Model, Nnef, Onnx, Runnable, Runtime, State,
         Tensor, nnef, onnx, runtime_for_name,
     };
-    pub use ndarray as tract_ndarray;
 
     // User-facing API types
     pub use tract_api::{
@@ -581,7 +582,6 @@ impl Display for InferenceFact {
     }
 }
 
-tensor_from_to_ndarray!();
 as_inference_fact_impl!(InferenceModel, InferenceFact);
 as_fact_impl!(Model, Fact);
 

tract-0.23.0.dev5/rust-workspace/api/rs/src/ndarray_interop.rs

@@ -0,0 +1,158 @@
+/// Generate ndarray interop for [`tract::Tensor`][crate::Tensor] using the caller
+/// crate's own `ndarray` version.
+///
+/// `tract` itself has no public `ndarray` dependency: the tensor interface deals
+/// only in shapes, slices, bytes and primitive datums. If your application wants
+/// the ergonomics of `ndarray`, invoke this macro once at the root of your crate.
+/// The macro expands in your crate's scope, so the `ndarray::*` types referenced
+/// in the generated code resolve against *your* `ndarray` dependency — freeing
+/// you from whichever version `tract` happens to use internally.
+///
+/// Two traits are generated:
+///
+/// - `Tract`, with method `fn tract(self) -> anyhow::Result<tract::Tensor>`,
+///   implemented for every `ndarray::ArrayBase<S, D>` with a `Datum` element
+///   type.
+/// - `Ndarray`, with methods `ndarray::<T>()`, `ndarray0::<T>()` …
+///   `ndarray6::<T>()`, implemented for `tract::Tensor`. `ndarrayN` returns a
+///   rank-`N` `ArrayView`; `ndarray` returns the dynamic-rank `ArrayViewD`.
+///
+/// # Invocation
+///
+/// Zero-argument form uses the `ndarray` crate from your crate's
+/// dependencies:
+///
+/// ```ignore
+/// tract::impl_ndarray_interop!();
+/// ```
+///
+/// Explicit form takes the ndarray root as a path — useful if your
+/// `Cargo.toml` renames the crate or pins multiple versions side by side:
+///
+/// ```ignore
+/// // Cargo.toml: ndarray_017 = { package = "ndarray", version = "0.17" }
+/// tract::impl_ndarray_interop!(ndarray_017);
+/// ```
+///
+/// # Example
+///
+/// ```ignore
+/// tract::impl_ndarray_interop!();
+///
+/// use ndarray::Array4;
+///
+/// let input: tract::Tensor = Array4::<f32>::zeros((1, 3, 224, 224)).tract()?;
+/// let outputs = model.run([input])?;
+/// let view = outputs[0].ndarray::<f32>()?;          // ArrayViewD<f32>
+/// let v4   = outputs[0].ndarray4::<f32>()?;         // ArrayView4<f32>
+/// ```
+#[macro_export]
+macro_rules! impl_ndarray_interop {
+    () => {
+        $crate::impl_ndarray_interop!(ndarray);
+    };
+    ($($nd:ident)::+) => {
+        trait Tract {
+            fn tract(self) -> $crate::__ndarray_interop::anyhow::Result<$crate::Tensor>;
+        }
+
+        impl<T, S, D> Tract for $($nd)::+::ArrayBase<S, D>
+        where
+            T: $crate::__ndarray_interop::Datum + Clone + 'static,
+            S: $($nd)::+::RawData<Elem = T> + $($nd)::+::Data,
+            D: $($nd)::+::Dimension,
+        {
+            fn tract(self) -> $crate::__ndarray_interop::anyhow::Result<$crate::Tensor> {
+                use $crate::__ndarray_interop::TensorInterface as _;
+                if let Some(slice) = self.as_slice_memory_order()
+                    && (0..self.ndim()).all(|ix| {
+                        self.strides().get(ix + 1).is_none_or(|next| *next <= self.strides()[ix])
+                    })
+                {
+                    $crate::Tensor::from_slice(self.shape(), slice)
+                } else {
+                    let slice: ::std::vec::Vec<_> = self.iter().cloned().collect();
+                    $crate::Tensor::from_slice(self.shape(), &slice)
+                }
+            }
+        }
+
+        trait Ndarray {
+            fn ndarray<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayViewD<'_, T>>;
+            fn ndarray0<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView0<'_, T>>;
+            fn ndarray1<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView1<'_, T>>;
+            fn ndarray2<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView2<'_, T>>;
+            fn ndarray3<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView3<'_, T>>;
+            fn ndarray4<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView4<'_, T>>;
+            fn ndarray5<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView5<'_, T>>;
+            fn ndarray6<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView6<'_, T>>;
+        }
+
+        impl Ndarray for $crate::Tensor {
+            fn ndarray<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayViewD<'_, T>> {
+                use $crate::__ndarray_interop::TensorInterface as _;
+                let (shape, data) = self.as_shape_and_slice::<T>()?;
+                Ok(unsafe { $($nd)::+::ArrayViewD::from_shape_ptr(shape, data.as_ptr()) })
+            }
+            fn ndarray0<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView0<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray1<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView1<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray2<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView2<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray3<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView3<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray4<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView4<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray5<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView5<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+            fn ndarray6<T: $crate::__ndarray_interop::Datum>(
+                &self,
+            ) -> $crate::__ndarray_interop::anyhow::Result<$($nd)::+::ArrayView6<'_, T>> {
+                Ok(self.ndarray::<T>()?.into_dimensionality()?)
+            }
+        }
+    };
+}
+
+#[doc(hidden)]
+pub mod __ndarray_interop {
+    pub use ::anyhow;
+    pub use ::tract_api::{Datum, TensorInterface};
+}

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/src/lib.rs

@@ -267,35 +267,6 @@ pub trait TensorInterface: Debug + Sized + Clone + PartialEq + Send + Sync {
         Ok(shape)
     }
 
-    fn view<T: Datum>(&self) -> Result<ndarray::ArrayViewD<'_, T>> {
-        let (shape, data) = self.as_shape_and_slice()?;
-        Ok(unsafe { ndarray::ArrayViewD::from_shape_ptr(shape, data.as_ptr()) })
-    }
-
-    fn view1<T: Datum>(&self) -> Result<ndarray::ArrayView1<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
-    fn view2<T: Datum>(&self) -> Result<ndarray::ArrayView2<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
-    fn view3<T: Datum>(&self) -> Result<ndarray::ArrayView3<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
-    fn view4<T: Datum>(&self) -> Result<ndarray::ArrayView4<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
-    fn view5<T: Datum>(&self) -> Result<ndarray::ArrayView5<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
-    fn view6<T: Datum>(&self) -> Result<ndarray::ArrayView6<'_, T>> {
-        Ok(self.view::<T>()?.into_dimensionality()?)
-    }
-
     fn convert_to(&self, to: DatumType) -> Result<Self>;
 }
 

{tract-0.23.0.dev4 → tract-0.23.0.dev5}/rust-workspace/api/src/macros.rs

@@ -47,36 +47,3 @@ macro_rules! as_fact_impl {
         }
     };
 }
-
-#[macro_export]
-macro_rules! tensor_from_to_ndarray {
-    () => {
-        impl<T, S, D> TryFrom<ndarray::ArrayBase<S, D>> for Tensor
-        where
-            T: $crate::Datum + Clone + 'static,
-            S: RawData<Elem = T> + Data,
-            D: Dimension,
-        {
-            type Error = anyhow::Error;
-            fn try_from(view: ndarray::ArrayBase<S, D>) -> Result<Tensor> {
-                if let Some(slice) = view.as_slice_memory_order()
-                    && (0..view.ndim()).all(|ix| {
-                        view.strides().get(ix + 1).is_none_or(|next| *next <= view.strides()[ix])
-                    })
-                {
-                    Tensor::from_slice(view.shape(), slice)
-                } else {
-                    let slice: Vec<_> = view.iter().cloned().collect();
-                    Tensor::from_slice(view.shape(), &slice)
-                }
-            }
-        }
-
-        impl<'a, T: $crate::Datum> TryFrom<&'a Tensor> for ndarray::ArrayViewD<'a, T> {
-            type Error = anyhow::Error;
-            fn try_from(value: &'a Tensor) -> Result<Self, Self::Error> {
-                value.view()
-            }
-        }
-    };
-}