Merge pull request #4045 from chengduoZH/fix_SwitchOrderLayer

wanghaoshuang · web-flow · commit 0f42e5649ef6 · 2017-09-13T12:01:29.000+08:00
fix SwitchOrderLayer forward
diff --git a/paddle/gserver/layers/SwitchOrderLayer.cpp b/paddle/gserver/layers/SwitchOrderLayer.cpp
@@ -83,8 +83,7 @@ void SwitchOrderLayer::forward(PassType passType) {
   setOutDims();
   resetOutput(outDims_[0], outDims_[1] * outDims_[2] * outDims_[3]);
   if (heightAxis_.size() > 0) {
-    getOutputValue()->reshape(reshapeHeight_, reshapeWidth_);
-    getOutputGrad()->reshape(reshapeHeight_, reshapeWidth_);
+    resetOutput(reshapeHeight_, reshapeWidth_);
   }
 
   // switch NCHW to NHWC

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ void SwitchOrderLayer::forward(PassType passType) {`
`83`	`83`	`setOutDims();`
`84`	`84`	`resetOutput(outDims_[0], outDims_[1] * outDims_[2] * outDims_[3]);`
`85`	`85`	`if (heightAxis_.size() > 0) {`
`86`		`- getOutputValue()->reshape(reshapeHeight_, reshapeWidth_);`
`87`		`- getOutputGrad()->reshape(reshapeHeight_, reshapeWidth_);`
	`86`	`+ resetOutput(reshapeHeight_, reshapeWidth_);`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`// switch NCHW to NHWC`