Skip to content

Fix empty inputs for Upper/LowerBound. #57418

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Fix empty inputs for Upper/LowerBound. #57418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3f2fb
Fix empty inputs for Upper/LowerBound.
cantonios Jul 14, 2022
7054cbf
Fix empty inputs for Upper/LowerBound.
vinila21 Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions tensorflow/core/kernels/searchsorted_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ limitations under the License.
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/kernels/fill_functor.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/types.h"

Expand Down Expand Up @@ -115,6 +116,14 @@ class UpperBoundOp : public OpKernel {
auto output = output_t->template flat<OutType>();
const auto sorted_inputs = sorted_inputs_t.template flat<T>();
const auto values = values_t.template flat<T>();

// For empty inputs, all values will be placed at the zeroth position.
if (sorted_inputs.size() == 0) {
functor::SetZeroFunctor<Device, OutType> set_zero;
set_zero(ctx->eigen_device<Device>(), output);
return;
}

OP_REQUIRES_OK(
ctx, functor::UpperBoundFunctor<Device, T, OutType>::Compute(
ctx, sorted_inputs, values, sorted_inputs_t.dim_size(0),
Expand Down Expand Up @@ -160,6 +169,14 @@ class LowerBoundOp : public OpKernel {
auto output = output_t->template flat<OutType>();
const auto sorted_inputs = sorted_inputs_t.template flat<T>();
const auto values = values_t.template flat<T>();

// For empty inputs, all values will be placed at the zeroth position.
if (sorted_inputs.size() == 0) {
functor::SetZeroFunctor<Device, OutType> set_zero;
set_zero(ctx->eigen_device<Device>(), output);
return;
}

OP_REQUIRES_OK(
ctx, functor::LowerBoundFunctor<Device, T, OutType>::Compute(
ctx, sorted_inputs, values, sorted_inputs_t.dim_size(0),
Expand Down
11 changes: 11 additions & 0 deletions tensorflow/python/kernel_tests/array_ops/array_ops_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,6 +1965,17 @@ def testZeroValueSize(self):
side=side,
out_type=dtype), array_ops.zeros([2, 0], dtype))

def testZeroInputSize(self):
dtype = dtypes.int32
for side in ("left", "right"):
with self.subTest(side=side):
self.assertAllEqual(
array_ops.searchsorted(
array_ops.ones([2, 0]),
array_ops.ones([2, 3]),
side=side,
out_type=dtype), array_ops.zeros([2, 3], dtype))

def testInt64(self):

@def_function.function
Expand Down