Repository navigation
Commit 4155e48
committed
Fix XLA DenseBincount to ignore negative indices in runtime tensors
PR #121118 added compile-time constant validation for negative inputs in
the XLA DenseBincount kernel, but only for the case where the input is a
compile-time constant. For runtime (non-constant) tensors -- the common
case in @tf.function(jit_compile=True) where inputs come from
placeholders, variables, or upstream ops -- negative values were passed
directly to xla::Scatter, silently producing wrong results instead of
raising InvalidArgumentError as eager mode does.
Since XLA cannot raise runtime errors from within a compiled computation,
map negative indices to output_size (out of bounds) via xla::Select so
that XLA Scatter silently ignores them. Using OOB indices instead of
clamping to 0 avoids a subtle bug with binary_output=True: when scatter
assigns (rather than adds), clamping negative values to index 0 would
overwrite legitimate bin 0 values with 0. OOB indices are simply dropped
by XLA Scatter, preserving correct results.
The existing compile-time constant validation from #121118 is preserved
unchanged -- OP_REQUIRES raises InvalidArgumentError at compile time for
constant negative inputs.
Also add an UnknownShape() fallback to the DenseBincount shape function
in math_ops.cc for unknown-rank inputs, which previously crashed with
'Check failed: output(i).IsSet()' when tracing the new runtime-negative
tests.
Adds three XLA tests covering runtime negative inputs (1D, 1D with
binary_output, and 2D), all wrapped in with self.session(): per
XLATestCase requirements.
Closes #1179601 parent 4f1b7de commit 4155e48
4 files changed
Lines changed: 110 additions & 1 deletion
File tree
- tensorflow
- compiler
- tests
- tf2xla/kernels
- core/ops
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2613 | 2613 | | |
2614 | 2614 | | |
2615 | 2615 | | |
| 2616 | + | |
2616 | 2617 | | |
| 2618 | + | |
2617 | 2619 | | |
2618 | 2620 | | |
2619 | 2621 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
19 | 20 | | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
| |||
68 | 70 | | |
69 | 71 | | |
70 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
71 | 136 | | |
72 | 137 | | |
73 | 138 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
76 | 81 | | |
77 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
78 | 85 | | |
79 | 86 | | |
80 | 87 | | |
81 | 88 | | |
82 | 89 | | |
83 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
84 | 98 | | |
85 | 99 | | |
86 | 100 | | |
| |||
130 | 144 | | |
131 | 145 | | |
132 | 146 | | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
133 | 163 | | |
134 | 164 | | |
135 | 165 | | |
| |||
145 | 175 | | |
146 | 176 | | |
147 | 177 | | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
148 | 188 | | |
149 | 189 | | |
150 | 190 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1828 | 1828 | | |
1829 | 1829 | | |
1830 | 1830 | | |
| 1831 | + | |
| 1832 | + | |
1831 | 1833 | | |
1832 | 1834 | | |
1833 | 1835 | | |
| |||
0 commit comments