Skip to content

Remove PyArrayModule #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 30, 2018
Merged

Remove PyArrayModule #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d4a7610
Remove PyArrayModule in favour of PyArrayAPI
kngwyu Sep 29, 2018
e9ab6bd
Return &PyArray instead of PyArray, in all APIs
kngwyu Sep 29, 2018
b174540
Remove PyUFuncModule in favour of PyUFuncModule
kngwyu Sep 29, 2018
149de74
Fix all tests
kngwyu Sep 29, 2018
8f46870
Fix example and README
kngwyu Sep 29, 2018
e874dd2
Add documentation to PY_ARRAY_API
kngwyu Sep 29, 2018
cd82299
Use Once to ensure thread safety of initializing Numpy API
kngwyu Sep 30, 2018
0fa3bd1
Add document about PyArray::to_owned
kngwyu Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ numpy = "0.3"
``` rust
extern crate numpy;
extern crate pyo3;
use numpy::{IntoPyResult, PyArray, PyArrayModule};
use numpy::{IntoPyResult, PyArray, get_array_module};
use pyo3::prelude::{ObjectProtocol, PyDict, PyResult, Python};

fn main() -> Result<(), ()> {
Expand All @@ -59,9 +59,9 @@ fn main() -> Result<(), ()> {
}

fn main_<'py>(py: Python<'py>) -> PyResult<()> {
let np = PyArrayModule::import(py)?;
let np = get_array_module(py)?;
let dict = PyDict::new(py);
dict.set_item("np", np.as_pymodule())?;
dict.set_item("np", np)?;
let pyarray: &PyArray<i32> = py
.eval("np.array([1, 2, 3], dtype='int32')", Some(&dict), None)?
.extract()?;
Expand Down Expand Up @@ -95,16 +95,11 @@ extern crate numpy;
extern crate pyo3;

use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
use numpy::{IntoPyArray, IntoPyResult, PyArray, PyArrayModule};
use numpy::{IntoPyArray, IntoPyResult, PyArray};
use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};

#[pymodinit]
fn rust_ext(py: Python, m: &PyModule) -> PyResult<()> {
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// You **must** write this statement for the PyArray type checker to work correctly
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
let _np = PyArrayModule::import(py)?;

fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
// immutable example
fn axpy(a: f64, x: ArrayViewD<f64>, y: ArrayViewD<f64>) -> ArrayD<f64> {
a * &x + &y
Expand All @@ -118,10 +113,9 @@ fn rust_ext(py: Python, m: &PyModule) -> PyResult<()> {
// wrapper of `axpy`
#[pyfn(m, "axpy")]
fn axpy_py(py: Python, a: f64, x: &PyArray<f64>, y: &PyArray<f64>) -> PyResult<PyArray<f64>> {
let np = PyArrayModule::import(py)?;
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, &np))
Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
}

// wrapper of `mult`
Expand All @@ -143,6 +137,12 @@ We need your feedback. Don't hesitate to open [issues](https://github.com/termos

Version
--------
- v0.4.0(Coming soon)
- Duplicate `PyArrayModule` and import Numpy API automatically

- v0.3.1, v0.3.2
- Just update dependencies

- v0.3.0
- Breaking Change: Migrated to pyo3 from rust-cpython
- Some api addition
Expand Down
12 changes: 3 additions & 9 deletions example/extensions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@ extern crate numpy;
extern crate pyo3;

use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
use numpy::{IntoPyArray, IntoPyResult, PyArray, PyArrayModule};
use numpy::{IntoPyArray, IntoPyResult, PyArray};
use pyo3::prelude::{pymodinit, PyModule, PyResult, Python};

#[pymodinit]
fn rust_ext(py: Python, m: &PyModule) -> PyResult<()> {
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// You **must** write this statement for the PyArray type checker to work correctly
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
let _np = PyArrayModule::import(py)?;

fn rust_ext(_py: Python, m: &PyModule) -> PyResult<()> {
// immutable example
fn axpy(a: f64, x: ArrayViewD<f64>, y: ArrayViewD<f64>) -> ArrayD<f64> {
a * &x + &y
Expand All @@ -26,10 +21,9 @@ fn rust_ext(py: Python, m: &PyModule) -> PyResult<()> {
// wrapper of `axpy`
#[pyfn(m, "axpy")]
fn axpy_py(py: Python, a: f64, x: &PyArray<f64>, y: &PyArray<f64>) -> PyResult<PyArray<f64>> {
let np = PyArrayModule::import(py)?;
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, &np))
Ok(axpy(a, x, y).into_pyarray(py).to_owned(py))
}

// wrapper of `mult`
Expand Down
Loading