Merge branch 'master' into 'master'

Enable neon addn for mobilenet v2

See merge request !349

mace/kernels/addn.h

@@ -77,12 +77,6 @@ struct AddNFunctor {
   }
 };
 
-template <>
-void AddNFunctor<DeviceType::NEON, float>::operator()(
-    const std::vector<const Tensor *> &input_tensors,
-    Tensor *output_tensor,
-    StatsFuture *future);
-
 template <typename T>
 struct AddNFunctor<DeviceType::OPENCL, T> {
   void operator()(const std::vector<const Tensor *> &input_tensors,

mace/ops/addn.cc

@@ -25,6 +25,12 @@ void Register_AddN(OperatorRegistry *op_registry) {
                                      .TypeConstraint<half>("T")
                                      .Build(),
                     AddNOp<DeviceType::OPENCL, half>);
+
+  REGISTER_OPERATOR(op_registry, OpKeyBuilder("AddN")
+                                     .Device(DeviceType::NEON)
+                                     .TypeConstraint<float>("T")
+                                     .Build(),
+                    AddNOp<DeviceType::NEON, float>);
 }
 
 }  // namespace ops