Merge pull request #68 from kngwyu/to-pyarray

Fix memory leak

Author: kngwyu

Cargo.toml

@@ -13,5 +13,6 @@ license-file = "LICENSE"
 cfg-if = "0.1.5"
 libc = "0.2"
 num-complex = "0.2"
+num-traits = "0.2.6"
 ndarray = "0.12"
 pyo3 = "0.4.1"

README.md

@@ -82,7 +82,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 numpy = "0.3"
-ndarray = "0.11"
+ndarray = "0.12"
 
 [dependencies.pyo3]
 version = "^0.4.1"
@@ -95,7 +95,7 @@ extern crate numpy;
 extern crate pyo3;
 
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
-use numpy::{IntoPyArray, IntoPyResult, PyArray};
+use numpy::{IntoPyResult, PyArray, ToPyArray};
 use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};
 
 #[pymodinit]
@@ -115,7 +115,7 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
     fn axpy_py(py: Python, a: f64, x: &PyArray<f64>, y: &PyArray<f64>) -> PyResult<PyArray<f64>> {
         let x = x.as_array().into_pyresult("x must be f64 array")?;
         let y = y.as_array().into_pyresult("y must be f64 array")?;
-        Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
+        Ok(axpy(a, x, y).to_pyarray(py).to_owned(py))
     }
 
     // wrapper of `mult`

example/extensions/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 numpy = { path = "../.." }
-ndarray = ">= 0.11"
+ndarray = "0.12"
 
 [dependencies.pyo3]
 version = "0.4.1"

example/extensions/src/lib.rs

@@ -3,7 +3,7 @@ extern crate numpy;
 extern crate pyo3;
 
 use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
-use numpy::{IntoPyArray, IntoPyResult, PyArray};
+use numpy::{IntoPyResult, PyArray, ToPyArray};
 use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};
 
 #[pymodinit]
@@ -23,7 +23,7 @@ fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
     fn axpy_py(py: Python, a: f64, x: &PyArray<f64>, y: &PyArray<f64>) -> PyResult<PyArray<f64>> {
         let x = x.as_array().into_pyresult("x must be f64 array")?;
         let y = y.as_array().into_pyresult("y must be f64 array")?;
-        Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
+        Ok(axpy(a, x, y).to_pyarray(py).to_owned(py))
     }
 
     // wrapper of `mult`