From c37da0bd3ba14318198bfc6dd8f8ba5e13c1a269 Mon Sep 17 00:00:00 2001
From: yangyaming <mxscmxsc@gmail.com>
Date: Wed, 5 Jul 2017 18:36:47 +0800
Subject: [PATCH] Remove hasParamInitialValue flag.

---
 paddle/gserver/tests/LayerGradUtil.cpp  | 9 +++------
 paddle/gserver/tests/LayerGradUtil.h    | 2 --
 paddle/gserver/tests/test_LayerGrad.cpp | 1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/paddle/gserver/tests/LayerGradUtil.cpp b/paddle/gserver/tests/LayerGradUtil.cpp
index 66aafba844..15b8cedeb8 100644
--- a/paddle/gserver/tests/LayerGradUtil.cpp
+++ b/paddle/gserver/tests/LayerGradUtil.cpp
@@ -498,12 +498,9 @@ void initTestLayer(TestConfig testConf,
         paraConfig.add_dims((*layerMap)[input.input_layer_name()]->getSize());
         paraConfig.add_dims(testConf.layerConfig.size());
       }
-      if (testConf.hasParamInitialValue) {
-        paraConfig.set_initial_mean(testConf.paramInitialMean);
-        paraConfig.set_initial_std(testConf.paramInitialStd);
-      } else {
-        paraConfig.set_initial_std(1);
-      }
+      CHECK_GE(testConf.paramInitialStd, 0);
+      paraConfig.set_initial_mean(testConf.paramInitialMean);
+      paraConfig.set_initial_std(testConf.paramInitialStd);
       initParameter(paraName, paraSize, inputDef.isStatic, false, paraConfig);
     }
   }
diff --git a/paddle/gserver/tests/LayerGradUtil.h b/paddle/gserver/tests/LayerGradUtil.h
index 9dbd202757..d299b4dd09 100644
--- a/paddle/gserver/tests/LayerGradUtil.h
+++ b/paddle/gserver/tests/LayerGradUtil.h
@@ -127,7 +127,6 @@ struct TestConfig {
   size_t biasSize;
   real paramInitialMean;
   real paramInitialStd;
-  bool hasParamInitialValue;
   bool testAccumulate;
   bool testState;
   bool staticBias;
@@ -136,7 +135,6 @@ struct TestConfig {
       : biasSize(0),
         paramInitialMean(0.0),
         paramInitialStd(1.0),
-        hasParamInitialValue(false),
         testAccumulate(true),
         testState(false),
         staticBias(false),
diff --git a/paddle/gserver/tests/test_LayerGrad.cpp b/paddle/gserver/tests/test_LayerGrad.cpp
index 6441e08b48..bf0136a10f 100644
--- a/paddle/gserver/tests/test_LayerGrad.cpp
+++ b/paddle/gserver/tests/test_LayerGrad.cpp
@@ -1661,7 +1661,6 @@ TEST(Layer, PadLayer) {
 
 TEST(Layer, CrossChannelNormLayer) {
   TestConfig config;
-  config.hasParamInitialValue = true;
   config.paramInitialMean = 1.;
   config.paramInitialStd = 0.;
   config.layerConfig.set_type("norm");
-- 
GitLab