fixing putmask logic for scalar inputs #980
Merged
Conversation
This file contains hidden or 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
ipdemes
added
the
category:bug-fix
shriram-jagan
approved these changes
Jul 1, 2023
Contributor
shriram-jagan
left a comment
shriram-jagan
left a comment
There was a problem hiding this comment.
LGTM! I can confirm that this fixes my use case. You could also optionally use auto dim = std::max(1, args.in.dim()); like in ScalarUnaryRedDispatch to be consistent.
tests/integration/test_putmask.py
Outdated
| x = num.random.rand(3, 3) | ||
| s = x.sum() | ||
| num.putmask(s, True, 1.0) | ||
| print("IRINA DEBUG DDD", s) |
Contributor
There was a problem hiding this comment.
The print statement somehow made it in....
manopapad
approved these changes
Jul 1, 2023
magnatelee
reviewed
Jul 6, 2023
cunumeric/array.py
Outdated
| else: | ||
| array_types.append(array.dtype) | ||
| return np.find_common_type(array_types, scalar_types) # type: ignore | ||
| return np.find_common_type(array_types, scalar_types) |
Contributor
There was a problem hiding this comment.
I'd make sure this change doesn't make mypy unhappy.
Contributor
Author
There was a problem hiding this comment.
Yes, mypy was complaining about this type: ignore so I removed it
Contributor
Author
There was a problem hiding this comment.
Ha, mypy in CI complaining now. I will put it back
magnatelee
reviewed
Jul 6, 2023
| auto& inputs = context.inputs(); | ||
| PutmaskArgs args{context.outputs()[0], inputs[1], inputs[2]}; | ||
| double_dispatch(args.input.dim(), args.input.code(), PutmaskImpl<KIND>{}, args); | ||
| int dim = args.input.dim() == 0 ? 1 : args.input.dim(); |
Contributor
There was a problem hiding this comment.
Suggested change
| int dim = args.input.dim() == 0 ? 1 : args.input.dim(); | |
| int dim = std::max(1, args.input.dim()); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.