Fix concatenate and *stack APIs to support scalars(#818, #839) #866
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
robinwnv
added
the
category:bug-fix
robinwnv
changed the title
manopapad
requested changes
Mar 30, 2023
cunumeric/module.py
Outdated
| @@ -1805,7 +1805,11 @@ def concatenate( | |||
|
|
|||
| # flatten arrays if axis == None and concatenate arrays on the first axis | |||
| if axis is None: | |||
| inputs = list(inp.ravel() for inp in inputs) | |||
| # Reshape arrays in the `array_list` to handle scalars | |||
| reshaped = _atleast_nd(1, tuple(inputs)) | |||
There was a problem hiding this comment.
I don't think you need to call tuple(inputs), you could just do _atleast_nd(1, inputs), and similar in other places in this PR where you call _atleast_nd(1, tuple(tup)). You may need to extend the type signature of _atleast_nd to take ndim: int, arys: Sequence[ndarray, ...].
cunumeric/module.py
Outdated
Comment on lines
1878
to
1880
| # handle scalar inputs | ||
| if type(common_info.ndim) is not int: | ||
| common_info.ndim = 0 |
There was a problem hiding this comment.
I don't think is necessary. The check_shape_dtype_without_axis always returns an int for ndim as far as I can tell, and if I comment out this code and run with scalars, this works fine:
arrays = (0, 4)
print(cn.stack(arrays))
There was a problem hiding this comment.
I agree. Fixed. Thanks.
manopapad
approved these changes
Mar 30, 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.
normalize_axis_indexfor scalar inputs