luxolus/pyo3
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

make rust benchmarks more similar to the Python ones

Browse source
This commit is contained in:
David Hewitt 2023-01-20 07:24:05 +00:00
parent 16d347d96a
commit 0362855773
2 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pytests/src/pyfunctions.rs
View file

@ -4,43 +4,52 @@ use pyo3::types::{PyDict, PyTuple};
#[pyfunction(signature = ())] #[pyfunction(signature = ())]
fn none() {} fn none() {}
#[pyfunction(signature = (a, b = "bar", *, c = None))] #[pyfunction(signature = (a, b = None, *, c = None))]
fn simple<'a>(a: i32, b: &'a str, c: Option<&'a PyDict>) -> (i32, &'a str, Option<&'a PyDict>) { fn simple<'a>(
a: &'a PyAny,
b: Option<&'a PyAny>,
c: Option<&'a PyAny>,
) -> (&'a PyAny, Option<&'a PyAny>, Option<&'a PyAny>) {
(a, b, c) (a, b, c)
} }
#[pyfunction(signature = (a, b = "bar", *args, c = None))] #[pyfunction(signature = (a, b = None, *args, c = None))]
fn simple_args<'a>( fn simple_args<'a>(
a: i32, a: &'a PyAny,
b: &'a str, b: Option<&'a PyAny>,
args: &'a PyTuple, args: &'a PyTuple,
c: Option<&'a PyDict>, c: Option<&'a PyAny>,
) -> (i32, &'a str, &'a PyTuple, Option<&'a PyDict>) { ) -> (&'a PyAny, Option<&'a PyAny>, &'a PyTuple, Option<&'a PyAny>) {
(a, b, args, c) (a, b, args, c)
} }
#[pyfunction(signature = (a, b = "bar", c = None, **kwargs))] #[pyfunction(signature = (a, b = None, c = None, **kwargs))]
fn simple_kwargs<'a>( fn simple_kwargs<'a>(
a: i32, a: &'a PyAny,
b: &'a str, b: Option<&'a PyAny>,
c: Option<&'a PyDict>, c: Option<&'a PyAny>,
kwargs: Option<&'a PyDict>, kwargs: Option<&'a PyDict>,
) -> (i32, &'a str, Option<&'a PyDict>, Option<&'a PyDict>) { ) -> (
&'a PyAny,
Option<&'a PyAny>,
Option<&'a PyAny>,
Option<&'a PyDict>,
) {
(a, b, c, kwargs) (a, b, c, kwargs)
} }
#[pyfunction(signature = (a, b = "bar", *args, c = None, **kwargs))] #[pyfunction(signature = (a, b = None, *args, c = None, **kwargs))]
fn simple_args_kwargs<'a>( fn simple_args_kwargs<'a>(
a: i32, a: &'a PyAny,
b: &'a str, b: Option<&'a PyAny>,
args: &'a PyTuple, args: &'a PyTuple,
c: Option<&'a PyDict>, c: Option<&'a PyAny>,
kwargs: Option<&'a PyDict>, kwargs: Option<&'a PyDict>,
) -> ( ) -> (
i32, &'a PyAny,
&'a str, Option<&'a PyAny>,
&'a PyTuple, &'a PyTuple,
Option<&'a PyDict>, Option<&'a PyAny>,
Option<&'a PyDict>, Option<&'a PyDict>,
) { ) {
(a, b, args, c, kwargs) (a, b, args, c, kwargs)

26
pytests/tests/test_pyfunctions.py
View file

@ -10,13 +10,12 @@ def test_none_py(benchmark):
def test_none_rs(benchmark): def test_none_rs(benchmark):
rust = pyfunctions.none() rust = benchmark(pyfunctions.none)
py = none_py() py = none_py()
assert rust == py assert rust == py
benchmark(pyfunctions.none)
def simple_py(a, b="bar", *, c=None): def simple_py(a, b=None, *, c=None):
return a, b, c return a, b, c
@ -25,13 +24,12 @@ def test_simple_py(benchmark):
def test_simple_rs(benchmark): def test_simple_rs(benchmark):
rust = pyfunctions.simple(1, "foo", c={1: 2}) rust = benchmark(pyfunctions.simple, 1, "foo", c={1: 2})
py = simple_py(1, "foo", c={1: 2}) py = simple_py(1, "foo", c={1: 2})
assert rust == py assert rust == py
benchmark(pyfunctions.simple, 1, "foo", c={1: 2})
def simple_args_py(a, b="bar", *args, c=None): def simple_args_py(a, b=None, *args, c=None):
return a, b, args, c return a, b, args, c
@ -40,13 +38,12 @@ def test_simple_args_py(benchmark):
def test_simple_args_rs(benchmark): def test_simple_args_rs(benchmark):
rust = pyfunctions.simple_args(1, "foo", 4, 5, 6, c={1: 2}) rust = benchmark(pyfunctions.simple_args, 1, "foo", 4, 5, 6, c={1: 2})
py = simple_args_py(1, "foo", 4, 5, 6, c={1: 2}) py = simple_args_py(1, "foo", 4, 5, 6, c={1: 2})
assert rust == py assert rust == py
benchmark(pyfunctions.simple_args, 1, "foo", 4, 5, 6, c={1: 2})
def simple_kwargs_py(a, b="bar", c=None, **kwargs): def simple_kwargs_py(a, b=None, c=None, **kwargs):
return a, b, c, kwargs return a, b, c, kwargs
@ -55,13 +52,12 @@ def test_simple_kwargs_py(benchmark):
def test_simple_kwargs_rs(benchmark): def test_simple_kwargs_rs(benchmark):
rust = pyfunctions.simple_kwargs(1, "foo", c={1: 2}, bar=4, foo=10) rust = benchmark(pyfunctions.simple_kwargs, 1, "foo", c={1: 2}, bar=4, foo=10)
py = simple_kwargs_py(1, "foo", c={1: 2}, bar=4, foo=10) py = simple_kwargs_py(1, "foo", c={1: 2}, bar=4, foo=10)
assert rust == py assert rust == py
benchmark(pyfunctions.simple_kwargs, 1, "foo", c={1: 2}, bar=4, foo=10)
def simple_args_kwargs_py(a, b="bar", *args, c=None, **kwargs): def simple_args_kwargs_py(a, b=None, *args, c=None, **kwargs):
return (a, b, args, c, kwargs) return (a, b, args, c, kwargs)
@ -70,10 +66,9 @@ def test_simple_args_kwargs_py(benchmark):
def test_simple_args_kwargs_rs(benchmark): def test_simple_args_kwargs_rs(benchmark):
rust = pyfunctions.simple_args_kwargs(1, "foo", "baz", bar=4, foo=10) rust = benchmark(pyfunctions.simple_args_kwargs, 1, "foo", "baz", bar=4, foo=10)
py = simple_args_kwargs_py(1, "foo", "baz", bar=4, foo=10) py = simple_args_kwargs_py(1, "foo", "baz", bar=4, foo=10)
assert rust == py assert rust == py
benchmark(pyfunctions.simple_args_kwargs, 1, "foo", "baz", bar=4, foo=10)
def args_kwargs_py(*args, **kwargs): def args_kwargs_py(*args, **kwargs):
@ -85,7 +80,6 @@ def test_args_kwargs_py(benchmark):
def test_args_kwargs_rs(benchmark): def test_args_kwargs_rs(benchmark):
rust = pyfunctions.args_kwargs(1, "foo", {1: 2}, bar=4, foo=10) rust = benchmark(pyfunctions.args_kwargs, 1, "foo", {1: 2}, bar=4, foo=10)
py = args_kwargs_py(1, "foo", {1: 2}, bar=4, foo=10) py = args_kwargs_py(1, "foo", {1: 2}, bar=4, foo=10)
assert rust == py assert rust == py
benchmark(pyfunctions.args_kwargs, 1, "foo", {1: 2}, a=4, foo=10)