Hotfix arm cross compile (#1479)

* [ARM] support arm-linux-androideabi

* add build script

* [ARM] specify android api level

* [ARM] fix redefine error for arm32 cross-compile

* [ARM] add rt library

* update

Co-authored-by: neiltian <[email protected]>

Author: quinnrong94

CMakeLists.txt

@@ -263,6 +263,11 @@ if(TNN_SYMBOL_HIDE AND UNIX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
 endif()
 
+if(SYSTEM.Linux AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND ANDROID_API_LEVAL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_C99_MATH_TR1")
+    add_definitions(-D__ANDROID_API__=${ANDROID_API_LEVAL})
+endif()
+
 if(TNN_X86_ENABLE)
     add_subdirectory(source/tnn/device/x86)
     set(TARGET_OBJECTS ${TARGET_OBJECTS} "$<TARGET_OBJECTS:TNNX86>")
@@ -277,6 +282,9 @@ if(TNN_ARM_ENABLE)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
 
     elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
+        if(SYSTEM.Linux)
+            add_definitions( -mfloat-abi=softfp )
+        endif()
         add_definitions( -mfpu=neon )
     endif()
     add_subdirectory(source/tnn/device/arm)

platforms/linux/CMakeLists.txt

@@ -11,7 +11,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/src)
 
 set(COMMON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/src/test_common.cc)
 
-target_link_libraries(TNN dl rt)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND ANDROID_API_LEVAL)
+    target_link_libraries(TNN dl log)
+else()
+    target_link_libraries(TNN dl rt)
+endif()
 
 if(TNN_X86_ENABLE)
 endif()

scripts/build_androideabi_linux.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+COMPILER_PATH=${1:-"/usr"}
+
+SHARED_LIB="ON"
+ARM="ON"
+OPENMP="ON"
+OPENCL="OFF"
+RKNPU="OFF"
+API_LEVEL=18
+CC=$COMPILER_PATH/bin/arm-linux-androideabi-gcc
+CXX=$COMPILER_PATH/bin/arm-linux-androideabi-g++
+TARGET_ARCH=arm
+
+if [ -z $TNN_ROOT_PATH ]
+then
+    TNN_ROOT_PATH=$(cd `dirname $0`; pwd)/..
+fi
+
+rm -rf build_androideabi_linux
+mkdir build_androideabi_linux
+cd build_androideabi_linux
+
+cmake ${TNN_ROOT_PATH} \
+    -DCMAKE_SYSTEM_NAME=Linux  \
+    -DANDROID_API_LEVAL=$API_LEVEL \
+    -DTNN_TEST_ENABLE=ON \
+    -DTNN_CPU_ENABLE=ON \
+    -DDEBUG=OFF \
+    -DCMAKE_C_COMPILER=$CC \
+    -DCMAKE_CXX_COMPILER=$CXX \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DTNN_ARM_ENABLE:BOOL=$ARM \
+    -DTNN_RK_NPU_ENABLE:BOOL=$RKNPU \
+    -DTNN_OPENMP_ENABLE:BOOL=$OPENMP \
+    -DTNN_OPENCL_ENABLE:BOOL=$OPENCL \
+    -DCMAKE_SYSTEM_PROCESSOR=$TARGET_ARCH \
+    -DTNN_BUILD_SHARED:BOOL=$SHARED_LIB
+
+make -j7

source/tnn/layer/einsum_layer.cc

@@ -16,6 +16,7 @@
 #include "tnn/layer/base_layer.h"
 #include "tnn/utils/dims_vector_utils.h"
 #include "tnn/utils/naive_compute.h"
+#include "tnn/utils/string_utils_inner.h"
 
 namespace TNN_NS {
 
@@ -110,12 +111,12 @@ Status EinsumLayer::InferOutputShape(bool ignore_error) {
 
             case '.':
                 if (found_ell) {
-                    const std::string message = "Error: einsum() found \'.\' for operand " + std::to_string(curr_op) +
+                    const std::string message = "Error: einsum() found \'.\' for operand " + ToString(curr_op) +
                                                 " for which an ellipsis was already found";
                     return Status(TNNERR_MODEL_ERR, message);
                 }
                 if (!(i + 2 < lhs.length() && lhs[++i] == '.' && lhs[++i] == '.')) {
-                    const std::string message = "einsum() found \'.\' for operand " + std::to_string(curr_op) +
+                    const std::string message = "einsum() found \'.\' for operand " + ToString(curr_op) +
                                                 " that is not part of any ellipsis";
                     return Status(TNNERR_MODEL_ERR, message);
                 }
@@ -137,7 +138,7 @@ Status EinsumLayer::InferOutputShape(bool ignore_error) {
                 // Parse label
                 if (lhs[i] < 'a' && lhs[i] > 'z') {
                     const std::string message = "einsum() operand subscript must be in range [a, z] but found " +
-                                                std::to_string(lhs[i]) + " for operand " + std::to_string(curr_op);
+                                                ToString(lhs[i]) + " for operand " + ToString(curr_op);
                     return Status(TNNERR_MODEL_ERR, message);
                 }
                 // Convert label to index in [0, 25] and store
@@ -179,10 +180,10 @@ Status EinsumLayer::InferOutputShape(bool ignore_error) {
 
         if (!(has_ellipsis ? nlabels <= ndims : nlabels == ndims)) {
             const std::string message = "einsum() the number of subscripts in the equation (" +
-                                        std::to_string(nlabels) +
+                                        ToString(nlabels) +
                                         (has_ellipsis ? ") is more than the number of dimensions ("
                                                       : ") does not match the number of dimensions (") +
-                                        std::to_string(ndims) + ") for operand " + std::to_string(i) +
+                                        ToString(ndims) + ") for operand " + ToString(i) +
                                         (has_ellipsis ? "" : " and no ellipsis was given");
 
             return Status(TNNERR_MODEL_ERR, message);
@@ -236,13 +237,13 @@ Status EinsumLayer::InferOutputShape(bool ignore_error) {
                 default:
                     if (rhs[i] < 'a' && rhs[i] > 'z') {
                         const std::string message = "einsum() subscripts must be in range [a, z] but found " +
-                                                    std::to_string(rhs[i]) + " for the output";
+                                                    ToString(rhs[i]) + " for the output";
                         return Status(TNNERR_MODEL_ERR, message);
                     }
                     const auto label = rhs[i] - 'a';
                     if (!(label_count[label] > 0 && label_perm_index[label] == -1)) {
                         const std::string message =
-                            "einsum() output subscript " + std::to_string(rhs[i]) +
+                            "einsum() output subscript " + ToString(rhs[i]) +
                             (label_perm_index[label] > -1 ? " appears more than once in the output"
                                                           : " does not appear in the equation for any input operand");
                         return Status(TNNERR_MODEL_ERR, message);
@@ -297,10 +298,10 @@ Status EinsumLayer::InferOutputShape(bool ignore_error) {
                 // Repeated label, take diagonal
                 const auto dim = label_dim[label];
                 if (operand_dims[j] != operand_dims[dim]) {
-                    const std::string message = "einsum() subscript " + std::to_string(char(label + 'a')) +
-                                                " is repeated for operand " + std::to_string(i) +
-                                                " but the sizes don't match, " + std::to_string(operand_dims[j]) +
-                                                " != " + std::to_string(operand_dims[dim]);
+                    const std::string message = "einsum() subscript " + ToString(char(label + 'a')) +
+                                                " is repeated for operand " + ToString(i) +
+                                                " but the sizes don't match, " + ToString(operand_dims[j]) +
+                                                " != " + ToString(operand_dims[dim]);
                     return Status(TNNERR_MODEL_ERR, message);
                 }
                 // diagonal is not supported

source/tnn/utils/blob_converter_default.cc

@@ -23,6 +23,7 @@
 #include "tnn/utils/bfp16.h"
 #include "tnn/utils/bfp16_utils.h"
 #include "tnn/utils/dims_utils.h"
+#include "tnn/utils/string_utils_inner.h"
 
 namespace TNN_NS {
 
@@ -265,7 +266,7 @@ Status DefaultBlobConverterAcc::ConvertToMatAsync(Mat &image, MatConvertParam pa
         } else {
             FREE_INT8_TEMP_DATA();
             return Status(TNNERR_PARAM_ERR, "reverse type not support yet, mat type: " +
-                          std::to_string(image.GetMatType()));
+                          ToString(image.GetMatType()));
         }
     }
 
@@ -393,7 +394,7 @@ Status DefaultBlobConverterAcc::ConvertFromMatAsync(Mat &image_src, MatConvertPa
         } else {
             FREE_INT8_TEMP_DATA();
             return Status(TNNERR_PARAM_ERR, "reverse type not support yet, mat type: " +
-                          std::to_string(image.GetMatType()));
+                          ToString(image.GetMatType()));
         }
         image = reversed;
     }