Skip to content

GitLab

Unverified Commit 1de3aeff authored by CokeDong's avatar CokeDong Committed by GitHub
Browse files

Fix bbox_overlaps of parrots (#2684) 

* Fix parrots bbox_overlaps

* Fix
parent 4e8972fb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
mmcv/ops/bbox.py
View file @ 1de3aeff
...@@ -116,6 +116,10 @@ def bbox_overlaps(bboxes1: torch.Tensor, ...@@ -116,6 +116,10 @@ def bbox_overlaps(bboxes1: torch.Tensor,
if rows * cols == 0: if rows * cols == 0:
return ious return ious
if bboxes1.device.type == 'cpu' and torch.__version__ == 'parrots':
return _bbox_overlaps_cpu(
bboxes1, bboxes2, mode=mode, aligned=aligned, offset=offset)
ext_module.bbox_overlaps( ext_module.bbox_overlaps(
bboxes1, bboxes2, ious, mode=mode_flag, aligned=aligned, offset=offset) bboxes1, bboxes2, ious, mode=mode_flag, aligned=aligned, offset=offset)
......
setup.py
View file @ 1de3aeff
...@@ -212,6 +212,7 @@ def get_extensions(): ...@@ -212,6 +212,7 @@ def get_extensions():
glob.glob('./mmcv/ops/csrc/pytorch/cpu/*.cpp') +\ glob.glob('./mmcv/ops/csrc/pytorch/cpu/*.cpp') +\
glob.glob('./mmcv/ops/csrc/parrots/*.cpp') glob.glob('./mmcv/ops/csrc/parrots/*.cpp')
op_files.remove('./mmcv/ops/csrc/pytorch/cuda/iou3d_cuda.cu') op_files.remove('./mmcv/ops/csrc/pytorch/cuda/iou3d_cuda.cu')
op_files.remove('./mmcv/ops/csrc/pytorch/cpu/bbox_overlaps_cpu.cpp')
include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common')) include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common'))
include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common/cuda')) include_dirs.append(os.path.abspath('./mmcv/ops/csrc/common/cuda'))
cuda_args = os.getenv('MMCV_CUDA_ARGS') cuda_args = os.getenv('MMCV_CUDA_ARGS')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment