Update sum_products

Author: bschoenmaeckers

src/lib.rs

@@ -117,7 +117,7 @@ pub use crate::dtype::{
 pub use crate::error::{BorrowError, FromVecError, NotContiguousError};
 pub use crate::npyffi::{PY_ARRAY_API, PY_UFUNC_API};
 pub use crate::strings::{PyFixedString, PyFixedUnicode};
-#[allow(deprecated)]
+#[cfg(feature = "gil-refs")]
 pub use crate::sum_products::{dot, einsum, inner};
 pub use crate::sum_products::{dot_bound, einsum_bound, inner_bound};
 pub use crate::untyped_array::{PyUntypedArray, PyUntypedArrayMethods};

src/sum_products.rs

@@ -4,7 +4,9 @@ use std::ptr::null_mut;
 
 use ndarray::{Dimension, IxDyn};
 use pyo3::types::PyAnyMethods;
-use pyo3::{Borrowed, Bound, FromPyObject, PyNativeType, PyResult};
+#[cfg(feature = "gil-refs")]
+use pyo3::PyNativeType;
+use pyo3::{Borrowed, Bound, FromPyObject, PyResult};
 
 use crate::array::PyArray;
 use crate::dtype::Element;
@@ -13,6 +15,7 @@ use crate::npyffi::{array::PY_ARRAY_API, NPY_CASTING, NPY_ORDER};
 /// Return value of a function that can yield either an array or a scalar.
 pub trait ArrayOrScalar<'py, T>: FromPyObject<'py> {}
 
+#[cfg(feature = "gil-refs")]
 impl<'py, T, D> ArrayOrScalar<'py, T> for &'py PyArray<T, D>
 where
     T: Element,
@@ -30,10 +33,7 @@ where
 impl<'py, T> ArrayOrScalar<'py, T> for T where T: Element + FromPyObject<'py> {}
 
 /// Deprecated form of [`inner_bound`]
-#[deprecated(
-    since = "0.21.0",
-    note = "will be replaced by `inner_bound` in the future"
-)]
+#[cfg(feature = "gil-refs")]
 pub fn inner<'py, T, DIN1, DIN2, OUT>(
     array1: &'py PyArray<T, DIN1>,
     array2: &'py PyArray<T, DIN2>,
@@ -100,10 +100,7 @@ where
 }
 
 /// Deprecated form of [`dot_bound`]
-#[deprecated(
-    since = "0.21.0",
-    note = "will be replaced by `dot_bound` in the future"
-)]
+#[cfg(feature = "gil-refs")]
 pub fn dot<'py, T, DIN1, DIN2, OUT>(
     array1: &'py PyArray<T, DIN1>,
     array2: &'py PyArray<T, DIN2>,
@@ -176,10 +173,7 @@ where
 }
 
 /// Deprecated form of [`einsum_bound`]
-#[deprecated(
-    since = "0.21.0",
-    note = "will be replaced by `einsum_bound` in the future"
-)]
+#[cfg(feature = "gil-refs")]
 pub fn einsum<'py, T, OUT>(subscripts: &str, arrays: &[&'py PyArray<T, IxDyn>]) -> PyResult<OUT>
 where
     T: Element,
@@ -226,10 +220,7 @@ where
 }
 
 /// Deprecated form of [`einsum_bound!`][crate::einsum_bound!]
-#[deprecated(
-    since = "0.21.0",
-    note = "will be replaced by `einsum_bound!` in the future"
-)]
+#[cfg(feature = "gil-refs")]
 #[macro_export]
 macro_rules! einsum {
     ($subscripts:literal $(,$array:ident)+ $(,)*) => {{