Skip to content

Fix CI, update filter._evaluate arg order. #1055

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

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Fix CI, update filter._evaluate arg order. #1055

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
10 changes: 5 additions & 5 deletions src/aspire/operators/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def scale(self, c=1):
"""
return ScaledFilter(self, c)

def evaluate_grid(self, L, dtype=np.float32, *args, **kwargs):
def evaluate_grid(self, L, *args, dtype=np.float32, **kwargs):
"""
Generates a two dimensional grid with prescribed dtype,
yielding the values (omega) which are then evaluated by
Expand Down Expand Up @@ -191,15 +191,15 @@ def __init__(self, filter, power=1):
def _evaluate(self, omega):
return self._filter.evaluate(omega) ** self._power

def evaluate_grid(self, L, dtype=np.float32, *args, **kwargs):
def evaluate_grid(self, L, *args, dtype=np.float32, **kwargs):
"""
Calls the provided filter's evaluate_grid method in case there is an optimization.

If no optimized method is provided, falls back to base `evaluate_grid`.

See `Filter.evaluate_grid` for usage.
"""
filter_vals = self._filter.evaluate_grid(L, dtype=dtype, *args, **kwargs)
filter_vals = self._filter.evaluate_grid(L, *args, dtype=dtype, **kwargs)

# Place safeguard on values below machine epsilon for negative powers.
if self._power < 0:
Expand Down Expand Up @@ -338,7 +338,7 @@ def _evaluate(self, omega):

return result

def evaluate_grid(self, L, dtype=np.float32, *args, **kwargs):
def evaluate_grid(self, L, *args, dtype=np.float32, **kwargs):
"""
Optimized evaluate_grid method for ArrayFilter.

Expand All @@ -361,7 +361,7 @@ def evaluate_grid(self, L, dtype=np.float32, *args, **kwargs):
res = self.xfer_fn_array
else:
# Otherwise call parent code to generate a grid then evaluate.
res = super().evaluate_grid(L, dtype=dtype, *args, **kwargs)
res = super().evaluate_grid(L, *args, dtype=dtype, **kwargs)
return res


Expand Down