Resolve #468 #470
Merged
Resolve #468 #470
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #470 +/- ##
==========================================
- Coverage 94.60% 94.57% -0.03%
==========================================
Files 90 90
Lines 5578 5585 +7
==========================================
+ Hits 5277 5282 +5
- Misses 301 303 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Michael-T-McCann
requested changes
Nov 15, 2023
scico/functional/_functional.py
Outdated
| @@ -38,15 +43,15 @@ def __init__(self): | |||
| def __repr__(self): | |||
| return f"""{type(self)} (has_eval = {self.has_eval}, has_prox = {self.has_prox})""" | |||
|
|
|||
| def __mul__(self, other): | |||
| def __mul__(self, other: Union[float, int]) -> ScaledFunctional: | |||
| if snp.isscalar(other) or isinstance(other, jax.core.Tracer): | |||
There was a problem hiding this comment.
(1) I suggest snp.util.is_scalar_equiv here, remember snp.isscalar(jnp.sum(1.0)) == False
(2) I suggest removing the jax.core.Tracer check. That would return true for traced arrays as well as scalars, which seems wrong. And snp.util.is_scalar_equiv should be true for scalar tracers (if not, let's fix it)
There was a problem hiding this comment.
Good point. Done.
Michael-T-McCann
approved these changes
Nov 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve #468.
Also:
ScaledFunctional, so that e.g.5.0 * (2.0 * functional.L2Norm())is aScaledFunctionalwith a scale of 10 of anL2Normrather than aScaledFunctionalwith a scale of 5 of aScaledFunctional.CHANGES.rst.