Merge pull request #6 from PaddlePaddle/develop

更新数据

x2paddle/op_mapper/caffe_op_mapper.py

@@ -363,7 +363,7 @@ class CaffeOpMapper(OpMapper):
         input = self.graph.get_bottom_node(node, idx=0, copy=True)
         attr = {
             'n': params.local_size,
-            'k': 1.0,
+            'k': params.k,
             'alpha': alpha,
             'beta': params.beta,
             'name': string(node.layer_name)
@@ -649,7 +649,8 @@ class CaffeOpMapper(OpMapper):
             ]).astype('float32')
             scale = 0
         else:
-            node.data = [np.squeeze(i) for i in node.data]
+
+            node.data = [np.squeeze(i).astype('float32') for i in node.data]
             mean, variance, scale = node.data
         # Prescale the stats
         scaling_factor = 1.0 / scale if scale != 0 else 0
@@ -684,8 +685,10 @@ class CaffeOpMapper(OpMapper):
                 input_c,
             ]).astype('float32')
         else:
-            self.weights[node.layer_name + '_scale'] = np.squeeze(node.data[0])
-            self.weights[node.layer_name + '_offset'] = np.squeeze(node.data[1])
+            self.weights[node.layer_name + '_scale'] = np.squeeze(
+                node.data[0]).astype('float32')
+            self.weights[node.layer_name + '_offset'] = np.squeeze(
+                node.data[1]).astype('float32')
         params = node.layer.scale_param
         axis = params.axis
         num_axes = params.num_axes