fixup android build issues

Former-commit-id: 4db877f

CMakeLists.txt

@@ -115,8 +115,8 @@ if(CONFIG_ARCH_BLAS)
           TARGET_LINK_LIBRARIES(tengine ${BLAS_DIR}/arm32/lib/libopenblas.so)
      endif()
      if(ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
-       set(PROTOBUF_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
-     endif()
+        TARGET_LINK_LIBRARIES(tengine ${BLAS_DIR}/arm64/lib/libopenblas.so)
+      endif()
    else()
       message(FATAL_ERROR "need to set the blas path")
    endif()

android_config.txt

@@ -1,5 +1,5 @@
 ANDROID_NDK:/home/usr/android-ndk-r16
 PROTOBUF_DIR:/home/usr/protobuf_lib
 BLAS_DIR:/home/usr/openbla020_android
-CONFIG_ARCH_TYPE:ARMv7
+CONFIG_ARCH_TYPE:ARMv8
 

doc/build_android.md

@@ -1,6 +1,6 @@
 ## 1.Download Tengine poject
 ```
-git clone https://github.com/OAID/tengine/ 
+git clone https://github.com/OAID/tengine/
 ```
 ## 2.Download OpenCV protobuf OpenBLAS and Android ndk
 
@@ -19,7 +19,7 @@ tar -zxvf openblas020_android.tgz
 ```
 ## 4.Set the *NDK PATH*,*PROTOBUF_DIR*,*BLAS PATH* and *CONFIG_ARCH_TYPE*
 if you want to build android for armv7,set the CONFIG_ARCH_TYPE:**ARMv7**
-,otherwise ,set the CONFIG_ARCH_TYPE:**ARMv8**
+.otherwise,set the CONFIG_ARCH_TYPE:**ARMv8**
 ```
 vim  ~/tengine/android_config.txt
 ```
@@ -40,7 +40,9 @@ if you want to run tengine with openblas, remove the DCONFIG_ARCH_ARM64 or DCONF
 cd ~
 unzip opencv-3.4.0-android-sdk.zip
 ```
-### 6.2 Set the *TENGINE_DIR*, *OpenCV_DIR*, *PROTOBUF_DIR*
+### 6.2 Set the *TENGINE_DIR*, *OpenCV_DIR*, *PROTOBUF_DIR*.
+if you want to run Tengine with OpenBlas, please add the correct blas path in example/android_build_armv7.sh or example/android_build_armv8.sh.eg: -DBLAS_DIR=/home/usr/openbla020_android.
+
 ```
 cd ~/tengine/example
 vim android_build_armv7.sh or

examples/android_build_armv7.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-export ANDROID_NDK=/home/zhangrui/android-ndk-r16
+export ANDROID_NDK=/home/usr/android-ndk-r16
 
 cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
      -DANDROID_ABI="armeabi-v7a" \
      -DANDROID_PLATFORM=android-21 \
      -DANDROID_STL=gnustl_shared \
-     -DTENGINE_DIR=/home/zhangrui/zr_tengine/tengine \
-     -DOpenCV_DIR=/home/zhangrui/OpenCV-android-sdk/sdk/native/jni \
-     -DPROTOBUF_DIR=/home/zhangrui/oaid_tengine/tengine/protobuf_lib \
+     -DTENGINE_DIR=/home/usr/tengine \
+     -DOpenCV_DIR=/home/usr/OpenCV-android-sdk/sdk/native/jni \
+     -DPROTOBUF_DIR=/home/usr/protobuf_lib \
+     -DBLAS_DIR=/home/usr/openbla020_android \
      ..
 

examples/android_build_armv8.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-export ANDROID_NDK=/home/zhangrui/android-ndk-r16
+export ANDROID_NDK=/home/usr/android-ndk-r16
 
 cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
      -DANDROID_ABI="arm64-v8a" \
      -DANDROID_PLATFORM=android-21 \
      -DANDROID_STL=gnustl_shared \
-     -DTENGINE_DIR=/home/zhangrui/zr_tengine/tengine \
-     -DOpenCV_DIR=/home/zhangrui/OpenCV-android-sdk/sdk/native/jni \
-     -DPROTOBUF_DIR=/home/zhangrui/oaid_tengine/tengine/protobuf_lib \
+     -DTENGINE_DIR=/home/usr/tengine \
+     -DOpenCV_DIR=/home/usr/OpenCV-android-sdk/sdk/native/jni \
+     -DPROTOBUF_DIR=/home/usr/protobuf_lib \
      ..
 

examples/caffe_wrapper/cpp_classification/CMakeLists.txt

@@ -13,6 +13,8 @@ add_definitions(-DCPU_ONLY)
 #opencv
 find_package(OpenCV REQUIRED)
 
+set(CMAKE_CXX_FLAGS "-std=c++11 -O3 -Wall")
+
 #include
 include_directories(${INSTALL_DIR}/wrapper_include
                     ${INSTALL_DIR}/include)

examples/caffe_wrapper/mtcnn/CMakeLists.txt

@@ -8,7 +8,7 @@ set( TENGINE_LIBS wrapper tengine )
 set( CAFFE_MTCNN_SRCS test_caffe_mtcnn.cpp caffe_mtcnn.cpp caffe_mtcnn_utils.cpp )
 
 #flag
-#set(CMAKE_CXX_FLAGS "-std=c++11 -O3 -Wall")
+set(CMAKE_CXX_FLAGS "-std=c++11 -O3 -Wall")
 
 #opencv
 find_package(OpenCV REQUIRED)

examples/faster_rcnn/CMakeLists.txt

@@ -14,6 +14,15 @@ endif()
 
 set( RESNET_SRCS faster_rcnn.cpp ../common/common.cpp)
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
 #opencv
 find_package(OpenCV REQUIRED)
 
@@ -26,7 +35,7 @@ link_directories( ${INSTALL_DIR}/lib )
 #exe
 add_executable(FASTER_RCNN ${RESNET_SRCS})
 if( ANDROID)
-   target_link_libraries(FASTER_RCNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+   target_link_libraries(FASTER_RCNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
    target_link_libraries(FASTER_RCNN ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/imagenet_classification/CMakeLists.txt

@@ -11,6 +11,16 @@ if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
     set( PROTOBUF_LIB ${PROTOBUF_DIR}/arm64_lib/libprotobuf.so)
 endif()
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
+
 set( CODE_SRCS classification.cpp model_config.cpp ../common/common.cpp )
 set( BIN_EXE Classify )
 
@@ -26,7 +36,7 @@ link_directories(${INSTALL_DIR}/lib)
 #exe
 add_executable(${BIN_EXE} ${CODE_SRCS})
 if(ANDROID)
-   target_link_libraries(${BIN_EXE} ${PROTOBUF_LIB} ${TENGINE_LIBS} ${OpenCV_LIBS})
+   target_link_libraries(${BIN_EXE} ${PROTOBUF_LIB} ${TENGINE_LIBS} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
    target_link_libraries(${BIN_EXE} ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/lighten_cnn/CMakeLists.txt

@@ -12,6 +12,15 @@ if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
 endif()
 set( CODE_SRCS lighten_cnn.cpp ../common/common.cpp )
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
 #opencv
 find_package(OpenCV REQUIRED)
 
@@ -24,7 +33,7 @@ link_directories(${INSTALL_DIR}/lib)
 #exe
 add_executable(LIGHTEN_CNN ${CODE_SRCS})
 if( ANDROID)
-    target_link_libraries(LIGHTEN_CNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+    target_link_libraries(LIGHTEN_CNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
     target_link_libraries(LIGHTEN_CNN ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/mobilenet_ssd/CMakeLists.txt

@@ -12,6 +12,16 @@ if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
     set( PROTOBUF_LIB ${PROTOBUF_DIR}/arm64_lib/libprotobuf.so)
 endif()
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
+
 set( CODE_SRCS mssd.cpp ../common/common.cpp)
 
 #opencv
@@ -27,7 +37,7 @@ link_directories( ${INSTALL_DIR}/lib)
 #exe
 add_executable(MSSD ${CODE_SRCS})
 if( ANDROID)
-   target_link_libraries(MSSD ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+   target_link_libraries(MSSD ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
    target_link_libraries(MSSD ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/mtcnn/CMakeLists.txt

@@ -11,6 +11,15 @@ if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
     set( PROTOBUF_LIB ${PROTOBUF_DIR}/arm64_lib/libprotobuf.so)
 endif()
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
 set( MTCNN_SRCS mtcnn_utils.cpp mtcnn.cpp test_mtcnn.cpp ../common/common.cpp )
 
 #opencv
@@ -26,7 +35,7 @@ link_directories(${INSTALL_DIR}/lib)
 #exe
 add_executable(MTCNN ${MTCNN_SRCS})
 if( ANDROID)
-  target_link_libraries(MTCNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+  target_link_libraries(MTCNN ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
   target_link_libraries(MTCNN ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/readme.md

@@ -45,7 +45,7 @@ make -j4
 cd ~/tengine/examples
 vim android_build_armv7.sh or vim android_build_armv8.sh
 ```
-Set the correct NDK path ,Tengine path ,Opencv path and  protobuf path
+Set the correct NDK path ,Tengine path ,Opencv path and  protobuf path. if you want to run Tengine with OpenBlas, please add the correct blas path in android_build_armv7.sh or android_build_armv8.sh.eg: -DBLAS_DIR=/home/usr/openbla020_android
 ```
 mkdir build
 cd build

examples/ssd/CMakeLists.txt

@@ -12,6 +12,15 @@ if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
 endif()
 set( CODE_SRCS ssd.cpp ../common/common.cpp)
 
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
+
 
 #opencv
 find_package(OpenCV REQUIRED)
@@ -26,7 +35,7 @@ link_directories(   ${INSTALL_DIR}/lib)
 #exe
 add_executable(SSD ${CODE_SRCS})
 if( ANDROID)
-  target_link_libraries(SSD ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+  target_link_libraries(SSD ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
    target_link_libraries(SSD ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()

examples/tensorflow_wrapper/label_image/CMakeLists.txt

@@ -14,6 +14,9 @@ include_directories(${INSTALL_DIR}/wrapper_include
                     ${INSTALL_DIR}/include
                     ${TENGINE_DIR}/examples/common)
 
+
+set(CMAKE_CXX_FLAGS "-std=c++11 -O3 -Wall")
+
 #lib
 link_directories(${INSTALL_DIR}/lib)
 

examples/yolov2/CMakeLists.txt

@@ -11,6 +11,14 @@ endif()
 if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
     set( PROTOBUF_LIB ${PROTOBUF_DIR}/arm64_lib/libprotobuf.so)
 endif()
+if( BLAS_DIR)
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
+         set( BLAS_LIB ${BLAS_DIR}/arm32/lib/libopenblas.so)
+    endif()
+    if( ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
+         set( BLAS_LIB ${BLAS_DIR}/arm64/lib/libopenblas.so)
+    endif()
+endif()
 
 set( CODE_SRCS yolov2.cpp ../common/common.cpp)
 set( BIN_EXE YOLOV2)
@@ -19,18 +27,18 @@ find_package(OpenCV REQUIRED)
 
 #include
 include_directories(${INSTALL_DIR}/include
-					${TENGINE_DIR}/include
-					${TENGINE_DIR}/core/include
-					${TENGINE_DIR}/operator/include
-                    ${TENGINE_DIR}/examples/common)
+		   ${TENGINE_DIR}/include
+		   ${TENGINE_DIR}/core/include
+		   ${TENGINE_DIR}/operator/include
+                   ${TENGINE_DIR}/examples/common)
 
 #lib
 link_directories( ${INSTALL_DIR}/lib )
 
 #exe
 add_executable(${BIN_EXE} ${CODE_SRCS})
 if( ANDROID)
-   target_link_libraries(${BIN_EXE} ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS})
+   target_link_libraries(${BIN_EXE} ${TENGINE_LIBS} ${PROTOBUF_LIB} ${OpenCV_LIBS} ${BLAS_LIB})
 else()
    target_link_libraries(${BIN_EXE} ${TENGINE_LIBS} ${OpenCV_LIBS})
 endif()