Use IntoPyArray in example

Author: kngwyu

README.md

@@ -95,7 +95,7 @@ extern crate numpy;
 extern crate pyo3;
 
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
-use numpy::{IntoPyResult, PyArrayDyn, ToPyArray};
+use numpy::{IntoPyArray, IntoPyResult, PyArrayDyn};
 use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};
 
 #[pymodinit]
@@ -122,7 +122,7 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
         let x = x.as_array()?;
         // you can also specify your error context, via closure
         let y = y.as_array().into_pyresult_with(|| "y must be f64 array")?;
-        Ok(axpy(a, x, y).to_pyarray(py).to_owned(py))
+        Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
     }
 
     // wrapper of `mult`
@@ -135,7 +135,6 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
 
     Ok(())
 }
-
 ```
 
 Contribution

example/extensions/src/lib.rs

@@ -3,7 +3,7 @@ extern crate numpy;
 extern crate pyo3;
 
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
-use numpy::{IntoPyArray, IntoPyResult, PyArray1, PyArrayDyn, ToPyArray};
+use numpy::{IntoPyArray, IntoPyResult, PyArrayDyn};
 use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};
 
 #[pymodinit]
@@ -30,7 +30,7 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
         let x = x.as_array()?;
         // you can also specify your error context, via closure
         let y = y.as_array().into_pyresult_with(|| "y must be f64 array")?;
-        Ok(axpy(a, x, y).to_pyarray(py).to_owned(py))
+        Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
     }
 
     // wrapper of `mult`
@@ -41,15 +41,5 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
         Ok(())
     }
 
-    #[pyfn(m, "get_vec")]
-    fn get_vec(py: Python, size: usize) -> PyResult<&PyArray1<f32>> {
-        Ok(vec![0.0; size].into_pyarray(py))
-    }
-    // use numpy::slice_box::SliceBox;
-    // #[pyfn(m, "get_slice")]
-    // fn get_slice(py: Python, size: usize) -> PyResult<SliceBox<f32>> {
-    //     let sbox = numpy::slice_box::SliceBox::new(vec![0.0; size].into_boxed_slice());
-    //     Ok(sbox)
-    // }
     Ok(())
 }

example/tests/test_ext.py

@@ -1,7 +1,8 @@
 import numpy as np
-from rust_ext import axpy, mult, get_vec
+from rust_ext import axpy, mult
 import unittest
 
+
 class TestExt(unittest.TestCase):
     """Test class for rust functions
     """
@@ -11,18 +12,16 @@ def test_axpy(self):
         y = np.array([3.0, 3.0, 3.0])
         z = axpy(3.0, x, y)
         np.testing.assert_array_almost_equal(z, np.array([6.0, 9.0, 12.0]))
+        x = np.array([*x, 4.0])
+        y = np.array([*y, 3.0])
+        z = axpy(3.0, x, y)
+        np.testing.assert_array_almost_equal(z, np.array([6.0, 9.0, 12.0, 15.0]))
 
     def test_mult(self):
         x = np.array([1.0, 2.0, 3.0])
         mult(3.0, x)
         np.testing.assert_array_almost_equal(x, np.array([3.0, 6.0, 9.0]))
 
-    def test_into_pyarray(self):
-        x = get_vec(1000)
-        np.testing.assert_array_almost_equal(x, np.zeros(1000))
-
 
 if __name__ == "__main__":
     unittest.main()
-
-