From 99a8d05766e447d37a01e204339de24cef45895b Mon Sep 17 00:00:00 2001 From: CokeDong <408244909@qq.com> Date: Tue, 20 Jun 2023 17:22:11 +0800 Subject: [PATCH] [Enhancement] support dipu_mock_cuda=False in dipu for mmcv ext ops with cpu fallback (#2839) * Support cuda_mock * Fix * Support roi_align * Fix lint * Support bbox --- mmcv/ops/csrc/pytorch/bbox_overlaps.cpp | 4 +++- mmcv/ops/csrc/pytorch/nms.cpp | 3 ++- mmcv/ops/csrc/pytorch/roi_align.cpp | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mmcv/ops/csrc/pytorch/bbox_overlaps.cpp b/mmcv/ops/csrc/pytorch/bbox_overlaps.cpp index 60dab44521..95868e495c 100644 --- a/mmcv/ops/csrc/pytorch/bbox_overlaps.cpp +++ b/mmcv/ops/csrc/pytorch/bbox_overlaps.cpp @@ -33,7 +33,9 @@ void bbox_overlaps_diopi(const Tensor bboxes1, const Tensor bboxes2, diopiContextHandle_t ch = &ctx; auto bboxes2_p = toDiopiTensorHandle(bboxes2); auto ious_p = toDiopiTensorHandle(ious); - if (reinterpret_cast(diopiBboxOverlapsMmcv) != nullptr) { + bool is_mock_cuda = bboxes1.device().type() == c10::DeviceType::PrivateUse1; + if (is_mock_cuda && + reinterpret_cast(diopiBboxOverlapsMmcv) != nullptr) { auto ret = diopiBboxOverlapsMmcv(ch, ious_p, bboxes1_p, bboxes2_p, mode, offset, aligned); if (ret == diopiSuccess) return; diff --git a/mmcv/ops/csrc/pytorch/nms.cpp b/mmcv/ops/csrc/pytorch/nms.cpp index ad7988420e..3ebe224f96 100644 --- a/mmcv/ops/csrc/pytorch/nms.cpp +++ b/mmcv/ops/csrc/pytorch/nms.cpp @@ -42,7 +42,8 @@ Tensor nms_diopi(Tensor boxes, Tensor scores, float iou_threshold, int offset) { auto outp = toDiopiTensorHandle(out); diopiTensorHandle_t* outhandle = &outp; auto scores_p = toDiopiTensorHandle(scores); - if (reinterpret_cast(diopiNmsMmcv) != nullptr) { + bool is_mock_cuda = boxes.device().type() == c10::DeviceType::PrivateUse1; + if (is_mock_cuda && reinterpret_cast(diopiNmsMmcv) != nullptr) { auto ret = diopiNmsMmcv(ch, outhandle, boxes_p, scores_p, iou_threshold, offset); if (ret == diopiSuccess) { diff --git a/mmcv/ops/csrc/pytorch/roi_align.cpp b/mmcv/ops/csrc/pytorch/roi_align.cpp index 798a22b418..df136c8126 100644 --- a/mmcv/ops/csrc/pytorch/roi_align.cpp +++ b/mmcv/ops/csrc/pytorch/roi_align.cpp @@ -53,7 +53,8 @@ void roi_align_forward_diopi(Tensor input, Tensor rois, Tensor output, auto out_p = toDiopiTensorHandle(output); auto argmax_y_p = toDiopiTensorHandle(argmax_y); auto argmax_x_p = toDiopiTensorHandle(argmax_x); - if (reinterpret_cast(diopiRoiAlignMmcv) != nullptr) { + bool is_mock_cuda = input.device().type() == c10::DeviceType::PrivateUse1; + if (is_mock_cuda && reinterpret_cast(diopiRoiAlignMmcv) != nullptr) { auto ret = diopiRoiAlignMmcv( ch, out_p, argmax_y_p, argmax_x_p, input_p, rois_p, aligned_height, aligned_width, sampling_ratio, pool_mode, spatial_scale, aligned); @@ -91,7 +92,10 @@ void roi_align_backward_diopi(Tensor grad_output, Tensor rois, Tensor argmax_y, auto grad_input_ = toDiopiTensorHandle(grad_input); diopiContext ctx(dipu::getCurrentDIPUStream().rawstream()); diopiContextHandle_t ch = &ctx; - if (reinterpret_cast(diopiRoiAlignBackwardMmcv) != nullptr) { + bool is_mock_cuda = + grad_output.device().type() == c10::DeviceType::PrivateUse1; + if (is_mock_cuda && + reinterpret_cast(diopiRoiAlignBackwardMmcv) != nullptr) { auto ret = diopiRoiAlignBackwardMmcv(ch, grad_input_, grad_output_, rois_, argmax_y_, argmax_x_, aligned_height, aligned_width, sampling_ratio,