Skip to content
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

Jump to bottom

Cleanup Max and Argmax #901

Merged
merged 4 commits into from
Jul 8, 2024
Merged

Cleanup Max and Argmax #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7d248d
Simplify makeKeepdDims
ricardoV94 Jul 8, 2024
d00ce00
Move argmax helper close to class definition
ricardoV94 Jul 8, 2024
385a727
Cleanup Max and Argmax
ricardoV94 Jul 8, 2024
6cb0302
Git rid of new `"output"` uses
ricardoV94 Jul 8, 2024
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
33 changes: 13 additions & 20 deletions pytensor/tensor/elemwise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
float_dtypes,
lvector,
)
from pytensor.tensor.utils import broadcast_static_dim_lengths, import_func_from_string
from pytensor.tensor.utils import (
broadcast_static_dim_lengths,
import_func_from_string,
normalize_reduce_axis,
)
from pytensor.tensor.variable import TensorVariable
from pytensor.utils import uniq

Expand Down Expand Up @@ -1371,7 +1375,6 @@ def _acc_dtype(self, idtype):

def make_node(self, input):
input = as_tensor_variable(input)
inp_dims = input.type.ndim
inp_dtype = input.type.dtype

# We need to redefine make_node so that, if self.dtype is None,
Expand All @@ -1383,29 +1386,19 @@ def make_node(self, input):
assert dtype is not None
assert acc_dtype is not None

axis = self.axis
axis = normalize_reduce_axis(self.axis, ndim=input.type.ndim)

# scalar inputs are treated as 1D regarding axis in this `Op`
if axis is not None:
try:
axis = normalize_axis_tuple(axis, ndim=max(1, inp_dims))
except np.AxisError:
raise np.AxisError(axis, ndim=inp_dims)
if axis != self.axis or dtype != self.dtype or acc_dtype != self.acc_dtype:
op = self.clone(axis=axis, dtype=dtype, acc_dtype=acc_dtype)
else:
op = self

if axis is None:
out_shape = ()
else:
out_shape = tuple(
s for i, s in enumerate(input.type.shape) if i not in axis
)
else:
out_shape = ()

if (
(axis is not None and any(a < 0 for a in axis))
or dtype != self.dtype
or acc_dtype != self.acc_dtype
):
op = self.clone(axis=axis, dtype=dtype, acc_dtype=acc_dtype)
else:
op = self

output = TensorType(dtype=dtype, shape=out_shape)()

Expand Down
Loading
Loading