diff --git a/paddle/operators/detection_output_op.cc b/paddle/operators/detection_output_op.cc index ae807d2810217fb1db9ce26f9aa997f15f3e02d3..ea44cd32678d7e8a5836c1886cf9c1b4961970aa 100644 --- a/paddle/operators/detection_output_op.cc +++ b/paddle/operators/detection_output_op.cc @@ -18,8 +18,7 @@ namespace operators { class DetectionOutputOpMaker : public framework::OpProtoAndCheckerMaker { public: - DetectionOutputOpMaker(framework::OpProto* proto, - framework::OpAttrChecker* op_checker) + DetectionOutputOpMaker(OpProto* proto, OpAttrChecker* op_checker) : OpProtoAndCheckerMaker(proto, op_checker) { AddInput("Loc", "(Tensor) The input tensor of detection_output operator." @@ -86,5 +85,5 @@ REGISTER_OP_WITHOUT_GRADIENT(detection_output, ops::DetectionOutputOp, ops::DetectionOutputOpMaker); REGISTER_OP_CPU_KERNEL( detection_output, - ops::Detection_output_Kernel, - ops::Detection_output_Kernel); + ops::DetectionOutputKernel, + ops::DetectionOutputKernel); diff --git a/paddle/operators/detection_output_op.cu.cc b/paddle/operators/detection_output_op.cu.cc index e65b2afd213f7ed10f5bc855b00e0b188df45c27..4a6560e0492c559afd06e5152c34fab545b7ce61 100644 --- a/paddle/operators/detection_output_op.cu.cc +++ b/paddle/operators/detection_output_op.cu.cc @@ -17,5 +17,5 @@ limitations under the License. */ namespace ops = paddle::operators; REGISTER_OP_CUDA_KERNEL( detection_output, - ops::Detection_output_Kernel, - ops::Detection_output_Kernel); + ops::DetectionOutputKernel, + ops::DetectionOutputKernel); diff --git a/paddle/operators/detection_output_op.h b/paddle/operators/detection_output_op.h index 733ec3b0ede2d3c344d877881197235089d5ab74..c0a4e6a3a2391bb4519084afaa59d9889147dc50 100644 --- a/paddle/operators/detection_output_op.h +++ b/paddle/operators/detection_output_op.h @@ -48,7 +48,7 @@ inline void transpose_fun(const framework::ExecutionContext& context, } } template -class Detection_output_Kernel : public framework::OpKernel { +class DetectionOutputKernel : public framework::OpKernel { public: void Compute(const framework::ExecutionContext& context) const override { const framework::Tensor* in_loc = context.Input("Loc"); @@ -119,22 +119,22 @@ class Detection_output_Kernel : public framework::OpKernel { size_t prior_offset = i * 8; size_t loc_pred_offset = n * num_priors * 4 + i * 4; std::vector> prior_bbox_vec; - math::getBBoxFromPriorData(priorbox_data + prior_offset, 1, - prior_bbox_vec); + math::get_bbox_from_priorData(priorbox_data + prior_offset, 1, + prior_bbox_vec); std::vector> prior_bbox_var; - math::getBBoxVarFromPriorData(priorbox_data + prior_offset, 1, - prior_bbox_var); + math::get_bbox_var_from_prior_data(priorbox_data + prior_offset, 1, + prior_bbox_var); std::vector loc_pred_data; for (size_t j = 0; j < 4; ++j) loc_pred_data.push_back(*(loc_data + loc_pred_offset + j)); - math::BBox bbox = math::decodeBBoxWithVar( + math::BBox bbox = math::decode_bbox_with_var( prior_bbox_vec[0], prior_bbox_var[0], loc_pred_data); decoded_bboxes.push_back(bbox); } all_decoded_bboxes.push_back(decoded_bboxes); } std::vector>> all_indices; - int num_kept = math::getDetectionIndices( + int num_kept = math::get_detection_indices( conf_data, num_priors, num_classes, background_label_id, batch_size, confidence_threshold, nms_top_k, nms_threshold, top_k, all_decoded_bboxes, &all_indices); @@ -154,11 +154,11 @@ class Detection_output_Kernel : public framework::OpKernel { out_cpu.mutable_data(out->dims(), platform::CPUPlace()); out_data = out_cpu.data(); } - math::getDetectionOutput(conf_data, num_kept, num_priors, num_classes, - batch_size, all_indices, all_decoded_bboxes, - out_data); + math::get_detection_output(conf_data, num_kept, num_priors, num_classes, + batch_size, all_indices, all_decoded_bboxes, + out_data); if (platform::is_gpu_place(context.GetPlace())) { - framework::CopyFrom(out_cpu, platform::GPUPlace(), + framework::CopyFrom(out_cpu, platform::CUDAPlace(), context.device_context(), out); } } diff --git a/paddle/operators/math/detection_util.h b/paddle/operators/math/detection_util.h index b671f7b517fc1ac48f6a102ba977cacef5b52342..d1ae0e63438b8f6161895ee9a533a268eafed719 100644 --- a/paddle/operators/math/detection_util.h +++ b/paddle/operators/math/detection_util.h @@ -51,31 +51,31 @@ struct BBox { // KNCHW ==> NHWC // template template -void getBBoxFromPriorData(const T* prior_data, const size_t num_bboxes, - std::vector>& bbox_vec); +void get_bbox_from_priorData(const T* prior_data, const size_t num_bboxes, + std::vector>& bbox_vec); template -void getBBoxVarFromPriorData(const T* prior_data, const size_t num, - std::vector>& var_vec); +void get_bbox_var_from_prior_data(const T* prior_data, const size_t num, + std::vector>& var_vec); template -BBox decodeBBoxWithVar(BBox& prior_bbox, - const std::vector& prior_bbox_var, - const std::vector& loc_pred_data); +BBox decode_bbox_with_var(BBox& prior_bbox, + const std::vector& prior_bbox_var, + const std::vector& loc_pred_data); template -bool sortScorePairDescend(const std::pair& pair1, - const std::pair& pair2); +bool sort_score_pair_descend(const std::pair& pair1, + const std::pair& pair2); template -bool sortScorePairDescend(const std::pair>& pair1, - const std::pair>& pair2); +bool sort_score_pair_descend(const std::pair>& pair1, + const std::pair>& pair2); template -T jaccardOverlap(const BBox& bbox1, const BBox& bbox2); +T jaccard_overlap(const BBox& bbox1, const BBox& bbox2); template -void applyNMSFast(const std::vector>& bboxes, const T* conf_score_data, - size_t class_idx, size_t top_k, T conf_threshold, - T nms_threshold, size_t num_priors, size_t num_classes, - std::vector* indices); +void apply_nms_fast(const std::vector>& bboxes, + const T* conf_score_data, size_t class_idx, size_t top_k, + T conf_threshold, T nms_threshold, size_t num_priors, + size_t num_classes, std::vector* indices); template -int getDetectionIndices( +int get_detection_indices( const T* conf_data, const size_t num_priors, const size_t num_classes, const size_t background_label_id, const size_t batch_size, const T conf_threshold, const size_t nms_top_k, const T nms_threshold, @@ -85,14 +85,14 @@ int getDetectionIndices( template BBox clipBBox(const BBox& bbox); template -void getDetectionOutput( +void get_detection_output( const T* conf_data, const size_t num_kept, const size_t num_priors, const size_t num_classes, const size_t batch_size, const std::vector>>& all_indices, const std::vector>>& all_decoded_bboxes, T* out_data); template -void getBBoxFromPriorData(const T* prior_data, const size_t num_bboxes, - std::vector>& bbox_vec) { +void get_bbox_from_priorData(const T* prior_data, const size_t num_bboxes, + std::vector>& bbox_vec) { size_t out_offset = bbox_vec.size(); bbox_vec.resize(bbox_vec.size() + num_bboxes); for (size_t i = 0; i < num_bboxes; ++i) { @@ -105,8 +105,8 @@ void getBBoxFromPriorData(const T* prior_data, const size_t num_bboxes, } } template -void getBBoxVarFromPriorData(const T* prior_data, const size_t num, - std::vector>& var_vec) { +void get_bbox_var_from_prior_data(const T* prior_data, const size_t num, + std::vector>& var_vec) { size_t out_offset = var_vec.size(); var_vec.resize(var_vec.size() + num); for (size_t i = 0; i < num; ++i) { @@ -119,9 +119,9 @@ void getBBoxVarFromPriorData(const T* prior_data, const size_t num, } } template -BBox decodeBBoxWithVar(BBox& prior_bbox, - const std::vector& prior_bbox_var, - const std::vector& loc_pred_data) { +BBox decode_bbox_with_var(BBox& prior_bbox, + const std::vector& prior_bbox_var, + const std::vector& loc_pred_data) { T prior_bbox_width = prior_bbox.get_width(); T prior_bbox_height = prior_bbox.get_height(); T prior_bbox_center_x = prior_bbox.get_center_x(); @@ -147,12 +147,12 @@ BBox decodeBBoxWithVar(BBox& prior_bbox, return decoded_bbox; } template -bool sortScorePairDescend(const std::pair& pair1, - const std::pair& pair2) { +bool sort_score_pair_descend(const std::pair& pair1, + const std::pair& pair2) { return pair1.first > pair2.first; } template -T jaccardOverlap(const BBox& bbox1, const BBox& bbox2) { +T jaccard_overlap(const BBox& bbox1, const BBox& bbox2) { if (bbox2.x_min > bbox1.x_max || bbox2.x_max < bbox1.x_min || bbox2.y_min > bbox1.y_max || bbox2.y_max < bbox1.y_min) { return 0.0; @@ -174,10 +174,10 @@ T jaccardOverlap(const BBox& bbox1, const BBox& bbox2) { } template -void applyNMSFast(const std::vector>& bboxes, const T* conf_score_data, - size_t class_idx, size_t top_k, T conf_threshold, - T nms_threshold, size_t num_priors, size_t num_classes, - std::vector* indices) { +void apply_nms_fast(const std::vector>& bboxes, + const T* conf_score_data, size_t class_idx, size_t top_k, + T conf_threshold, T nms_threshold, size_t num_priors, + size_t num_classes, std::vector* indices) { std::vector> scores; for (size_t i = 0; i < num_priors; ++i) { size_t conf_offset = i * num_classes + class_idx; @@ -185,7 +185,7 @@ void applyNMSFast(const std::vector>& bboxes, const T* conf_score_data, scores.push_back(std::make_pair(conf_score_data[conf_offset], i)); } std::stable_sort(scores.begin(), scores.end(), - sortScorePairDescend); + sort_score_pair_descend); if (top_k > 0 && top_k < scores.size()) scores.resize(top_k); while (scores.size() > 0) { const size_t idx = scores.front().second; @@ -193,7 +193,7 @@ void applyNMSFast(const std::vector>& bboxes, const T* conf_score_data, for (size_t i = 0; i < indices->size(); ++i) { if (keep) { const size_t saved_idx = (*indices)[i]; - T overlap = jaccardOverlap(bboxes[idx], bboxes[saved_idx]); + T overlap = jaccard_overlap(bboxes[idx], bboxes[saved_idx]); keep = overlap <= nms_threshold; } else { break; @@ -204,7 +204,7 @@ void applyNMSFast(const std::vector>& bboxes, const T* conf_score_data, } } template -int getDetectionIndices( +int get_detection_indices( const T* conf_data, const size_t num_priors, const size_t num_classes, const size_t background_label_id, const size_t batch_size, const T conf_threshold, const size_t nms_top_k, const T nms_threshold, @@ -219,9 +219,9 @@ int getDetectionIndices( size_t conf_offset = n * num_priors * num_classes; for (size_t c = 0; c < num_classes; ++c) { if (c == background_label_id) continue; - applyNMSFast(decoded_bboxes, conf_data + conf_offset, c, nms_top_k, - conf_threshold, nms_threshold, num_priors, num_classes, - &(indices[c])); + apply_nms_fast(decoded_bboxes, conf_data + conf_offset, c, nms_top_k, + conf_threshold, nms_threshold, num_priors, num_classes, + &(indices[c])); num_detected += indices[c].size(); } if (top_k > 0 && num_detected > top_k) { @@ -237,7 +237,7 @@ int getDetectionIndices( } } std::sort(score_index_pairs.begin(), score_index_pairs.end(), - sortScorePairDescend>); + sort_score_pair_descend>); score_index_pairs.resize(top_k); std::map> new_indices; for (size_t i = 0; i < score_index_pairs.size(); ++i) { @@ -266,7 +266,7 @@ BBox clipBBox(const BBox& bbox) { return clipped_bbox; } template -void getDetectionOutput( +void get_detection_output( const T* conf_data, const size_t num_kept, const size_t num_priors, const size_t num_classes, const size_t batch_size, const std::vector>>& all_indices,