[Done] BilinearResize2D optimized #16292

chinakook · 2019-09-27T03:20:25Z

Description

align_corners param in resize op is first introduced by ten*low, then py*ch also bring it to its interpolate op. Our mx.nd.contrib.BilinearResize2D op only support align_corners=True before. Now, We bring align_corners=False(same as OpenCV resize in LINEAR mode) support as sometimes it will get more efficient.
Optimize the performance of foreward and backward of mx.nd.contrib.BilinearResize2D.
Optimize the performance of mx.nd.contrib.BilinearResize2D in fp16 as it is too slow before. As I've tested, If we explictly set dtype to float16, we can speed up our training when compared to float32. So we can speed up the training of gluoncv segmentation models later.
Fix the nd.image.resize op, keep it consistent in CPU and GPU
Remove the consistency tests in test_gluon_transforms.py as it's not right.

Checklist

Essentials

Please feel free to remove inapplicable items for your PR.

The PR title starts with [MXNET-$JIRA_ID], where $JIRA_ID refers to the relevant JIRA issue created (except PRs with tiny changes)
Changes are complete (i.e. I finished coding on this PR)
All changes have test coverage:
Unit tests are added for small changes to verify correctness (e.g. adding a new operator)
Nightly tests are added for complicated/long-running ones (e.g. changing distributed kvstore)
Build tests will be added for build configuration changes (e.g. adding a new build option with NCCL)
Code is well-documented:
For user-facing API changes, API doc string has been updated.
For new C++ functions in header files, their functionalities and arguments are documented.
For new examples, README.md is added to explain the what the example does, the source of the dataset, expected performance on test set and reference to the original paper if applicable
Check the API doc at http://mxnet-ci-doc.s3-accelerate.dualstack.amazonaws.com/PR-$PR_ID/$BUILD_ID/index.html
To the my best knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change

Changes

Feature1, tests, (and when applicable, API doc)
Feature2, tests, (and when applicable, API doc)

Comments

If this change is a backward incompatible change, why must this change be made.
Interesting edge cases to note here

marcoabreu · 2019-09-27T08:27:20Z

Test? :)

chinakook · 2019-09-27T09:17:54Z

Yes, I've tested compared to interpolate of py*ch and It works good. There are no enough test cases of this op, should we add?

marcoabreu · 2019-09-27T10:19:51Z

Yeah, it would be great if you could add testcases

add BilinearResize2D test fix BilinearResize2D align_corners test fix code layout fix resize gpu and cpu consistency fix bilinear reisze test bug close transforms.resize test

chinakook · 2019-10-11T05:01:03Z

@wkcn @zhanghang1989 @marcoabreu for review

wkcn

Thanks for your contribution!
If there is some code reference, please add the note which part is Adapted from xxx and its link, like https://github.com/apache/incubator-mxnet/blob/master/src/operator/pad.cc#L34.

Thx!

src/operator/contrib/bilinear_resize-inl.cuh

python/mxnet/gluon/data/vision/transforms.py

marcoabreu · 2019-10-11T12:17:27Z

src/operator/image/resize.cu

@@ -65,7 +65,7 @@ void ResizeImplCUDA(mshadow::Stream<gpu> *s,
  cudaStream_t stream = mshadow::Stream<gpu>::GetStream(s);
  caffe_gpu_interp2_kernel<gpu, DType, AccReal>
  <<<blocks, threads , 0, stream>>>(
-    num_kernels, rheight, rwidth, input, output, layout);
+    num_kernels, rheight, rwidth, /*align_corners=*/false, input, output);


Please remove commented out code

marcoabreu · 2019-10-11T12:18:02Z

tests/python/gpu/test_gluon_transforms.py

@@ -146,12 +146,16 @@ def py_bilinear_resize_nhwc(x, outputHeight, outputWidth):
                            w1lambda*x[b][h1+h1p][w1+w1p][c])
        return y

+    # TODO: close tests below, because `transforms.Resize` use BilinearResize2D(with align_corners=False)


Please remove them then and put the reason into the PR description

src/operator/contrib/bilinear_resize-inl.cuh

src/operator/contrib/bilinear_resize-inl.h

src/operator/contrib/bilinear_resize-inl.cuh

src/operator/contrib/bilinear_resize.cc

chinakook · 2019-10-14T00:59:36Z

@wkcn It's all resolved, can we merge this?

tests/python/gpu/test_gluon_transforms.py

wkcn

Thank you for the great contribution!

LGTM : )

tests/python/gpu/test_gluon_transforms.py

fix resize.cu

wkcn · 2019-11-12T11:03:29Z

Merged. Thanks for your great contribution!

Add align_corners parameter to bilinear resize op.

d5751ca

chinakook added 2 commits September 28, 2019 10:25

Add align_corners parameter to bilinear resize op.

fbad970

add BilinearResize2D test fix BilinearResize2D align_corners test fix code layout fix resize gpu and cpu consistency fix bilinear reisze test bug close transforms.resize test

merge remote conflict

5854bc3

chinakook requested a review from szha as a code owner September 28, 2019 03:11

optimize BilinearResize2D backward performance; improve fp16 performance

ae18472

chinakook changed the title ~~Add align_corners parameter to bilinear resize op.~~ BilinearResize2D optimizeed Sep 30, 2019

chinakook changed the title ~~BilinearResize2D optimizeed~~ [WIP] BilinearResize2D optimized Sep 30, 2019

chinakook added 2 commits September 30, 2019 22:16

optimize BilinearResize2D forward kernel

30f7e0b

lint

1fd2242

chinakook changed the title ~~[WIP] BilinearResize2D optimized~~ [Done] BilinearResize2D optimized Oct 3, 2019

wkcn reviewed Oct 11, 2019

View reviewed changes

src/operator/contrib/bilinear_resize-inl.cuh Outdated Show resolved Hide resolved

src/operator/contrib/bilinear_resize-inl.cuh Outdated Show resolved Hide resolved

wkcn reviewed Oct 11, 2019

View reviewed changes

python/mxnet/gluon/data/vision/transforms.py Show resolved Hide resolved

chinakook added 2 commits October 11, 2019 14:52

fix forceinline and add

f050009

lint

b0d885f

marcoabreu reviewed Oct 11, 2019

View reviewed changes

remove commented out code and remove transforms.Resize gpu test

ccef3f3

zhanghang1989 approved these changes Oct 11, 2019

View reviewed changes

wkcn reviewed Oct 12, 2019

View reviewed changes

Dtype to float in cpu implementation

1c2d1fb

wkcn reviewed Oct 14, 2019

View reviewed changes

tests/python/gpu/test_gluon_transforms.py Show resolved Hide resolved

wkcn approved these changes Oct 14, 2019

View reviewed changes

tests/python/gpu/test_gluon_transforms.py Show resolved Hide resolved

chinakook and others added 3 commits October 16, 2019 11:09

Merge branch 'master' into bilinear_align

e747dea

Merge branch 'master' into bilinear_align

707b7d1

retrigger CI

bfa81c6

wkcn added the pr-awaiting-merge Review and CI is complete. Ready to Merge label Nov 12, 2019

wkcn removed the pr-awaiting-merge Review and CI is complete. Ready to Merge label Nov 12, 2019

wkcn and others added 2 commits November 12, 2019 10:08

retrigger CI

ee645c4

Update resize.cu

21abbe1

wkcn added the pr-awaiting-merge Review and CI is complete. Ready to Merge label Nov 12, 2019

wkcn and others added 2 commits November 12, 2019 12:27

retrigger CI

26112e7

Update resize.cu

363d117

fix resize.cu

wkcn merged commit 3885bbe into apache:master Nov 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Done] BilinearResize2D optimized #16292

[Done] BilinearResize2D optimized #16292

chinakook commented Sep 27, 2019 •

edited

Loading

marcoabreu commented Sep 27, 2019

chinakook commented Sep 27, 2019

marcoabreu commented Sep 27, 2019

chinakook commented Oct 11, 2019

wkcn left a comment

marcoabreu Oct 11, 2019

marcoabreu Oct 11, 2019

chinakook commented Oct 14, 2019

wkcn left a comment

wkcn commented Nov 12, 2019

[Done] BilinearResize2D optimized #16292

[Done] BilinearResize2D optimized #16292

Conversation

chinakook commented Sep 27, 2019 • edited Loading

Description

Checklist

Essentials

Changes

Comments

marcoabreu commented Sep 27, 2019

chinakook commented Sep 27, 2019

marcoabreu commented Sep 27, 2019

chinakook commented Oct 11, 2019

wkcn left a comment

Choose a reason for hiding this comment

marcoabreu Oct 11, 2019

Choose a reason for hiding this comment

marcoabreu Oct 11, 2019

Choose a reason for hiding this comment

chinakook commented Oct 14, 2019

wkcn left a comment

Choose a reason for hiding this comment

wkcn commented Nov 12, 2019

chinakook commented Sep 27, 2019 •

edited

Loading