-
Notifications
You must be signed in to change notification settings - Fork 50
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.
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
feat: add scalar support to where
#860
base: main
Are you sure you want to change the base?
Conversation
The rule for scalars should match https://data-apis.org/array-api/latest/API_specification/type_promotion.html#mixing-arrays-with-python-scalars. We should generalize that section to functions, so that we can refer to it in all the function definitions. |
In other words, I think trying to word different conditions for each argument based on whether each other argument is an array or scalar is too wordy and confusing. The rule should be that scalar arguments are implicitly converted into arrays (by the rules stated in the updated version of that particular section). Then we can just talk about each argument as if it were an array. We also need to state that the behavior is undefined when all arguments are scalars. The question is really how much of that needs to be repeated in each function and how much of it we can just write once in some section and refer back to (this is not a straightforward question IMO; a lot of things in the standard are repeated for each function, since that makes it easier to read). |
I've opened a related PR for element-wise functions: #862 |
I agree. I like your suggestion of referring to a central explanation. In particular because I think that most people's intuition about how this will work is 95% correct and for the other 5% you need a lot of words to really explain it. In the case of Maybe the way to do this is a "Notes" section in the doc string that says something like "For the rules on how to handle scalar arguments see link_to_central_place." That central place could be https://data-apis.org/array-api/latest/API_specification/type_promotion.html#mixing-arrays-with-python-scalars, maybe it needs a bit of generalising to remove/rewrite the |
def where( | ||
condition: array, | ||
x1: Union[array, int, float, bool], | ||
x2: Union[array, int, float, bool], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can also be complex
, as below.
where
x2: array | ||
second input array. Must be compatible with ``condition`` and ``x1`` (see :ref:`broadcasting`). | ||
x1: Union[array, int, float, complex, bool] | ||
first input array or scalar. Scalar values are treated like an array filled with this value. Must be compatible with ``condition`` and ``x2`` (see :ref:`broadcasting`). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
first input array or scalar. Scalar values are treated like an array filled with this value. Must be compatible with ``condition`` and ``x2`` (see :ref:`broadcasting`). | |
first input array. Must be compatible with ``condition`` and ``x2`` (see :ref:`broadcasting`). |
Aligning with #862.
x1: Union[array, int, float, complex, bool] | ||
first input array or scalar. Scalar values are treated like an array filled with this value. Must be compatible with ``condition`` and ``x2`` (see :ref:`broadcasting`). | ||
x2: Union[array, int, float, complex, bool] | ||
second input array or scalar. Scalar values are treated like an array filled with this value. Must be compatible with ``condition`` and ``x1`` (see :ref:`broadcasting`). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
second input array or scalar. Scalar values are treated like an array filled with this value. Must be compatible with ``condition`` and ``x1`` (see :ref:`broadcasting`). | |
second input array. Must be compatible with ``condition`` and ``x1`` (see :ref:`broadcasting`). |
Aligning with #862.
@@ -139,21 +139,33 @@ def searchsorted( | |||
""" | |||
|
|||
|
|||
def where(condition: array, x1: array, x2: array, /) -> array: | |||
def where( | |||
condition: array, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
condition: array, | |
condition: Union[array, bool], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be better to require that condition is an array ISTM. x1
and x2
can be arrays or scalars, but there should be at least one array, and condition
it is.
In [7]: torch.where(True, 3, 4)
---------------------------------------------------------------------------
TypeError Traceback (most recent call last)
Cell In[7], line 1
----> 1 torch.where(True, 3, 4)
TypeError: where() received an invalid combination of arguments - got (bool, int, int), but expected one of:
* (Tensor condition)
* (Tensor condition, Tensor input, Tensor other, *, Tensor out = None)
* (Tensor condition, Number self, Tensor other)
didn't match because some of the arguments have invalid types: (bool, int, int)
* (Tensor condition, Tensor input, Number other)
didn't match because some of the arguments have invalid types: (bool, int, int)
* (Tensor condition, Number self, Number other)
didn't match because some of the arguments have invalid types: (bool, int, int)
In [2]: cupy.where(True, 3, 4)
---------------------------------------------------------------------------
AttributeError Traceback (most recent call last)
Cell In[2], line 1
----> 1 cupy.where(True, 3, 4)
...
AttributeError: 'bool' object has no attribute 'astype'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, there should be at least one array, but it is not clear to me that condition
should be required to be an array. While Torch does not support a scalar condition, NumPy does.
In [8]: np.where(True,np.ones((3,3)),0)
Out[8]:
array([[1., 1., 1.],
[1., 1., 1.],
[1., 1., 1.]])
It seems odd to me to be as restrictive as PyTorch when PyTorch supports
In [9]: torch.where(torch.asarray(True),torch.ones((3,3)),0)
Out[9]:
tensor([[1., 1., 1.],
[1., 1., 1.],
[1., 1., 1.]])
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From my (non-extensive) checks, the variant "condition is an array, x1 and x2 are arrays or scalars" covers all major array libraries. And it seems to be the most straightforward to explain in words or legalese, and most useful downstream, FWIW.
The In [9]
variant above seems to be covered, too? As long as the algorithm is
- convert x1 and x2 to arrays
- broadcast all of
condition, x1, x2
- profit!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the point I was trying to convey was that
torch.where(True,torch.ones((3,3)),0)
can be considered sugar for
torch.where(torch.asarray(True),torch.ones((3,3)),0)
Not clear, from a standards perspective, why the former should be prohibited a priori, as in PyTorch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as per #860 (comment) I think this is fine as is
|
||
Notes | ||
----- | ||
See :ref:`mixing-scalars-and-arrays` on compatibility requirements and handling of scalar arguments for ``x1`` and ``x2``. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See :ref:`mixing-scalars-and-arrays` on compatibility requirements and handling of scalar arguments for ``x1`` and ``x2``. | |
- At least one of ``condition``, ``x1``, and ``x2`` must be an array. | |
- If both ``x1`` and ``x2`` are scalar values, the returned array must have a data type which is equivalent to separately passing both ``x1`` and ``x2`` to :func:`~array_api.asarray` and computing the resulting data type using :func:`~array_api.result_type` (i.e., both scalars must be converted to arrays whose data types are used to determine the output data type according to :ref:`type-promotion` rules). | |
- If either ``x1`` or ``x2`` is a scalar value, the returned array must have a data type determined according to :ref:`mixing-scalars-and-arrays`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above: seems simpler to require that condition
is always an array. (line 168)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Requiring condition
to be an array doesn't simplify L169 and L170, as condition
has no bearing on the output data type.
See :ref:`mixing-scalars-and-arrays` on compatibility requirements and handling of scalar arguments for ``x1`` and ``x2``. | ||
|
||
.. versionchanged:: 2024.12 | ||
``x1`` and ``x2`` may be scalars. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
``x1`` and ``x2`` may be scalars. | |
Added support for scalar arguments. |
I made a few suggestions. Namely,
|
x1: Union[array, int, float, bool], | ||
x2: Union[array, int, float, bool], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
x1: Union[array, int, float, bool], | |
x2: Union[array, int, float, bool], | |
x1: Union[array, int, float, complex, bool], | |
x2: Union[array, int, float, complex, bool], |
where
where
We discussed these points in the community meeting yesterday, and agreed on the following:
|
Towards #807
This adds wording to the doc string and function signature to allow scalars in addition to arrays for the second and third argument.
Not super happy with the phrasing for the description of
condition
, maybe someone else has a suggestion for how to explain it without using a lot of words. We can then hopefully reuse that in the description ofout
.There are a lot more functions that need updating (#807 (comment)). I think it make sense to get this one done, and then copy&paste for the others (instead of having a giant diff while discussing things).
There is data-apis/array-api-strict#78 which implements this in array-api-strict.