Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
64 changes: 64 additions & 0 deletions pytensor/link/numba/dispatch/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from pytensor.tensor.math import Dot
from pytensor.tensor.shape import Reshape, Shape, Shape_i, SpecifyShape
from pytensor.tensor.slinalg import Solve
from pytensor.tensor.sort import ArgSortOp, SortOp
from pytensor.tensor.type import TensorType
from pytensor.tensor.type_other import MakeSlice, NoneConst

Expand Down Expand Up @@ -432,6 +433,69 @@ def shape_i(x):
return shape_i


@numba_funcify.register(SortOp)
def numba_funcify_SortOp(op, node, **kwargs):
@numba_njit
def sort_f(a, axis):
axis = axis.item()

a_swapped = np.swapaxes(a, axis, -1)
a_sorted = np.sort(a_swapped)
a_sorted_swapped = np.swapaxes(a_sorted, -1, axis)

return a_sorted_swapped

if op.kind != "quicksort":
warnings.warn(
(
f'Numba function sort doesn\'t support kind="{op.kind}"'
" switching to `quicksort`."
),
UserWarning,
)

return sort_f


@numba_funcify.register(ArgSortOp)
def numba_funcify_ArgSortOp(op, node, **kwargs):
def argsort_f_kind(kind):
@numba_njit
def argort_vec(X, axis):
axis = axis.item()

Y = np.swapaxes(X, axis, 0)
result = np.empty_like(Y)

indices = list(np.ndindex(Y.shape[1:]))

for idx in indices:
result[(slice(None), *idx)] = np.argsort(
Y[(slice(None), *idx)], kind=kind
)

result = np.swapaxes(result, 0, axis)

return result

return argort_vec

kind = op.kind

if kind in ["quicksort", "mergesort"]:
return argsort_f_kind(kind)
else:
warnings.warn(
(
f'Numba function argsort doesn\'t support kind="{op.kind}"'
" switching to `quicksort`."
),
UserWarning,
)

return argsort_f_kind("quicksort")


@numba.extending.intrinsic
def direct_cast(typingctx, val, typ):
if isinstance(typ, numba.types.TypeRef):
Expand Down
65 changes: 65 additions & 0 deletions tests/link/numba/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from pytensor.tensor import blas
from pytensor.tensor.elemwise import Elemwise
from pytensor.tensor.shape import Reshape, Shape, Shape_i, SpecifyShape
from pytensor.tensor.sort import ArgSortOp, SortOp


if TYPE_CHECKING:
Expand Down Expand Up @@ -378,6 +379,70 @@ def test_Shape(x, i):
compare_numba_and_py([], [g], [])


@pytest.mark.parametrize(
"x, axis, kind, exc",
[
[[3, 2, 1], None, "quicksort", None],
[[], None, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], None, "quicksort", None],
[[3, 2, 1], None, "mergesort", UserWarning],
[[3, 2, 1], None, "heapsort", UserWarning],
[[3, 2, 1], None, "stable", UserWarning],
[[[3, 2, 1], [5, 6, 7]], 0, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], 1, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], -1, "quicksort", None],
[[3, 2, 1], 0, "quicksort", None],
[np.random.randint(0, 100, (40, 40, 40, 40)), 3, "quicksort", None],
[[3, 2, 1], -5, "quicksort", np.exceptions.AxisError],
],
)
def test_Sort(x, axis, kind, exc):
if axis:
g = SortOp(kind)(pt.as_tensor_variable(x), axis)
else:
g = SortOp(kind)(pt.as_tensor_variable(x))

cm = (
contextlib.suppress()
if not exc
else pytest.warns(exc)
if isinstance(exc, Warning)
else pytest.raises(exc)
)

with cm:
compare_numba_and_py([], [g], [])


@pytest.mark.parametrize(
"x, axis, kind, exc",
[
[[3, 2, 1], None, "quicksort", None],
[[], None, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], None, "quicksort", None],
[[3, 2, 1], None, "heapsort", UserWarning],
[[3, 2, 1], None, "stable", UserWarning],
[[[3, 2, 1], [5, 6, 7]], 0, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], None, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], 1, "quicksort", None],
[[[3, 2, 1], [5, 6, 7]], -1, "quicksort", None],
[[3, 2, 1], 0, "quicksort", None],
[np.random.randint(0, 10, (3, 2, 3)), 1, "quicksort", None],
[np.random.randint(0, 10, (3, 2, 3, 4, 4)), 2, "quicksort", None],
],
)
def test_ArgSort(x, axis, kind, exc):
if axis:
g = ArgSortOp(kind)(pt.as_tensor_variable(x), axis)
else:
g = ArgSortOp(kind)(pt.as_tensor_variable(x))

cm = contextlib.suppress() if not exc else pytest.warns(exc)

with cm:
compare_numba_and_py([], [g], [])


@pytest.mark.parametrize(
"v, shape, ndim",
[
Expand Down