Merge pull request #7395 from tensor-tang/fixds2

fix ds2 issue

Author: luotao1

paddle/gserver/layers/MKLDNNLayer.cpp

@@ -132,6 +132,8 @@ void MKLDNNLayer::reshapeInput(int& batchsize,
   if (w != 0) {
     width = w;
   }
+  height = height != 0 ? height : 1;
+  width = width != 0 ? width : 1;
 }
 
 void MKLDNNLayer::reshapeOutput(size_t height, size_t width) {

paddle/gserver/layers/MKLDNNLayer.h

@@ -98,6 +98,8 @@ class MKLDNNLayer : public Layer {
 public:
   explicit MKLDNNLayer(const LayerConfig& config)
       : Layer(config),
+        ih_(0),
+        iw_(0),
         condition_(0),
         needResetBwd_(true),
         outputOnlyMKLDNN_(false),