diff --git a/src/operators/kernel/central-arm-func/flatten_arm_func.h b/src/operators/kernel/central-arm-func/flatten_arm_func.h index 8c803a20df10431dc54c00fc31fc17fcc8659d63..396658013310a84c763f90f7cec515fba4fd7e4e 100644 --- a/src/operators/kernel/central-arm-func/flatten_arm_func.h +++ b/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 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d9dd2634770fbcfce22f1c35790b0b81ac4fa346..ef03205ae595ade0765377b1dcc0178471a6553e 100644 --- a/test/CMakeLists.txt +++ b/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 diff --git a/tools/build.sh b/tools/build.sh index 5cf3b0454658c764ff99989de9dca1530c3b55d9..baa9fe1097b774418899cb20f2f1e63520fa7792 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -1,6 +1,6 @@ #!/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 diff --git a/tools/op.cmake b/tools/op.cmake index 3f27f7fc4ae0d00394b9df63c214b30f98cdd31b..8488dd86bd497a1f8c7425b0525986750ff5ac86 100644 --- a/tools/op.cmake +++ b/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--")