Skip to content
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

Jump to bottom

Move yolo box to phi #40112

Merged
merged 5 commits into from
Mar 4, 2022
Merged

Move yolo box to phi #40112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c782040
add yolo box kernel; test=develop
phlrain Mar 3, 2022
9e00395
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
phlrain Mar 3, 2022
b53cdc9
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
phlrain Mar 3, 2022
25fe41d
fix comile error; test=develop
phlrain Mar 3, 2022
c9beb88
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
phlrain Mar 3, 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
1 change: 0 additions & 1 deletion paddle/fluid/inference/tensorrt/plugin/yolo_box_op_plugin.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <cassert>

#include "paddle/fluid/inference/tensorrt/plugin/yolo_box_op_plugin.h"
#include "paddle/fluid/operators/detection/yolo_box_op.h"

namespace paddle {
namespace inference {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/operators/detection/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ detection_library(locality_aware_nms_op SRCS locality_aware_nms_op.cc DEPS gpc)
detection_library(matrix_nms_op SRCS matrix_nms_op.cc DEPS gpc)
detection_library(box_clip_op SRCS box_clip_op.cc box_clip_op.cu)
detection_library(yolov3_loss_op SRCS yolov3_loss_op.cc)
detection_library(yolo_box_op SRCS yolo_box_op.cc yolo_box_op.cu)
detection_library(yolo_box_op SRCS yolo_box_op.cc)
detection_library(box_decoder_and_assign_op SRCS box_decoder_and_assign_op.cc box_decoder_and_assign_op.cu)
detection_library(sigmoid_focal_loss_op SRCS sigmoid_focal_loss_op.cc sigmoid_focal_loss_op.cu)
detection_library(retinanet_detection_output_op SRCS retinanet_detection_output_op.cc)
Expand Down
3 changes: 0 additions & 3 deletions paddle/fluid/operators/detection/yolo_box_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
See the License for the specific language governing permissions and
limitations under the License. */

#include "paddle/fluid/operators/detection/yolo_box_op.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"

Expand Down Expand Up @@ -240,8 +239,6 @@ REGISTER_OPERATOR(
yolo_box, ops::YoloBoxOp, ops::YoloBoxOpMaker,
paddle::framework::EmptyGradOpMaker<paddle::framework::OpDesc>,
paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>);
REGISTER_OP_CPU_KERNEL(yolo_box, ops::YoloBoxKernel<float>,
ops::YoloBoxKernel<double>);

REGISTER_OP_VERSION(yolo_box)
.AddCheckpoint(
Expand Down
143 changes: 0 additions & 143 deletions paddle/fluid/operators/detection/yolo_box_op.cu
View file
Open in desktop

This file was deleted.

180 changes: 0 additions & 180 deletions paddle/fluid/operators/detection/yolo_box_op.h
View file
Open in desktop

This file was deleted.

Loading