correct mistakes for FPGA track

src/common/types.cpp

@@ -71,10 +71,10 @@ const char *G_OP_TYPE_SUM = "sum";
 
 const char *G_OP_TYPE_QUANTIZE = "quantize";
 const char *G_OP_TYPE_DEQUANTIZE = "dequantize";
-extern const char *G_OP_TYPE_TANH = "tanh";
-extern const char *G_OP_TYPE_FUSION_DECONV_RELU = "fusion_deconv_relu";
-extern const char *G_OP_TYPE_FUSION_DECONV_ADD = "fusion_deconv_add";
-extern const char *G_OP_TYPE_FUSION_DECONV_ADD_RELU = "fusion_deconv_add_relu";
+const char *G_OP_TYPE_TANH = "tanh";
+const char *G_OP_TYPE_FUSION_DECONV_RELU = "fusion_deconv_relu";
+const char *G_OP_TYPE_FUSION_DECONV_ADD = "fusion_deconv_add";
+const char *G_OP_TYPE_FUSION_DECONV_ADD_RELU = "fusion_deconv_add_relu";
 
 std::unordered_map<
     std::string, std::pair<std::vector<std::string>, std::vector<std::string>>>

test/CMakeLists.txt

@@ -67,9 +67,6 @@ if (CON GREATER -1)
     ADD_EXECUTABLE(test-resnet50 fpga/test_resnet50.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-resnet50 paddle-mobile)
 
-    ADD_EXECUTABLE(test-densebox net/test_densebox_combine.cpp test_helper.h test_include.h executor_for_test.h)
-    target_link_libraries(test-densebox paddle-mobile)
-
     set(FOUND_MATCH ON)
 endif ()
 
@@ -81,9 +78,6 @@ if (CON GREATER -1)
     ADD_EXECUTABLE(test-pe fpga/test_pe.cpp)
     target_link_libraries(test-pe paddle-mobile)
 
-    ADD_EXECUTABLE(test-densebox net/test_densebox_combine.cpp test_helper.h test_include.h executor_for_test.h)
-    target_link_libraries(test-densebox paddle-mobile)
-
     set(FOUND_MATCH ON)
 endif ()
 

tools/op.cmake

@@ -127,7 +127,6 @@ endif()
 list(FIND NET "FPGA_NET_V2" CON)
 if (CON GREATER -1)
   message("FPGA_NET_V2 enabled")
-  set(FEED_OP ON)
   set(FUSION_CONVADDRELU_OP ON)
   set(FUSION_ELEMENTWISEADDRELU_OP ON)
   set(FUSION_FC_OP ON)
@@ -136,8 +135,6 @@ if (CON GREATER -1)
   set(FUSION_CONVBNRELU_OP ON)
   set(FUSION_CONVBN_OP ON)
   set(CONV_TRANSPOSE_OP ON)
-  set(FUSION_DECONVRELU_OP ON)
-  #set(SLICE_OP ON)
   set(TANH_OP ON)
   set(ELEMENTWISEADD_OP ON)
   set(TRANSPOSE2_OP ON)