Merge pull request #625 from zhangyang0701/develop

modify cmake files for FPGA track

CMakeLists.txt

@@ -141,7 +141,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build)
 
 # NET default
 set(NET "defult" CACHE STRING "select net type")
-set_property(CACHE NET PROPERTY STRINGS "defult" "googlenet" "mobilenet" "yolo" "squeezenet")
+set_property(CACHE NET PROPERTY STRINGS "defult" "googlenet" "mobilenet" "yolo" "squeezenet" "FPGAnets")
 include("${CMAKE_CURRENT_LIST_DIR}/tools/op.cmake")
 
 

tools/op.cmake

@@ -42,6 +42,16 @@ elseif (NET STREQUAL "resnet")
   set(MUL_OP ON)
   set(POOL_OP ON)
   set(RELU_OP ON)
+elseif (NET STREQUAL "FPGAnets")
+  set(FUSION_CONVRELU_OP ON)
+  set(FUSION_CONVBNSCALE_OP ON)
+  set(FUSION_CONVBNSCALERELU_OP ON)  
+  set(FUSION_POOLBN_OP ON)
+  set(FUSION_ELEMENTWISEADDRELU_OP ON)
+  set(REGION_OP ON)
+  set(POOL_OP ON)
+  set(CONCAT_OP ON)
+  set(SOFTMAX_OP ON)      
 else ()
   set(BATCHNORM_OP ON)
   set(BOXCODER_OP ON)
@@ -183,3 +193,23 @@ endif()
 if (IM2SEQUENCE_OP)
   add_definitions(-DIM2SEQUENCE_OP)
 endif()
+
+if (FUSION_CONVRELU_OP)
+  add_definitions(-DFUSION_CONVRELU_OP)
+endif()
+if (FUSION_CONVBNSCALE_OP)
+  add_definitions(-DFUSION_CONVBNSCALE_OP)
+endif()
+if (FUSION_CONVBNSCALERELU_OP)
+  add_definitions(-DFUSION_CONVBNSCALERELU_OP)
+endif()
+if (FUSION_POOLBN_OP)
+  add_definitions(-DFUSION_POOLBN_OP)
+endif()
+if (FUSION_ELEMENTWISEADDRELU_OP)
+  add_definitions(-DFUSION_ELEMENTWISEADDRELU_OP)
+endif()
+if (REGION_OP)
+  add_definitions(-DREGION_OP)
+endif()
+