diff --git a/configs/mmdet/detection/detection_ascend_static-800x1344.py b/configs/mmdet/detection/detection_ascend_static-800x1344.py deleted file mode 100644 index 81495e8d46..0000000000 --- a/configs/mmdet/detection/detection_ascend_static-800x1344.py +++ /dev/null @@ -1,5 +0,0 @@ -_base_ = ['../_base_/base_static.py', '../../_base_/backends/ascend.py'] - -onnx_config = dict(input_shape=[1344, 800]) -backend_config = dict( - model_inputs=[dict(input_shapes=dict(input=[1, 3, 800, 1344]))]) diff --git a/mmdeploy/backend/ascend/wrapper.py b/mmdeploy/backend/ascend/wrapper.py index 6264a1af85..75d5302596 100644 --- a/mmdeploy/backend/ascend/wrapper.py +++ b/mmdeploy/backend/ascend/wrapper.py @@ -394,7 +394,7 @@ def forward(self, inputs: Dict[str, for binding in self._model_desc.outputs: self._copy_buffer_to_tensor( - self._output.buffers[binding.index], tensor) + self._output.buffers[binding.index], outputs[binding.name]) return outputs diff --git a/mmdeploy/codebase/mmdet/deploy/utils.py b/mmdeploy/codebase/mmdet/deploy/utils.py index 1b36d906f6..128b99253a 100644 --- a/mmdeploy/codebase/mmdet/deploy/utils.py +++ b/mmdeploy/codebase/mmdet/deploy/utils.py @@ -249,6 +249,9 @@ def __gather_topk__trt(*inputs: Sequence[torch.Tensor], return outputs +@FUNCTION_REWRITER.register_rewriter( + 'mmdeploy.codebase.mmdet.deploy.utils.__gather_topk', + backend=Backend.ASCEND.value) @FUNCTION_REWRITER.register_rewriter( 'mmdeploy.codebase.mmdet.deploy.utils.__gather_topk', backend=Backend.COREML.value) diff --git a/mmdeploy/codebase/mmdet/models/roi_heads/standard_roi_head.py b/mmdeploy/codebase/mmdet/models/roi_heads/standard_roi_head.py index 71864c0c6c..5a7c6aa00d 100644 --- a/mmdeploy/codebase/mmdet/models/roi_heads/standard_roi_head.py +++ b/mmdeploy/codebase/mmdet/models/roi_heads/standard_roi_head.py @@ -38,7 +38,7 @@ def standard_roi_head__predict_bbox(self, (num_instances, ). """ rois = rpn_results_list[0] - rois_dims = rois.shape[-1] + rois_dims = int(rois.shape[-1]) batch_index = torch.arange( rois.shape[0], device=rois.device).float().view(-1, 1, 1).expand( rois.size(0), rois.size(1), 1) diff --git a/mmdeploy/mmcv/ops/nms.py b/mmdeploy/mmcv/ops/nms.py index 3abd9a9d02..918f6e48f5 100644 --- a/mmdeploy/mmcv/ops/nms.py +++ b/mmdeploy/mmcv/ops/nms.py @@ -713,4 +713,4 @@ def multiclass_nms__ascend(boxes: Tensor, boxes, scores, score_threshold, iou_threshold, keep_top_k, keep_top_k) dets = torch.cat([nmsed_boxes, nmsed_scores.unsqueeze(2)], dim=-1) - return dets, nmsed_classes + return dets, nmsed_classes.int()