Skip to content

Commit 1692669

Browse files
IcxoluIcxolu
committed
reintroduce names with _bound suffix
1 parent 67d3b9b commit 1692669

File tree

22 files changed

+575
-371
lines changed

22 files changed

+575
-371
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn rust_ext<'py>(_py: Python<'py>, m: &Bound<'py, PyModule>) -> PyResult<()> {
7171
let x = x.as_array();
7272
let y = y.as_array();
7373
let z = axpy(a, x, y);
74-
z.into_pyarray_bound(py)
74+
z.into_pyarray(py)
7575
}
7676

7777
// wrapper of `mult`
@@ -103,11 +103,11 @@ use pyo3::{types::{IntoPyDict, PyAnyMethods}, PyResult, Python};
103103

104104
fn main() -> PyResult<()> {
105105
Python::with_gil(|py| {
106-
let np = py.import_bound("numpy")?;
107-
let locals = [("np", np)].into_py_dict_bound(py);
106+
let np = py.import("numpy")?;
107+
let locals = [("np", np)].into_py_dict(py)?;
108108

109109
let pyarray = py
110-
.eval_bound("np.absolute(np.array([-1, -2, -3], dtype='int32'))", Some(&locals), None)?
110+
.eval("np.absolute(np.array([-1, -2, -3], dtype='int32'))", Some(&locals), None)?
111111
.downcast_into::<PyArray1<i32>>()?;
112112

113113
let readonly = pyarray.readonly();

‎benches/array.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use pyo3::{types::PyAnyMethods, Bound, Python, ToPyObject};
1111
#[bench]
1212
fn extract_success(bencher: &mut Bencher) {
1313
Python::with_gil(|py| {
14-
let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
14+
let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
1515

1616
bencher.iter(|| {
1717
black_box(&any)
@@ -24,7 +24,7 @@ fn extract_success(bencher: &mut Bencher) {
2424
#[bench]
2525
fn extract_failure(bencher: &mut Bencher) {
2626
Python::with_gil(|py| {
27-
let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
27+
let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
2828

2929
bencher.iter(|| {
3030
black_box(&any)
@@ -37,7 +37,7 @@ fn extract_failure(bencher: &mut Bencher) {
3737
#[bench]
3838
fn downcast_success(bencher: &mut Bencher) {
3939
Python::with_gil(|py| {
40-
let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
40+
let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
4141

4242
bencher.iter(|| black_box(&any).downcast::<PyArray2<f64>>().unwrap());
4343
});
@@ -46,7 +46,7 @@ fn downcast_success(bencher: &mut Bencher) {
4646
#[bench]
4747
fn downcast_failure(bencher: &mut Bencher) {
4848
Python::with_gil(|py| {
49-
let any = PyArray2::<f64>::zeros_bound(py, (10, 10), false).into_any();
49+
let any = PyArray2::<f64>::zeros(py, (10, 10), false).into_any();
5050

5151
bencher.iter(|| black_box(&any).downcast::<PyArray2<f64>>().unwrap_err());
5252
});
@@ -67,7 +67,7 @@ fn from_iter(bencher: &mut Bencher, size: usize) {
6767
bencher.iter(|| {
6868
let iter = black_box(Iter(0..size));
6969

70-
PyArray1::from_iter_bound(py, iter)
70+
PyArray1::from_iter(py, iter)
7171
});
7272
});
7373
}
@@ -94,7 +94,7 @@ fn from_slice(bencher: &mut Bencher, size: usize) {
9494
bencher.iter(|| {
9595
let slice = black_box(&vec);
9696

97-
PyArray1::from_slice_bound(py, slice)
97+
PyArray1::from_slice(py, slice)
9898
});
9999
});
100100
}
@@ -121,7 +121,7 @@ fn from_object_slice(bencher: &mut Bencher, size: usize) {
121121
bencher.iter(|| {
122122
let slice = black_box(&vec);
123123

124-
PyArray1::from_slice_bound(py, slice)
124+
PyArray1::from_slice(py, slice)
125125
});
126126
});
127127
}
@@ -148,7 +148,7 @@ fn from_vec2(bencher: &mut Bencher, size: usize) {
148148
bencher.iter(|| {
149149
let vec2 = black_box(&vec2);
150150

151-
PyArray2::from_vec2_bound(py, vec2).unwrap()
151+
PyArray2::from_vec2(py, vec2).unwrap()
152152
});
153153
});
154154
}
@@ -175,7 +175,7 @@ fn from_vec3(bencher: &mut Bencher, size: usize) {
175175
bencher.iter(|| {
176176
let vec3 = black_box(&vec3);
177177

178-
PyArray3::from_vec3_bound(py, vec3).unwrap()
178+
PyArray3::from_vec3(py, vec3).unwrap()
179179
});
180180
});
181181
}

‎benches/borrow.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use pyo3::Python;
99
#[bench]
1010
fn initial_shared_borrow(bencher: &mut Bencher) {
1111
Python::with_gil(|py| {
12-
let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
12+
let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
1313

1414
bencher.iter(|| {
1515
let array = black_box(&array);
@@ -22,7 +22,7 @@ fn initial_shared_borrow(bencher: &mut Bencher) {
2222
#[bench]
2323
fn additional_shared_borrow(bencher: &mut Bencher) {
2424
Python::with_gil(|py| {
25-
let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
25+
let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
2626

2727
let _shared = (0..128).map(|_| array.readonly()).collect::<Vec<_>>();
2828

@@ -37,7 +37,7 @@ fn additional_shared_borrow(bencher: &mut Bencher) {
3737
#[bench]
3838
fn exclusive_borrow(bencher: &mut Bencher) {
3939
Python::with_gil(|py| {
40-
let array = PyArray::<f64, _>::zeros_bound(py, (6, 5, 4, 3, 2, 1), false);
40+
let array = PyArray::<f64, _>::zeros(py, (6, 5, 4, 3, 2, 1), false);
4141

4242
bencher.iter(|| {
4343
let array = black_box(&array);

‎examples/linalg/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn rust_linalg<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
1313
let y = x
1414
.inv()
1515
.map_err(|e| PyRuntimeError::new_err(e.to_string()))?;
16-
Ok(y.into_pyarray_bound(py))
16+
Ok(y.into_pyarray(py))
1717
}
1818
Ok(())
1919
}

‎examples/parallel/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn rust_parallel<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
1616
let x = x.as_array();
1717
let y = y.as_array();
1818
let z = Zip::from(x.rows()).par_map_collect(|row| row.dot(&y));
19-
z.into_pyarray_bound(py)
19+
z.into_pyarray(py)
2020
}
2121
Ok(())
2222
}

‎examples/simple/src/lib.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn rust_ext<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
6464
let x = x.as_array();
6565
let y = y.as_array();
6666
let z = axpy(a, x, y);
67-
z.into_pyarray_bound(py)
67+
z.into_pyarray(py)
6868
}
6969

7070
// wrapper of `mult`
@@ -82,7 +82,7 @@ fn rust_ext<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
8282
py: Python<'py>,
8383
x: PyReadonlyArrayDyn<'py, Complex64>,
8484
) -> Bound<'py, PyArrayDyn<Complex64>> {
85-
conj(x.as_array()).into_pyarray_bound(py)
85+
conj(x.as_array()).into_pyarray(py)
8686
}
8787

8888
// example of how to extract an array from a dictionary
@@ -131,21 +131,21 @@ fn rust_ext<'py>(m: &Bound<'py, PyModule>) -> PyResult<()> {
131131
x.readonly().as_array(),
132132
y.readonly().as_array(),
133133
)
134-
.into_pyarray_bound(x.py())
134+
.into_pyarray(x.py())
135135
.into_any()),
136136
(SupportedArray::I64(x), SupportedArray::I64(y)) => Ok(generic_add(
137137
x.readonly().as_array(),
138138
y.readonly().as_array(),
139139
)
140-
.into_pyarray_bound(x.py())
140+
.into_pyarray(x.py())
141141
.into_any()),
142142
(SupportedArray::F64(x), SupportedArray::I64(y))
143143
| (SupportedArray::I64(y), SupportedArray::F64(x)) => {
144144
let y = y.cast::<f64>(false)?;
145145

146146
Ok(
147147
generic_add(x.readonly().as_array(), y.readonly().as_array())
148-
.into_pyarray_bound(x.py())
148+
.into_pyarray(x.py())
149149
.into_any(),
150150
)
151151
}

0 commit comments

Comments
 (0)