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.

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

Sync main with mmcv1.x branch #2800

Merged
merged 6 commits into from
May 19, 2023

Conversation

defei-coder
Copy link
Contributor

@defei-coder defei-coder commented May 19, 2023

Thanks for your contribution and we appreciate it a lot. The following instructions would make your pull request more healthy and more easily get feedback. If you do not understand some items, don't worry, just make the pull request and seek help from maintainers.

Motivation

Synchronize main branch with mmcv1.x branch in MLU.
Cherry-pick from following PR:

Modification

Add new files:

  • mmcv/ops/csrc/pytorch/mlu/box_iou_rotated.cpp

Modify files:

  • docs/en/understand_mmcv/ops.md
  • docs/zh_cn/understand_mmcv/ops.md
  • mmcv/ops/box_iou_rotated.py
  • mmcv/ops/csrc/pytorch/mlu/iou3d_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/mlu_common_helper.h
  • mmcv/ops/csrc/pytorch/mlu/nms_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/roi_align_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/roiaware_pool3d_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/three_nn_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/ms_deform_attn_mlu.cpp
  • mmcv/ops/csrc/pytorch/mlu/voxelization_mlu.cpp
  • setup.py
  • tests/test_ops/test_box_iou_rotated.py
  • tests/test_ops/test_roi_align.py

Detele files(which replaced by mlu-ops):

  • mmcv/ops/csrc/common/mlu/iou3d_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/iou3d_utils.hpp
  • mmcv/ops/csrc/common/mlu/ms_deform_attn_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/nms_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/nms_utils.hpp
  • mmcv/ops/csrc/common/mlu/roi_align_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/roiaware_pool3d_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/three_nn_mlu_kernel.mlu
  • mmcv/ops/csrc/common/mlu/voxelization_mlu_kernel.mlu

BC-breaking (Optional)

Does the modification introduce changes that break the backward-compatibility of the downstream repositories?
If so, please describe how it breaks the compatibility and how the downstream projects should modify their code to keep compatibility with this PR.

Use cases (Optional)

If this PR introduces a new feature, it is better to list some use cases here, and update the documentation.

Checklist

Before PR:

  • I have read and followed the workflow indicated in the CONTRIBUTING.md to create this PR.
  • Pre-commit or linting tools indicated in CONTRIBUTING.md are used to fix the potential lint issues.
  • Bug fixes are covered by unit tests, the case that causes the bug should be added in the unit tests.
  • New functionalities are covered by complete unit tests. If not, please add more unit test to ensure the correctness.
  • The documentation has been modified accordingly, including docstring or example tutorials.

After PR:

  • If the modification has potential influence on downstream or other related projects, this PR should be tested with some of those projects, like MMDet or MMCls.
  • CLA has been signed and all committers have signed the CLA in this PR.

@defei-coder defei-coder changed the title Sync main with mmcv1x [Enhance]Sync main with mmcv1x May 19, 2023
@defei-coder defei-coder force-pushed the sync_main_with_mmcv1x branch from 6351887 to 53b5b12 Compare May 19, 2023 06:56
@zhouzaida zhouzaida changed the title [Enhance]Sync main with mmcv1x Sync main with mmcv1.x branch May 19, 2023
@zhouzaida zhouzaida merged commit 0c23eb0 into open-mmlab:main May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants