Merge pull request #804 from qnqinan/develop

add initialization of padding parameter in feed op closed #803

src/operators/feed_op.h

@@ -56,6 +56,8 @@ class FeedOp : public framework::OperatorBase<DeviceType> {
     args.image.channels = input->dims()[1];
     args.image.height = input->dims()[2];
     args.image.width = input->dims()[3];
+    args.image.pad_height = 0;
+    args.image.pad_width = 0;
     args.output.address = output_ptr;
     fpga::PerformBypass(args);
   }

tools/op.cmake

@@ -108,6 +108,7 @@ if ("FPGAnets" IN_LIST NET)
   set(DROPOUT_OP ON)
   set(FUSION_CONVBNRELU_OP ON)
   set(FUSION_CONVBN_OP ON)
+  set(FUSION_CONVADD_OP ON)
 
   set(FOUND_MATCH ON)   
 endif()