Merge pull request #945 from xiebaiyuan/develop

add genet single build

src/operators/kernel/central-arm-func/flatten_arm_func.h

@@ -13,6 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #ifdef FLATTEN_OP
+
+#ifndef RESHAPE_OP
+#define RESHAPE_OP
+#endif
+
 #pragma once
 
 #include <operators/kernel/reshape_kernel.h>

test/CMakeLists.txt

@@ -51,6 +51,15 @@ elseif("nlp" IN_LIST NET)
     # gen test
     ADD_EXECUTABLE(test-gru-op  operators/test_gru_op.cpp test_helper.h  test_include.h)
     target_link_libraries(test-gru-op paddle-mobile)
+elseif("mobilenetfssd" IN_LIST NET)
+    # gen test
+    ADD_EXECUTABLE(test-fssd  net/test_mobilenet_025_fssd.cpp test_helper.h  test_include.h)
+    target_link_libraries(test-fssd paddle-mobile)
+
+elseif("genet" IN_LIST NET)
+    # gen test
+    ADD_EXECUTABLE(test-genet net/test_genet_combine.cpp test_helper.h  test_include.h executor_for_test.h)
+    target_link_libraries(test-genet paddle-mobile)
 else ()
 
     # gen test

tools/build.sh

 #!/usr/bin/env bash
 NETS=""
-declare -a supportedNets=("googlenet" "mobilenet" "yolo" "squeezenet" "resnet" "mobilenetssd" "nlp")
+declare -a supportedNets=("googlenet" "mobilenet" "yolo" "squeezenet" "resnet" "mobilenetssd" "nlp" "mobilenetfssd" "genet")
 
 build_for_mac() {
     if [ ! `which brew` ]; then

tools/op.cmake

@@ -127,6 +127,42 @@ if ("nlp" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
+if ("mobilenetfssd" IN_LIST NET)
+  message("mobilenetfssd enabled")
+  set(FUSION_CONVADDRELU_OP ON)
+  set(FUSION_CONVADDBNRELU_OP ON)
+  set(FUSION_CONVADD_OP ON)
+  set(SOFTMAX_OP ON)
+  set(RESHAPE_OP ON)
+  set(BILINEAR_INTERP_OP ON)
+  set(TRANSPOSE_OP ON)
+  set(CONCAT_OP ON)
+  set(PRIORBOX_OP ON)
+  set(BATCHNORM_OP ON)
+  set(BOXCODER_OP ON)
+  set(MULTICLASSNMS_OP ON)
+  set(FLATTEN_OP ON)
+  set(SPLIT_OP ON)
+  set(SHAPE_OP ON)
+
+  set(FOUND_MATCH ON)
+endif()
+
+if ("genet" IN_LIST NET)
+  message("genet enabled")
+  set(FUSION_CONVADDPRELU_OP ON)
+  set(FUSION_CONVADDADDPRELU_OP ON)
+  set(FUSION_CONVADD_OP ON)
+  set(CONV_TRANSPOSE_OP ON)
+  set(FUSION_CONVADDRELU_OP ON)
+  set(ELEMENTWISEADD_OP ON)
+  set(PRELU_OP ON)
+  set(POOL_OP ON)
+  set(CONCAT_OP ON)
+
+  set(FOUND_MATCH ON)
+endif()
+
 
 if(NOT FOUND_MATCH)
   message("--default--")