modify for update from trunk

paddle/operators/norm_op.cc

@@ -18,7 +18,7 @@ namespace operators {
 
 class NormOpMaker : public framework::OpProtoAndCheckerMaker {
  public:
-  NormOpMaker(framework::OpProto* proto, framework::OpAttrChecker* op_checker)
+  NormOpMaker(OpProto* proto, OpAttrChecker* op_checker)
       : OpProtoAndCheckerMaker(proto, op_checker) {
     AddInput(
         "X",

python/paddle/v2/fluid/tests/test_norm_op.py

@@ -49,7 +49,7 @@ class TestNormOp(OpTest):
         self.check_grad(['X'], 'Out')
 
     def init_test_case(self):
-        self.shape = [1, 3, 2, 2]
+        self.shape = [2, 3, 2, 2]
         self.epsilon = 1e-6