Fix casts in ufunc outputs #5550

toslunar · 2021-07-21T12:42:56Z

This PR fixes #5527 and simplifies elementwise_copy (e.g. reverts #5410 except for the test).

See also #5539.

This partially reverts commit c576e99.

toslunar · 2021-07-24T05:38:07Z

Let me run the tests because the change affects globally. Jenkins, test this please.

chainer-ci · 2021-07-24T07:54:22Z

Jenkins CI test (for commit 682f491, target branch master) failed with status FAILURE.

toslunar · 2021-07-26T08:02:18Z

cupy/_core/_kernel.pyx

+        else:
+            op.append(
+                'out{0}_type out{0}({1});'
+                .format(
+                    i,
+                    fix_cast_expr(arginfo.dtype, x, f'_raw_out{i}[_ind.get()]')
+                ))
+            out_op.append(
+                '_raw_out{0}[_ind.get()] = {1};'.format(
+                    i,
+                    fix_cast_expr(x, arginfo.dtype, f'out{i}')
+                )
+            )


This "load and save" approach is not really a good idea.

The load is not necessary. I'd remove the ability of reading out from cupy.ufunc, while it's fine with cupy.ElementwiseKernel.

The save causes "precision loss" if no-op is expected. For example, CuPy should carefully implement where of ufunc.

The current problem is just a special case of 2.: cupy.copyto(..., where=...) is getting wrong with

elementwise_copy_where = create_ufunc( 'cupy_copy_where', ('??->?', 'b?->b', 'B?->B', 'h?->h', 'H?->H', 'i?->i', 'I?->I', 'l?->l', 'L?->L', 'q?->q', 'Q?->Q', 'e?->e', 'f?->f', 'd?->d', 'F?->F', 'D?->D'), 'if (in1) out0 = in0', default_casting='unsafe')

, which was found in the tests of cupy.unwrap. (BTW, for float dtypes, cupy.testing.shaped_arange could use arange(size) + 0.5 instead of + 1 in order to detect this kind of bugs.)

cupy/cupy/_math/trigonometric.py

Lines 153 to 154 in f06d85b

cupy.copyto(ddmod, interval_high, where=(

ddmod == interval_low) & (dd > 0))

To resolve it, either

implement (private) _where arg of ufunc.__call__ that works at least for cupy_copy, or

rewrite the cupy_copy_where kernel as cupy.ElementwiseKernel.

toslunar · 2021-07-27T00:47:09Z

Jenkins, test this please.

chainer-ci · 2021-07-27T02:46:48Z

Jenkins CI test (for commit adad8fa, target branch master) succeeded!

toslunar · 2021-07-27T05:33:40Z

Jenkins, test this please.

chainer-ci · 2021-07-27T07:56:07Z

Jenkins CI test (for commit 03d0973, target branch master) failed with status FAILURE.

toslunar · 2021-07-27T08:15:54Z

_real_setter and _imag_setter read out0, too.

toslunar · 2021-07-29T06:33:03Z

Now we can simplify some ufunc codes e.g. from

out0_type a = _floor_divide(in0, in1);
out0 = a;
out1 = in0 - a * in1

(https://github.com/cupy/cupy/blob/v9.2.0/cupy/_core/core.pyx#L2016-L2019) to

out0 = _floor_divide(in0, in1);
out1 = in0 - out0 * in1

But let's do so in another PR.

cupy/_core/_kernel.pyx

asi1024 · 2021-07-29T07:23:40Z

cupy/_core/_kernel.pyx

+    src_kind = get_dtype(src_type).kind
+    dst_kind = get_dtype(dst_type).kind
+    if src_kind == dst_kind:
+        return expr


How about

casting explicitly?

Suggested change

return expr

cast_type = _get_typename(dst_type)

return f'static_cast<{cast_type}>({expr})'

, or
2. Could you add a comment that the cast is not needed because the returned fixed expr will be always used as out[i] = fixed_expr?

asi1024 · 2021-07-29T09:35:28Z

cupy/_core/_kernel.pyx

 cdef function.Function _get_ufunc_kernel(
-        tuple in_types, tuple out_types, routine, tuple arginfos, params,
+        tuple in_types, tuple out_types, routine, tuple arginfos,
+        bint has_where, params,


note: (internal discussion with @toslunar)
has_where argument can be removed by introducing a constant array, that is a ndaray-like compile-time constant object.
If where option is not given, where becomes a constant True.

Co-authored-by: Akifumi Imanishi <[email protected]>

toslunar · 2021-07-30T13:09:58Z

I squashed some recent commits for commit-by-commit review.

toslunar · 2021-07-30T19:22:29Z

Jenkins, test this please.

chainer-ci · 2021-07-30T22:13:16Z

Jenkins CI test (for commit 00264a7, target branch master) failed with status FAILURE.

toslunar · 2021-08-02T06:56:46Z

cupy/_manipulation/basic.py

+    if where is not None:
+        _core.elementwise_copy(src, dst, _where=where)
+        return
+
    if dst.size == 0:
        return


By the way, cupy.copyto(cupy.empty((2, 0)), cupy.empty((0, 3))) should raise

ValueError: could not broadcast input array from shape (0,3) into shape (2,0)

asi1024 · 2021-08-02T09:40:31Z

Jenkins, test this please.

chainer-ci · 2021-08-02T11:42:12Z

Jenkins CI test (for commit 927b110, target branch master) succeeded!

asi1024 · 2021-08-02T15:23:50Z

LGTM!

Fix casts in ufunc outputs

toslunar and others added 5 commits July 21, 2021 21:03

Fix casts in ufunc outputs

ed20db1

Test casting kwarg of ufunc

e14fe99

Partially revert "Fix astype from boolean"

8ba0e5c

This partially reverts commit c576e99.

simplify elementwise_copy

8059757

flake8

682f491

kmaehashi assigned asi1024 Jul 26, 2021

kmaehashi added cat:bug Bugs to-be-backported Pull-requests to be backported to stable branch prio:medium labels Jul 26, 2021

toslunar commented Jul 26, 2021

View reviewed changes

toslunar added 3 commits July 26, 2021 17:56

perf

80d0c14

Add ufunc's where as _where kwarg

11dfe52

Remove elementwise_copy_where

adad8fa

toslunar added 2 commits July 27, 2021 11:52

fix ufunc kernel name

53fae5c

Stop reading out in ufunc

03d0973

Remove ufuncs for real/imag

4b719b5

asi1024 reviewed Jul 29, 2021

View reviewed changes

toslunar and others added 5 commits July 30, 2021 11:12

Fix style

cf9839c

Co-authored-by: Akifumi Imanishi <[email protected]>

bugfix for downcast ufunc input

90684ef

bugfix: complex to bool

3406aa9

support scalar where

777b489

Refactor ndarray.astype and fix ComplexWarning

1dfe686

toslunar added 3 commits July 30, 2021 21:53

mark test failures

c7259b7

fix positive_mask

578aa7b

emit ComplexWarning

00264a7

toslunar force-pushed the ufunc-cast-output branch from 316ac56 to 00264a7 Compare July 30, 2021 13:04

toslunar added 2 commits August 2, 2021 11:33

revive real/imag ufuncs for fusion

3a0ea49

Typecheck where

927b110

toslunar commented Aug 2, 2021

View reviewed changes

asi1024 approved these changes Aug 2, 2021

View reviewed changes

asi1024 merged commit cb178c9 into cupy:master Aug 2, 2021

chainer-ci pushed a commit to chainer-ci/cupy that referenced this pull request Aug 2, 2021

Merge pull request cupy#5550 from toslunar/ufunc-cast-output

4be9bfc

Fix casts in ufunc outputs

chainer-ci mentioned this pull request Aug 2, 2021

[backport] Fix casts in ufunc outputs #5589

Merged

toslunar deleted the ufunc-cast-output branch August 3, 2021 02:10

toslunar mentioned this pull request Aug 3, 2021

copyto bool array from complex array #5580

Closed

kmaehashi added this to the v10.0.0b1 milestone Aug 5, 2021

This was referenced Aug 9, 2021

Allow to compile using PTX with an envvar #5622

Merged

Fix parameterization of casting tests #5626

Closed

kmaehashi mentioned this pull request Jan 9, 2023

Support passing where in ufunc #7281

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix casts in ufunc outputs #5550

Fix casts in ufunc outputs #5550

toslunar commented Jul 21, 2021

toslunar commented Jul 24, 2021

chainer-ci commented Jul 24, 2021

toslunar Jul 26, 2021

toslunar commented Jul 27, 2021

chainer-ci commented Jul 27, 2021

toslunar commented Jul 27, 2021

chainer-ci commented Jul 27, 2021

toslunar commented Jul 27, 2021

toslunar commented Jul 29, 2021 •

edited

Loading

asi1024 Jul 29, 2021

asi1024 Jul 29, 2021

toslunar commented Jul 30, 2021

toslunar commented Jul 30, 2021

chainer-ci commented Jul 30, 2021

toslunar Aug 2, 2021

asi1024 commented Aug 2, 2021

chainer-ci commented Aug 2, 2021

asi1024 commented Aug 2, 2021

	cupy.copyto(ddmod, interval_high, where=(
	ddmod == interval_low) & (dd > 0))

	return expr
	cast_type = _get_typename(dst_type)
	return f'static_cast<{cast_type}>({expr})'

Fix casts in ufunc outputs #5550

Fix casts in ufunc outputs #5550

Conversation

toslunar commented Jul 21, 2021

toslunar commented Jul 24, 2021

chainer-ci commented Jul 24, 2021

toslunar Jul 26, 2021

Choose a reason for hiding this comment

toslunar commented Jul 27, 2021

chainer-ci commented Jul 27, 2021

toslunar commented Jul 27, 2021

chainer-ci commented Jul 27, 2021

toslunar commented Jul 27, 2021

toslunar commented Jul 29, 2021 • edited Loading

asi1024 Jul 29, 2021

Choose a reason for hiding this comment

asi1024 Jul 29, 2021

Choose a reason for hiding this comment

toslunar commented Jul 30, 2021

toslunar commented Jul 30, 2021

chainer-ci commented Jul 30, 2021

toslunar Aug 2, 2021

Choose a reason for hiding this comment

asi1024 commented Aug 2, 2021

chainer-ci commented Aug 2, 2021

asi1024 commented Aug 2, 2021

toslunar commented Jul 29, 2021 •

edited

Loading