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

np.where conversion to IfExp #59

Merged
merged 1 commit into from
Jun 4, 2024
Merged

np.where conversion to IfExp #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 20 additions & 5 deletions sharrow/aster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,12 +939,12 @@ def visit_Call(self, node):
):
if len(node.args) == 2 and len(node.keywords) == 0:
try:
return self._replacement(
result = self._replacement(
ast_String_value(node.args[0]), node.func.value.ctx, node
)
except KeyError:
if self.get_default:
return self.visit(node.args[1])
result = self.visit(node.args[1])
else:
raise
if (
Expand All @@ -953,19 +953,34 @@ def visit_Call(self, node):
and "default" == node.keywords[0].arg
):
try:
return self._replacement(
result = self._replacement(
ast_String_value(node.args[0]), node.func.value.ctx, node
)
except KeyError:
if self.get_default:
return self.visit(node.keywords[0].value)
result = self.visit(node.keywords[0].value)
else:
raise
if len(node.args) == 1 and len(node.keywords) == 0:
return self._replacement(
result = self._replacement(
ast_String_value(node.args[0]), node.func.value.ctx, node
)

# change np.where(x, y, z) to (y if x else z), for performance reasons
if (
isinstance(node.func, ast.Attribute)
and node.func.attr == "where"
and isinstance(node.func.value, ast.Name)
and (node.func.value.id == "np" or node.func.value.id == "numpy")
and len(node.args) == 3
):
if len(node.args) == 3 and len(node.keywords) == 0:
result = ast.IfExp(
test=self.visit(node.args[0]),
body=self.visit(node.args[1]),
orelse=self.visit(node.args[2]),
)

# if no other changes
if result is None:
args = [self.visit(i) for i in node.args]
Expand Down