[Feature] Add several MLU ops #1563

teamwong111 · 2021-12-07T07:09:08Z

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

Refactor MLU csrc and Merge mlu to master.

Modification

Modify setup.py and refactor MLU csrc and solve conflicts between master-branch and mlu-branch

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.

* add ops (roiaware pool3d) in mmdet3d * refactor code * fix typo Co-authored-by: zhouzaida <zhouzaida@163.com>

* add ops (iou3d) in mmdet3d * add unit test * refactor code * refactor code * refactor code * refactor code * refactor code Co-authored-by: zhouzaida <zhouzaida@163.com>

* Update test data for test_iou3d * delete blank lines Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com>

* add op (group points) and its related ops (ball query and knn) in mmdet3d * refactor code * fix typo * refactor code * fix typo * refactor code * make input contiguous Co-authored-by: zhouzaida <zhouzaida@163.com>

Co-authored-by: zhouzaida <zhouzaida@163.com>

… to different backends (open-mmlab#1330) * [Feature] Choose storage backend by the prefix of filepath * refactor FileClient and add unittest * support loading from different backends * polish docstring * fix unittet * rename attribute str_like_obj to is_str_like_obj * add infer_client method * add check_exist method * rename var client to file_client * polish docstring * add join_paths method * remove join_paths and add _format_path * enhance unittest * refactor unittest * singleton pattern * fix test_clientio.py * deprecate CephBackend * enhance docstring * refactor unittest for petrel * refactor unittest for disk backend * update io.md * add concat_paths method * improve docstring * improve docstring * add isdir and copyfile for file backend * delete copyfile and add get_local_path * remove isdir method of petrel * fix typo * add comment and polish docstring * polish docstring * rename _path_mapping to _map_path * polish docstring and fix typo * refactor get_local_path * add list_dir_or_file for FileClient * add list_dir_or_file for PetrelBackend * fix windows ci * Add return docstring * polish docstring * fix typo * fix typo * deprecate the conversion from Path to str * add docs for loading checkpoints with FileClient * refactor map_path * add _ensure_methods to ensure methods have been implemented * fix list_dir_or_file * rename _ensure_method_implemented to has_method

* [Feature] Choose storage backend by the prefix of filepath * refactor FileClient and add unittest * support loading from different backends * polish docstring * fix unittet * rename attribute str_like_obj to is_str_like_obj * [Docs] Upload checkpoint to petrel oss * add infer_client method * Support uploading checkpoint to petrel oss * add check_exist method * refactor CheckpointHook * support uploading logs to ceph * rename var client to file_client * polish docstring * enhance load_from_ceph * refactor load_from_ceph * refactor TextLoggerHook * change the meaning of out_dir argument * fix test_checkpoint_hook.py * add join_paths method * remove join_paths and add _format_path * enhance unittest * refactor unittest * add a unittest for EvalHook when file backend is petrel * singleton pattern * fix test_clientio.py * deprecate CephBackend * add warning in load_from_ceph * fix type of out_suffix * enhance docstring * refactor unittest for petrel * refactor unittest for disk backend * update io.md * add concat_paths method * fix CI * mock check_exist * improve docstring * improve docstring * improve docstring * improve docstring * add isdir and copyfile for file backend * delete copyfile and add get_local_path * remove isdir method of petrel * fix typo * rename check_exists to exists * refactor code and polish docstring * fix windows ci * add comment and polish docstring * polish docstring * polish docstring * rename _path_mapping to _map_path * polish docstring and fix typo * refactor get_local_path * add list_dir_or_file for FileClient * add list_dir_or_file for PetrelBackend * fix windows ci * Add return docstring * polish docstring * fix typo * fix typo * fix typo * fix error when mocking PetrelBackend * deprecate the conversion from Path to str * add docs for loading checkpoints with FileClient * rename keep_log to keep_local * refactor map_path * add _ensure_methods to ensure methods have been implemented * fix list_dir_or_file * rename _ensure_method_implemented to has_method * refactor * polish information * format information

* Update test data of test_tin_shift * Delete tmp.engine * add pytest raises asserterror test * raise valueerror, update test log * add more comment * Apply suggestions from code review Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com> Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com>

…ch_first is True (open-mmlab#1418)

* Add mmcv itself in the docs list * modify link of docs

…mlab#1346) * [Feature] Support SigmoidFocalLoss with Cambricon MLU backend * refactor MMCV_WITH_MLU macro define * refactor NFU_ALIGN_SIZE, PAD_DOWN and split_pipeline_num * delete extra fool proofing in cpp * [Feature] Support SigmoidFocalLossBackward with Cambricon MLU backend * fix macro definition in SigmoidFocalLoss * refactor mlu files into clang-format * refactor sigmoid focal loss test * refactor Sigmoid Focal Loss file structure. * fix python lint error * fix import torch_mlu error type * fix lint * refactor clang format style to google Co-authored-by: zhouzaida <zhouzaida@163.com>

…#1507)

grimoire

LGTM.

mmcv/ops/csrc/common/pytorch_mlu_helper.hpp

mmcv/utils/pytorch_wrapper.py

setup.py

…or build condition

… MLU backend (open-mmlab#1572) * [Improve] Improve the performance of roialign with MLU backend * replace CHECK_MLU with CHECK_MLU_INPUT * [Improve] Improve the perf of nms and focallosssigmoid with MLU backend

…mmlab#1741)

* [Feature] Support tin_shift with cambricon MLU backend * [fix] Add the assertion of batch_size in tin_shift.py * [fix] fix the param check of tin_shift in cambricon code * [fix] Fix lint failure. * [fix] Fix source file lint failure. * Update mmcv/ops/tin_shift.py [Refactor] Modify the code in mmcv/ops/tin_shift.py. Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com> Co-authored-by: budefei <budefei@cambricon.com> Co-authored-by: budefei <budefei@cambricom.com> Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com>

zhouzaida · 2022-04-14T13:50:18Z

#1770 had been merged. Please resolve conflicts.

mmcv/utils/pytorch_wrapper.py

tests/test_ops/test_nms.py

setup.py

mmcv/ops/tin_shift.py

mmcv/runner/dist_utils.py

ZwwWayne · 2022-04-15T15:09:24Z

mmcv/utils/logging.py

@@ -89,7 +89,7 @@ def print_log(msg, logger=None, level=logging.INFO):
        msg (str): The message to be logged.
        logger (logging.Logger | str | None): The logger to be used.
            Some special loggers are:
-            
+


merge master and this has been fixed

mmcv/ops/tin_shift.py

setup.py

DCNSW and others added 19 commits November 3, 2021 20:49

[Feature] Add roiaware pool3d ops from mmdet3d (open-mmlab#1382)

2f9eb12

* add ops (roiaware pool3d) in mmdet3d * refactor code * fix typo Co-authored-by: zhouzaida <zhouzaida@163.com>

[Feature] Add iou3d op from mmdet3d (open-mmlab#1356)

36e7aa1

* add ops (iou3d) in mmdet3d * add unit test * refactor code * refactor code * refactor code * refactor code * refactor code Co-authored-by: zhouzaida <zhouzaida@163.com>

[Fix] Update test data for test_iou3d (open-mmlab#1427)

48c7b57

* Update test data for test_iou3d * delete blank lines Co-authored-by: Zaida Zhou <58739961+zhouzaida@users.noreply.github.com>

[Feature] Add group points ops from mmdet3d (open-mmlab#1415)

243e6c7

* add op (group points) and its related ops (ball query and knn) in mmdet3d * refactor code * fix typo * refactor code * fix typo * refactor code * make input contiguous Co-authored-by: zhouzaida <zhouzaida@163.com>

add mmdet3d op (open-mmlab#1425)

9b3cffd

Co-authored-by: zhouzaida <zhouzaida@163.com>

Add CI for pytorch 1.10 (open-mmlab#1431)

bb78be4

bump version to v1.3.16 (open-mmlab#1430)

41f0f43

fix the wrong function reference bug in BaseTransformerLayer when bat…

2ea5e5e

…ch_first is True (open-mmlab#1418)

[Docs] Add mmcv itself in the docs list (open-mmlab#1441)

115de67

* Add mmcv itself in the docs list * modify link of docs

[Improve] improve checkpoint loading log (open-mmlab#1446)

e59d3e0

[Feature] Support RoiAlign With Cambricon MLU Backend (open-mmlab#1429)

0900a63

[Feature] Support NMS with cambricon MLU backend (open-mmlab#1467)

693de23

[Feature] Support BBoxOverlaps with cambricon MLU backend (open-mmlab…

e1c7355

…#1507)

[Merge] Refactor mlu csrc and Merge mlu to master

83ede26

Merge branch 'master' of github.com:open-mmlab/mmcv into mlu

c1cf527

zhouzaida requested a review from grimoire December 7, 2021 07:55

[Refactor] Format C++ code

430cfa6

grimoire approved these changes Dec 9, 2021

View reviewed changes

zhouzaida requested a review from ZwwWayne December 10, 2021 15:37

zhouzaida reviewed Dec 11, 2021

View reviewed changes

mmcv/ops/csrc/common/pytorch_mlu_helper.hpp Outdated Show resolved Hide resolved

zhouzaida reviewed Dec 11, 2021

View reviewed changes

mmcv/utils/pytorch_wrapper.py Outdated Show resolved Hide resolved

zhouzaida reviewed Dec 11, 2021

View reviewed changes

setup.py Outdated Show resolved Hide resolved

zhouzaida added the WIP label Dec 13, 2021

zhouzaida changed the title ~~[Merge] Refactor MLU csrc and Merge mlu to master~~ [WIP] Refactor MLU csrc and Merge mlu to master Dec 13, 2021

teamwong111 and others added 2 commits December 13, 2021 18:25

[Refactor] include common_mlu_helper in pytorch_mlu_helper and refact…

105cccb

…or build condition

[Improve] Improve the performance of roialign, nms and focalloss with…

9d007f9

… MLU backend (open-mmlab#1572) * [Improve] Improve the performance of roialign with MLU backend * replace CHECK_MLU with CHECK_MLU_INPUT * [Improve] Improve the perf of nms and focallosssigmoid with MLU backend

teamwong111 and others added 2 commits December 22, 2021 12:42

[Fix] resolve conflict

ed970f1

[Improve] Improve the performance of roialign with MLU backend (open-…

5ff6c37

…mmlab#1741)

zhouzaida added the MLU label Mar 22, 2022

defei-coder and others added 5 commits March 29, 2022 11:29

add tin_shift

9f8a7ba

resolve conflicts and fix lint

f0f4949

fix mmcv.utils.__init__

70770a0

fix mmcv.utils.__init__

587dc81

resolve conflicts

f710f83

zhouzaida changed the title ~~[WIP] Refactor MLU csrc and Merge mlu to master~~ [Feature] Refactor MLU csrc and Merge mlu to master Apr 15, 2022

zhouzaida removed the WIP label Apr 15, 2022

zhouzaida reviewed Apr 15, 2022

View reviewed changes

mmcv/utils/pytorch_wrapper.py Outdated Show resolved Hide resolved

zhouzaida reviewed Apr 15, 2022

View reviewed changes

mmcv/utils/pytorch_wrapper.py Outdated Show resolved Hide resolved

zhouzaida reviewed Apr 15, 2022

View reviewed changes

tests/test_ops/test_nms.py Outdated Show resolved Hide resolved

teamwong111 added 2 commits April 15, 2022 15:29

Fix lints and change FLAG

135e77d

fix setup and refine

a67c28d

zhouzaida reviewed Apr 15, 2022

View reviewed changes

setup.py Outdated Show resolved Hide resolved

ZwwWayne reviewed Apr 15, 2022

View reviewed changes

mmcv/ops/tin_shift.py Outdated Show resolved Hide resolved

ZwwWayne reviewed Apr 15, 2022

View reviewed changes

mmcv/runner/dist_utils.py Show resolved Hide resolved

ZwwWayne reviewed Apr 15, 2022

View reviewed changes

remove a redundant line

1e1b262

zhouzaida reviewed Apr 16, 2022

View reviewed changes

mmcv/ops/tin_shift.py Outdated Show resolved Hide resolved

remove an unnecessary 'f'

9150d25

zhouzaida reviewed Apr 16, 2022

View reviewed changes

setup.py Outdated Show resolved Hide resolved

fix compilation error

8d9c65d

zhouzaida approved these changes Apr 16, 2022

View reviewed changes

zhouzaida changed the title ~~[Feature] Refactor MLU csrc and Merge mlu to master~~ [Feature] Add several MLU ops Apr 16, 2022

zhouzaida merged commit 362a90f into open-mmlab:master Apr 16, 2022

teamwong111 deleted the mlu branch April 19, 2022 07:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature] Add several MLU ops #1563

[Feature] Add several MLU ops #1563

teamwong111 commented Dec 7, 2021

grimoire left a comment

zhouzaida commented Apr 14, 2022

ZwwWayne Apr 15, 2022

[Feature] Add several MLU ops #1563

[Feature] Add several MLU ops #1563

Conversation

teamwong111 commented Dec 7, 2021

Motivation

Modification

BC-breaking (Optional)

Use cases (Optional)

Checklist

grimoire left a comment

Choose a reason for hiding this comment

zhouzaida commented Apr 14, 2022

ZwwWayne Apr 15, 2022

Choose a reason for hiding this comment