Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[v1.x] Backport #17689 and #17884 to v1.x branch #18064

Merged
merged 5 commits into from
Apr 18, 2020
Merged

[v1.x] Backport #17689 and #17884 to v1.x branch #18064

merged 5 commits into from
Apr 18, 2020

Conversation

wuxun-zhang
Copy link
Contributor

Description

As title.
@ciyongch @pengzhao-intel @TaoLv

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 https://mxnet-ci-doc.s3-accelerate.dualstack.amazonaws.com/PR-$PR_ID/$BUILD_ID/index.html
  • To the best of my 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

@mxnet-bot
Copy link

Hey @wuxun-zhang , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [website, windows-cpu, centos-cpu, clang, windows-gpu, centos-gpu, unix-gpu, edge, sanity, unix-cpu, miscellaneous]

Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@ciyongch
Copy link
Contributor

Adding this PR to v1.7.0 roadmap #16864

@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [all]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [sanity, windows-cpu, unix-gpu, website, centos-cpu, windows-gpu, clang, centos-gpu, miscellaneous, edge, unix-cpu]

@wuxun-zhang
Copy link
Contributor Author

wuxun-zhang commented Apr 16, 2020 •
edited
Loading

@ElaineBao I merged the code changes of mkldnn_pooling.cc in PR#18067, could you please help double check for this part? Thanks.

@ElaineBao
Copy link
Contributor

@ElaineBao I merged the code changes of mkldnn_pooling.cc in PR#18067, could you please help double check for this part? Thanks.

LGTM for this part, thank you :)

@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu, website, edge]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [edge, website, unix-gpu]

@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

@wuxun-zhang
[MKLDNN] apply MKLDNNRun to quantized_act/transpose (apache#17689)
b652c4d 
* apply MKLDNNRun to quantized_act/transpose ops

* run CI
@wuxun-zhang
[MKL-DNN] Integrate Conv3d and Pool3d/1d (apache#17884)
58dc450 
* Integrate MKl-DNN conv3d and pool3d/1d

* fix UT & address comments

* clean code

* rebase against latest master
@wuxun-zhang
fix conflicts
2807fb6
@wuxun-zhang
fix CI
ea1c080
@wuxun-zhang
rebase
d9609d3
@wuxun-zhang
Copy link
Contributor Author

@mxnet-bot run ci [unix-gpu]

Still stuck after test_operator_gpu:test_np_true_divide.

@mxnet-bot
Copy link

Jenkins CI successfully triggered : [unix-gpu]

pengzhao-intel
pengzhao-intel approved these changes Apr 18, 2020
View reviewed changes
Copy link
Contributor

@pengzhao-intel pengzhao-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pengzhao-intel pengzhao-intel merged commit 4cf2ad3 into apache:v1.x Apr 18, 2020
@TaoLv TaoLv mentioned this pull request Jul 1, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pengzhao-intel pengzhao-intel pengzhao-intel approved these changes

@anirudh2290 anirudh2290 Awaiting requested review from anirudh2290 anirudh2290 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@wuxun-zhang @mxnet-bot @ciyongch @ElaineBao @pengzhao-intel