Fix merge and style error

paddle/gserver/layers/CRFLayer.cpp

@@ -42,8 +42,7 @@ bool CRFLayer::init(const LayerMap& layerMap,
   CHECK_EQ(parameters_[0]->getSize(), numClasses_ * (numClasses_ + 2));
 
   parameter_ = parameters_[0];
-  weight_.reset(
-      new Weight(numClasses_ + 2, numClasses_, parameter_));
+  weight_.reset(new Weight(numClasses_ + 2, numClasses_, parameter_));
 
   // We don't need sequenceStartPositions because each sample of output_ is
   // for the cost of one sequence.
@@ -95,16 +94,18 @@ void CRFLayer::backward(const UpdateCallback& callback) {
   for (int i = 0; i < numSequences; ++i) {
     crfs_[i].backward(output.value->getData() + numClasses_ * starts[i],
                       label.ids->getData() + starts[i],
-                      starts[i + 1] - starts[i], needWGrad);
-    real instanceWeight = weightLayer_ ?
-      getInputValue(*weightLayer_)->getElement(i, 0) : real(1.0f);
+                      starts[i + 1] - starts[i],
+                      needWGrad);
+    real instanceWeight = weightLayer_
+                              ? getInputValue(*weightLayer_)->getElement(i, 0)
+                              : real(1.0f);
     instanceWeight *= coeff_;
 
     MatrixPtr grad = output.grad->subRowMatrix(starts[i], starts[i + 1]);
     grad->add(*crfs_[i].getXGrad(), real(1.0f), instanceWeight);
     if (needWGrad) {
-      weight_->getWGrad()->add(*crfs_[i].getWGrad(), real(1.0f),
-          instanceWeight);
+      weight_->getWGrad()->add(
+          *crfs_[i].getWGrad(), real(1.0f), instanceWeight);
     }
   }
 

paddle/gserver/layers/CRFLayer.h

@@ -37,9 +37,9 @@ protected:
   size_t numClasses_;
   ParameterPtr parameter_;
   std::vector<LinearChainCRF> crfs_;
-  LayerPtr weightLayer_;  // weight for each sequence
+  LayerPtr weightLayer_;            // weight for each sequence
   std::unique_ptr<Weight> weight_;  // parameters
-  real coeff_;            // weight for the layer
+  real coeff_;                      // weight for the layer
 };
 
 }  // namespace paddle

paddle/gserver/tests/test_CRFLayerGrad.cpp

@@ -21,13 +21,10 @@ limitations under the License. */
 #include "TestUtil.h"
 #include "LayerGradUtil.h"
 
-using namespace paddle; // NOLINT
+using namespace paddle;  // NOLINT
 
-P_DECLARE_bool(use_gpu);
-P_DECLARE_int32(gpu_id);
-P_DECLARE_double(checkgrad_eps);
-P_DECLARE_bool(thread_local_rand_use_global_seed);
-P_DECLARE_bool(prev_batch_state);
+DECLARE_int32(gpu_id);
+DECLARE_bool(thread_local_rand_use_global_seed);
 
 static inline bool getNextSequence(std::vector<int>& seq, int numClasses) {
   for (auto& v : seq) {
@@ -96,8 +93,8 @@ TEST(CRFLayer, cost) {
 
       real diff = fabs(trueCost - cost);
       diff /= fabs(cost) < fabs(trueCost) ? fabs(cost) : fabs(trueCost);
-      VLOG(1) << "cost=" << cost << " trueCost=" << trueCost
-        << " diff=" << diff << std::endl;
+      VLOG(1) << "cost=" << cost << " trueCost=" << trueCost << " diff=" << diff
+              << std::endl;
       if (typeid(real) == typeid(double)) {  // NOLINT
         EXPECT_LE(diff, 1e-10);
       } else {
@@ -107,9 +104,7 @@ TEST(CRFLayer, cost) {
   }
 }
 
-inline real epsilon() {
-  return typeid(real) == typeid(double) ? 1e-10 : 0.06;
-}
+inline real epsilon() { return typeid(real) == typeid(double) ? 1e-10 : 0.06; }
 
 TestConfig initTestConfig(size_t numClasses, bool withWeight) {
   TestConfig config;
@@ -117,16 +112,17 @@ TestConfig initTestConfig(size_t numClasses, bool withWeight) {
   config.layerConfig.set_size(numClasses);
   config.biasSize = 0;
 
-  config.inputDefs.push_back({INPUT_SEQUENCE_DATA, "layer_0",
-      numClasses, numClasses * (numClasses + 2)});
+  config.inputDefs.push_back({INPUT_SEQUENCE_DATA,
+                              "layer_0",
+                              numClasses,
+                              numClasses * (numClasses + 2)});
   config.layerConfig.add_inputs();
-  config.inputDefs.push_back({INPUT_SEQUENCE_LABEL, "layer_label",
-      numClasses, 0});
+  config.inputDefs.push_back(
+      {INPUT_SEQUENCE_LABEL, "layer_label", numClasses, 0});
   config.layerConfig.add_inputs();
 
   if (withWeight) {
-    config.inputDefs.push_back({INPUT_DENSE_DIM_DATA, "layer_weight",
-        1, 0});
+    config.inputDefs.push_back({INPUT_DENSE_DIM_DATA, "layer_weight", 1, 0});
     config.layerConfig.add_inputs();
   }