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

Fix numeric_limits::min()->lowest() and clang-format

Browse Source
This commit is contained in:
Sami 2019-09-09 15:04:47 -07:00
parent 736eba374e
commit 178ed66d97
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tensorflow/core/kernels/non_max_suppression_op.cu.cc
View File

@ -498,10 +498,10 @@ Status DoNMS(OpKernelContext* context, const Tensor& boxes,
original_boxes, sorted_boxes)); original_boxes, sorted_boxes));
int limited_num_boxes = num_boxes; int limited_num_boxes = num_boxes;
// filter boxes by scores if nms v3 // filter boxes by scores if nms v3
if (score_threshold > std::numeric_limits<float>::min()) { if (score_threshold > std::numeric_limits<float>::lowest()) {
GreaterThanCubOp score_limit(score_threshold); GreaterThanCubOp score_limit(score_threshold);
TF_RETURN_IF_ERROR(CountIf(context, d_sorted_scores.flat<float>().data(), TF_RETURN_IF_ERROR(CountIf(context, d_sorted_scores.flat<float>().data(),
score_limit, num_boxes, &limited_num_boxes)); score_limit, num_boxes, &limited_num_boxes));
if (limited_num_boxes == 0) { if (limited_num_boxes == 0) {
Tensor* output_indices = nullptr; Tensor* output_indices = nullptr;
VLOG(1) << "Number of boxes above score threshold " << score_threshold VLOG(1) << "Number of boxes above score threshold " << score_threshold
@ -510,8 +510,8 @@ Status DoNMS(OpKernelContext* context, const Tensor& boxes,
context->allocate_output(0, TensorShape({0}), &output_indices)); context->allocate_output(0, TensorShape({0}), &output_indices));
return Status::OK(); return Status::OK();
} else { } else {
VLOG(2) << "Number of boxes above threshold=" << score_threshold VLOG(2) << "Number of boxes above threshold=" << score_threshold << " is "
<< " is " << limited_num_boxes; << limited_num_boxes;
} }
} }
int num_to_keep = 0; int num_to_keep = 0;
@ -580,8 +580,8 @@ class NonMaxSuppressionV2GPUOp : public OpKernel {
// otherwise tests fail! // otherwise tests fail!
if (num_boxes == 0) { if (num_boxes == 0) {
Tensor* output_indices = nullptr; Tensor* output_indices = nullptr;
OP_REQUIRES_OK(context, OP_REQUIRES_OK(context, context->allocate_output(0, TensorShape({0}),
context->allocate_output(0, TensorShape({0}), &output_indices)); &output_indices));
return; return;
} }
const int64_t output_size = max_output_size.scalar<int>()(); const int64_t output_size = max_output_size.scalar<int>()();
@ -589,7 +589,7 @@ class NonMaxSuppressionV2GPUOp : public OpKernel {
context, context,
DoNMS(context, boxes, scores, output_size, iou_threshold_val, DoNMS(context, boxes, scores, output_size, iou_threshold_val,
/*score_threshold is float min if score threshold is disabled*/ /*score_threshold is float min if score threshold is disabled*/
std::numeric_limits<float>::min())); std::numeric_limits<float>::lowest()));
} }
}; };