Merge pull request #452 from qingqing01/bug_fix_concat

Bug fix in testing mode.
PaddlePaddle · Nov 13, 2016 · 805856a · 805856a
2 parents b87427b + 48ea047
commit 805856a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/paddle/gserver/layers/ConcatenateLayer.cpp b/paddle/gserver/layers/ConcatenateLayer.cpp
@@ -160,7 +160,9 @@ void ConcatenateLayer2::forward(PassType passType) {
     size_t startCol = projCol_[i].first;
     size_t endCol = projCol_[i].second;
     projOutput_[i].value = output_.value->subColMatrix(startCol, endCol);
-    projOutput_[i].grad = output_.grad->subColMatrix(startCol, endCol);
+    if (output_.grad) {
+      projOutput_[i].grad = output_.grad->subColMatrix(startCol, endCol);
+    }
   }
 
   {

diff --git a/paddle/gserver/layers/SpatialPyramidPoolLayer.cpp b/paddle/gserver/layers/SpatialPyramidPoolLayer.cpp
@@ -112,7 +112,9 @@ void SpatialPyramidPoolLayer::forward(PassType passType) {
     size_t startCol = projCol_[i].first;
     size_t endCol = projCol_[i].second;
     projOutput_[i].value = output_.value->subColMatrix(startCol, endCol);
-    projOutput_[i].grad = output_.grad->subColMatrix(startCol, endCol);
+    if (output_.grad) {
+      projOutput_[i].grad = output_.grad->subColMatrix(startCol, endCol);
+    }
   }
   for (size_t i = 0; i < pyramidHeight_; i++) {
     poolProjections_[i]->forward(&getInput(0), &projOutput_[i], passType);