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

add batch norm test #13625

Merged

anirudh2290 merged 7 commits into apache:master from azai91:test/mkldnn-batch-norm-op-2

Dec 13, 2018

Contributor

azai91 commented Dec 12, 2018 •

edited

Loading

Description

Add tests for MKLDNN batch norm operator The creates ndarray inputs and then runs it separately through the native CPU BN operator and MKLDNN BN operator. Creating the BN test requires a different test helper as the BN operation writes to the input, so identical arrays of equal value must be created and then ran through the native / MKLDNN operators.

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


          add batch norm test

89dfb58

azai91 requested a review from anirudh2290 as a code owner

December 12, 2018 09:35

Contributor Author

azai91 commented Dec 12, 2018

@TaoLv please review

azai91 mentioned this pull request

Test/mkldnn batch norm op #13084

Closed

6 tasks

TaoLv reviewed

View reviewed changes

tests/cpp/operator/mkldnn_operator_test.cc Outdated

                 }
               }
+              void TestOpExBNBackward(const OpAttrs &forward_attrs,
+                                    const OpAttrs &backwards_attrs,

Member

TaoLv Dec 12, 2018

fix indent.

tests/cpp/operator/mkldnn_operator_test.cc Outdated

+                                    const std::vector<NDArray*> &inputs,
+                                    const std::vector<NDArray*> &outputs,
+                                    const NDArrayAttrs &in_arr,
+                                    const NDArrayAttrs &out_arr) {

Member

TaoLv Dec 12, 2018

out_arr is not used?

tests/cpp/operator/mkldnn_operator_test.cc Outdated

+                std::vector<NDArray*> backwards_outputs(backwards_attrs.num_outputs);
+                std::vector<NDArray*> backwards_ex_outputs(backwards_attrs.num_outputs);
+                std::vector<OpReqType> back_req(backwards_attrs.num_outputs);

Member

TaoLv Dec 12, 2018

backwards_req

tests/cpp/operator/mkldnn_operator_test.cc Outdated

		backwards_input[6] = inputs[3]; // moving mean
		backwards_input[7] = inputs[4]; // moving var

Member

TaoLv Dec 12, 2018

redundant blank line

tests/cpp/operator/mkldnn_operator_test.cc Outdated

		Engine::Get()->WaitForAll();
		}

Member

TaoLv Dec 12, 2018

ditto

tests/cpp/operator/mkldnn_operator_test.cc Outdated

		}


		for (int i = 0; i < backwards_attrs.num_outputs; i++)

Member

TaoLv Dec 12, 2018

merge this for loop into the previous one?

Member

TaoLv commented Dec 12, 2018

Seems CI doesn't work. Can we expect these test cases to work without those operator changes in #13084?

azai91 and others added 6 commits

December 12, 2018 09:30


          fix formatting

8ad5919


          use out_arr as input

7d4b367


          fix typo

ab68f5d


          remove const

e8d51ee


          use ptr

593a084


          eval ptr

207a52f

Contributor Author

azai91 commented Dec 12, 2018

Yes, the test cases for BN is (for now) less stringent than the other C++ test cases. Normally, we run through a large set of fixtures (regular NDArray, mkldnn NDarray, reshaped, etc). However, in the BN implementation we are unable to handle reshaped mkldnn array.

For example, we cannot call GetMKLDNNData on views (reshaped) arrays https://github.com/apache/incubator-mxnet/blob/3d64d15e69ce6afba728a92b18753a868b6c3298/src/operator/nn/mkldnn/mkldnn_batch_norm-inl.h#L198

https://github.com/apache/incubator-mxnet/blob/3d64d15e69ce6afba728a92b18753a868b6c3298/src/operator/nn/mkldnn/mkldnn_batch_norm-inl.h#L394

Normally, we call Reorder2Default in this case to produce a new array that isn't a view and then continue on. (https://github.com/apache/incubator-mxnet/blob/3d64d15e69ce6afba728a92b18753a868b6c3298/src/operator/nn/mkldnn/mkldnn_act.cc#L164). However, BN is special because we write to the inputs (https://github.com/apache/incubator-mxnet/blob/3d64d15e69ce6afba728a92b18753a868b6c3298/src/operator/nn/mkldnn/mkldnn_batch_norm-inl.h#L260), so making a copy of inputs, then writing to those copies will not have the desired effect.

For now, all this PR does is provide test cases for our current implementations.

anirudh2290 approved these changes

View reviewed changes

anirudh2290 merged commit b45e127 into apache:master

zhaoyao73 added a commit to zhaoyao73/incubator-mxnet that referenced this pull request


          Merge remote-tracking branch 'upstream/master'

76e901a

* upstream/master: (38 commits)
  Feature/mkldnn static (apache#13628)
  Fix the bug of BidirectionalCell (apache#13575)
  Set install path for libmxnet.so dynamic lib on Mac OS (apache#13629)
  add batch norm test (apache#13625)
  Scripts for building dependency libraries of MXNet (apache#13282)
  fix quantize pass error when the quantization supported Op are excluded in the model (apache#13596)
  Optimize C++ API (apache#13496)
  Fix warning in waitall doc (apache#13618)
  [MXNET-1225] Always use config.mk in make install instructions (apache#13364)
  [MXNET-1224]: improve scala maven jni build and packing. (apache#13493)
  [MXNET-1155] Add scala packageTest utility (apache#13046)
  fix the Float not showing correctly problem (apache#13617)
  apache#13385 [Clojure] - Turn examples into integration tests (apache#13554)
  Add Intel MKL blas to Jenkins (apache#13607)
  Revert "[MXNET-1198] MXNet Java API (apache#13162)"
  Reducing the length of setup tutorial (apache#13306)
  [MXNET-1182] Predictor example (apache#13237)
  [MXNET-1187] Added Java SSD Inference Tutorial for website (apache#13201)
  add defaults and clean up the tests (apache#13295)
  [MXNET-1181] Added command line alternative to IntelliJ in install instructions (apache#13267)
  ...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet