Update numpy-linalg-example with maturin and poetry

Author: kngwyu

examples/linalg/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "numpy-linalg-example"
 version = "0.1.0"
-authors = ["kngwyu <[email protected]>"]
+authors = ["Yuji Kanagawa <[email protected]>"]
 edition = "2018"
 
 [lib]
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 numpy = { path = "../.." }
 ndarray = ">= 0.13"
-ndarray-linalg = { version = "0.12", features = ["openblas"] }
+ndarray-linalg = { version = "0.12.1", features = ["openblas-static"] }
 
 [dependencies.pyo3]
 version = "0.12"

examples/linalg/poetry.lock

@@ -0,0 +1,15 @@
+[build-system]
+build-backend = "maturin"
+
+[tool.poetry]
+name = "numpy-linalg-example"
+version = "0.1.0"
+description = "rust-numpy example with ndarray-linalg"
+authors = ["Yuji Kanagawa <[email protected]>"]
+
+[tool.poetry.dependencies]
+numpy = ">=1.18"
+python = ">=3.6"
+
+[tool.poetry.dev-dependencies]
+pytest = "^6.1"

examples/linalg/pyproject.toml

@@ -1,20 +1,17 @@
-#![deny(rust_2018_idioms)]
 use ndarray_linalg::solve::Inverse;
-use numpy::{IntoPyArray, PyArray2};
-use pyo3::exceptions::RuntimeError;
-use pyo3::prelude::{pymodule, Py, PyErr, PyModule, PyResult, Python};
-use std::fmt::Display;
-
-fn make_error<E: Display + Sized>(e: E) -> PyErr {
-    PyErr::new::<RuntimeError, _>(format!("[rust_linalg] {}", e))
-}
+use numpy::{IntoPyArray, PyArray2, PyReadonlyArray2};
+use pyo3::exceptions::PyRuntimeError;
+use pyo3::prelude::{pymodule, PyErr, PyModule, PyResult, Python};
 
 #[pymodule]
 fn rust_linalg(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
     #[pyfn(m, "inv")]
-    fn inv(py: Python<'_>, x: &PyArray2<f64>) -> PyResult<Py<PyArray2<f64>>> {
-        let x = x.as_array().inv().map_err(make_error)?;
-        Ok(x.into_pyarray(py).to_owned())
+    fn inv<'py>(py: Python<'py>, x: PyReadonlyArray2<'py, f64>) -> PyResult<&'py PyArray2<f64>> {
+        let x = x
+            .as_array()
+            .inv()
+            .map_err(|e| PyErr::new::<PyRuntimeError, _>(format!("[rust_linalg] {}", e)))?;
+        Ok(x.into_pyarray(py))
     }
     Ok(())
 }