This reverts commit bc28cf61.

* small AverageOptimizer enhance.

* clean

* clean

* Add fill_zeros_array op. This op is used for zero-filling an LoDTensorArray.

* merge fill_zeros_array_op with fill_zeros_like_op

* add unit_test for fill_zeros_like for array

* bnorm+relu fuse for mkldnn

* separate fuse_relu function

* bug fix

* proper while range in inference_transpiler

* description fix

* review fix

* review fix

* unit test for fwd batch norm+relu MKLDNN fuse

* optimize bipartite_match_op in large scale input

* Speed depthwise transposed conv2d.

* Set zero outside functor

* elementwise_add with bcast: Brian's implementation by Brian added, with default bcasts

* elementwise_add with bcast: GetExpectedKernelType added to elementwise_op

* elementwise_add with bcast: use_mkldnn attribute added

* elementwise_add with bcast: changes after review and some formatting

* elementwise_add with bcast: changes after style check

* elementwise_add with bcast: changes after style check cont.

* elementwise_add with bcast: MKLDNN unittests added

* elementwise_add with bcast: original unittests with use_mkldnn flag

* elementwise_add with bcast: handling of MKLDNN format corrected

* elementwise_add with bcast: setting MKLDNN format turned into lambda

* elementwise_add with bcast: MKDNN format setting turned into separate function

* elementwise_add with bcast: condition for choosing MKLDNN simplified

* elementwise_add with bcast: fix for MKLDNN format set incorrectly in bcasts

* elementwise_add with bcast: changes in unittests for broadcasts

* elementwise_add with bcast: fixes in unittests regarding dimensions

* elementwise_add with bcast: bring back correct format setting in mklml grad path

* elementwise_add with bcast: fixed compilation error

This reverts commit 1eeb11ef.

* make deadline configurable

* configurable deadline

* update

* fix grpc deadline exceeded

- Added hash function inside of MKLDNN softmax op to be used as handle for primitives stroing in a
context

- Style fixes to softmax mkldnn op

- Fixes after review

- Coding style

- Fix to style

- style fixes

- style fix

- style fixes

- Fix to cody style check

- Rephrasing a comment

fix t obroken merge

Fixes to rebase

Conflicts:
	benchmark/fluid/models/machine_translation.py
	cmake/external/mkldnn.cmake
	paddle/fluid/operators/softmax_mkldnn_op.cc

- Bumped revision of MKL-DNN up to have softmax backward primitive

- Added choosing MKLDNN softmax grad operator

- First reuse of softmax backward

- Reinvented reusing for softmax

- Fix to crash in reinvented reuse

- Clang format fixes

- Clang format fixes

- Improved softmax mkldnn reuse mechanism

- clang format fixes

- Fix to broken merge

- Fix

This reverts commit 4d8e8ee2, reversing
changes made to d6a9f005.