experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 297466825
Change-Id: I8f4990d992478b4783c00119e4c1a23cff699d81
This commit is contained in:
A. Unique TensorFlower 2020-02-26 16:02:42 -08:00 committed by TensorFlower Gardener
parent 2481c7fee0
commit 525e091431
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tensorflow/core/kernels/non_max_suppression_op.cc
View File

@ -39,17 +39,6 @@ namespace {
typedef Eigen::ThreadPoolDevice CPUDevice;
template <typename T>
bool CheckBoxesCoordinates(const Tensor& boxes, int num_boxes) {
typename TTypes<T, 2>::ConstTensor boxes_data = boxes.tensor<T, 2>();
for (int i = 0; i < num_boxes; ++i) {
if (boxes_data(i, 0) == boxes_data(i, 2) ||
boxes_data(i, 1) == boxes_data(i, 3))
return false;
}
return true;
}
static inline void CheckScoreSizes(OpKernelContext* context, int num_boxes,
const Tensor& scores) {
// The shape of 'scores' is [num_boxes]
@ -605,9 +594,6 @@ class NonMaxSuppressionOp : public OpKernel {
int num_boxes = 0;
ParseAndCheckBoxSizes(context, boxes, &num_boxes);
CheckScoreSizes(context, num_boxes, scores);
OP_REQUIRES(
context, CheckBoxesCoordinates<float>(boxes, num_boxes),
errors::InvalidArgument("Boxes are empty (x1 == x2 or y1 == y2)"));
if (!context->status().ok()) {
return;
}
@ -655,9 +641,6 @@ class NonMaxSuppressionV2Op : public OpKernel {
int num_boxes = 0;
ParseAndCheckBoxSizes(context, boxes, &num_boxes);
CheckScoreSizes(context, num_boxes, scores);
OP_REQUIRES(
context, CheckBoxesCoordinates<T>(boxes, num_boxes),
errors::InvalidArgument("Boxes are empty (x1 == x2 or y1 == y2)"));
if (!context->status().ok()) {
return;
}
@ -709,9 +692,6 @@ class NonMaxSuppressionV3Op : public OpKernel {
int num_boxes = 0;
ParseAndCheckBoxSizes(context, boxes, &num_boxes);
CheckScoreSizes(context, num_boxes, scores);
OP_REQUIRES(
context, CheckBoxesCoordinates<T>(boxes, num_boxes),
errors::InvalidArgument("Boxes are empty (x1 == x2 or y1 == y2)"));
if (!context->status().ok()) {
return;
}
@ -766,9 +746,6 @@ class NonMaxSuppressionV4Op : public OpKernel {
int num_boxes = 0;
ParseAndCheckBoxSizes(context, boxes, &num_boxes);
CheckScoreSizes(context, num_boxes, scores);
OP_REQUIRES(
context, CheckBoxesCoordinates<T>(boxes, num_boxes),
errors::InvalidArgument("Boxes are empty (x1 == x2 or y1 == y2)"));
if (!context->status().ok()) {
return;
}

2
tensorflow/core/kernels/non_max_suppression_op_test.cc
View File

@ -106,7 +106,7 @@ TEST_F(NonMaxSuppressionOpTest, TestSelectWithNegativeScores) {
TEST_F(NonMaxSuppressionOpTest, TestFirstBoxDegenerate) {
MakeOp(.5);
AddInputFromArray<float>(TensorShape({3, 4}),
{0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3});
{0, 0, 0, 0, 1, 1, 2, 2, 2, 2, 3, 3});
AddInputFromArray<float>(TensorShape({3}), {.9f, .75f, .6f});
AddInputFromArray<int>(TensorShape({}), {3});
TF_ASSERT_OK(RunOpKernel());

2
tensorflow/python/ops/image_ops_test.py
View File

@ -4598,7 +4598,7 @@ class NonMaxSuppressionPaddedTest(test_util.TensorFlowTestCase):
"non_max_suppression with dynamic output shape unsupported.")
def testSelectFromContinuousOverLap(self):
boxes_np = [[0, 0, 1, 1], [0, 0.2, 1, 1.2], [0, 0.4, 1, 1.4],
[0, 0.6, 1, 1.6], [0, 0.8, 1, 1.8], [0, 2, 1, 3]]
[0, 0.6, 1, 1.6], [0, 0.8, 1, 1.8], [0, 2, 1, 2]]
scores_np = [0.9, 0.75, 0.6, 0.5, 0.4, 0.3]
max_output_size_np = 3
iou_threshold_np = 0.5