v1.3.2

            Separate the tengine framework and op implementation into two so
            Implemented lots of operator in reference code, for functional purpose


Former-commit-id: fc203af

.gitignore

@@ -18,3 +18,4 @@ protobuf_lib/
 sysroot/
 android_config.txt
 model_src/
+.vs/

CMakeLists.txt

@@ -1,33 +1,80 @@
 if(CMAKE_TOOLCHAIN_FILE)
-set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to")
-# get absolute path, but get_filename_component ABSOLUTE only refer with source dir, so find_file here :(
 get_filename_component(CMAKE_TOOLCHAIN_FILE_NAME ${CMAKE_TOOLCHAIN_FILE} NAME)
+message(STATUS,"CMAKE_TOOLCHAIN_FILE_NAME = ${CMAKE_TOOLCHAIN_FILE_NAME}, ${CMAKE_TOOLCHAIN_FILE}, ${CMAKE_SOURCE_DIR}")
 find_file(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE_NAME} PATHS ${CMAKE_SOURCE_DIR} NO_DEFAULT_PATH)
 message(STATUS "CMAKE_TOOLCHAIN_FILE = ${CMAKE_TOOLCHAIN_FILE}")
+else()
+    message(FATAL_ERROR "cmake file only used for Android build")
 endif()
 
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "Installation Directory")
+message(STATUS,"CMAKE_CURRENT_SRC_DIR = ${CMAKE_CURRENT_SOURCE_DIR}")
 endif()
 message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
 
-
 cmake_minimum_required(VERSION 3.6)
 
 set(CMAKE_BUILD_TYPE debug)
 # set(CMAKE_BUILD_TYPE relwithdebinfo)
 # set(CMAKE_BUILD_TYPE release)
 
 
+#get the NDK_ROOT from android.toolchains.cmake
+
+set(PARSED_ANDROID_NDK_REGEX "(.+)/build/cmake/android.toolchain.cmake")
+
+string(REGEX REPLACE "${PARSED_ANDROID_NDK_REGEX}" "\\1"  PARSED_ANDROID_NDK ${CMAKE_TOOLCHAIN_FILE})
+
+file(READ "${PARSED_ANDROID_NDK}/source.properties" TE_NDK_SOURCE_PROPERTIES)
+
+set(TE_NDK_REVISION_REGEX
+  "^Pkg\\.Desc = Android NDK\nPkg\\.Revision = ([0-9]+)\\.([0-9]+)\\.([0-9]+)?")
+if(NOT TE_NDK_SOURCE_PROPERTIES MATCHES "${TE_NDK_REVISION_REGEX}")
+  message(FATAL_ERROR "Failed to parse Android NDK revision: ${ANDROID_NDK}/source.properties.\n${TE_NDK_SOURCE_PROPERTIES}")
+endif()
+
+set(PARSED_NDK_MAJOR "${CMAKE_MATCH_1}")
+set(PARSED_NDK_MINOR "${CMAKE_MATCH_2}")
+
+
+#ndk less than 15, CMAKE 3.6.3 works, while higher version may failed
+if(PARSED_NDK_MAJOR LESS 15)
+if(CMAKE_VERSION VERSION_GREATER 3.6.3)
+    message(FATAL_ERROR  "please use cmake at most VERSION 3.6.3 for ndk " ${PARSED_NDK_MAJOR} "." ${PARSED_NDK_MINOR})
+endif()
+endif()
+
+#real  project logic starts from here
+
 project(tengine_android)
 
 option(CONFIG_ARCH_ARM64 "build arm64 version" OFF)
+option(CONFIG_ARCH_ARM32 "build arm32 version" OFF)
 option(CONFIG_ARCH_BLAS  "build blas  version" OFF)
+option(CONFIG_ARCH_ARM8_2 "build float16 for arm8.2" OFF)
 option(CONFIG_ACL_GPU  "build acl gpu  version" OFF)
 option(CONFIG_CAFFE_SERIALIZER "caffe serializer" ON)
 option(CONFIG_ONNX_SERIALIZER "onnx serializer" OFF)
+option(CONFIG_MXNET_SERIALIZER "mxnet serializer" OFF)
 option(CONFIG_TF_SERIALIZER "tensorflow serializer" OFF)
+option(CONFIG_TFLITE_SERIALIZER "tflite serializer" OFF)
 option(CONFIG_TENGINE_SERIALIZER "tengine serializer" ON)
+option(CONFIG_KERNEL_FP32 "KERNEL FP32" ON)
+if(ANDROID_NDK_MAJOR AND CONFIG_ARCH_ARM8_2)
+    option(CONFIG_KERNEL_FP16 "KERNEL FP16" ON)
+endif()
+option(CONFIG_KERNEL_INT8 "KERNEL INT8" ON)
+option(CONFIG_KERNEL_UINT8 "KERNEL UINT8" ON)
+option(CONFIG_AUTH_DEVICE  "AUTH DEVICE" ON)
+
+
+#in face, this is related with run-time env, since API LEVEL 22 binary can run on API LEVEL 23 platform
+if(ANDROID_PLATFORM_LEVEL LESS 23)
+    add_definitions(-DNO_CXA_DEMANGLE)
+endif()
+
+set(CONFIG_VERSION_POSTFIX github)
 
 #message("list dir ${CMAKE_CURRENT_LIST_DIR}/.git")
 if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/.git)
@@ -43,31 +90,64 @@ set(GIT_COMMIT_ID -DGIT_COMMIT_ID="0x${stripped_commit_id}")
 message("GIT COMMIT ID: " 0x${stripped_commit_id})
 
 if (CONFIG_ARCH_ARM64)
-   add_definitions(-DCONFIG_ARCH_ARM64=1)
+    add_definitions(-DCONFIG_ARCH_ARM64=1)
+endif()
+
+if(CONFIG_ARCH_ARM32)
+    add_definitions(-DCONFIG_ARCH_ARM32=1)
 endif()
 
 if(CONFIG_ARCH_BLAS)
-   add_definitions(-DCONFIG_ARCH_BLAS=1)
+    add_definitions(-DCONFIG_ARCH_BLAS=1)
+endif()
+
+if(CONFIG_ARCH_ARM8_2)
+    add_definitions(-DCONFIG_ARCH_ARM8_2=1)
+    add_definitions(-mcpu=cortex-a55)
 endif()
 
 if(CONFIG_ACL_GPU)
-   add_definitions(-DCONFIG_ACL_GPU=1)
+    add_definitions(-DCONFIG_ACL_GPU=1)
 endif()
 
 if(CONFIG_CAFFE_SERIALIZER)
-   add_definitions(-DCONFIG_CAFFE_SERIALIZER=1)
+    add_definitions(-DCONFIG_CAFFE_SERIALIZER=1)
 endif()
 
 if(CONFIG_ONNX_SERIALIZER)
-   add_definitions(-DCONFIG_ONNX_SERIALIZER=1)
+    add_definitions(-DCONFIG_ONNX_SERIALIZER=1)
+endif()
+
+if(CONFIG_MXNET_SERIALIZER)
+    add_definitions(-DCONFIG_MXNET_SERIALIZER=1)
 endif()
 
 if(CONFIG_TF_SERIALIZER)
-   add_definitions(-DCONFIG_TF_SERIALIZER=1)
+    add_definitions(-DCONFIG_TF_SERIALIZER=1)
 endif()
 
 if(CONFIG_TENGINE_SERIALIZER)
-   add_definitions(-DCONFIG_TENGINE_SERIALIZER=1)
+    add_definitions(-DCONFIG_TENGINE_SERIALIZER=1)
+endif()
+
+if(CONFIG_KERNEL_FP32)
+    add_definitions(-DCONFIG_KERNEL_FP32=1)
+endif()
+
+if(CONFIG_KERNEL_FP16)
+    add_definitions(-DCONFIG_KERNEL_FP16=1)
+endif()
+
+if(CONFIG_KERNEL_INT8)
+    add_definitions(-DCONFIG_KERNEL_INT8=1)
+endif()
+
+if(CONFIG_KERNEL_UINT8)
+    add_definitions(-DCONFIG_KERNEL_UINT8=1)
+endif()
+
+if (CONFIG_VERSION_POSTFIX)
+    add_definitions(-DCONFIG_VERSION_POSTFIX="${CONFIG_VERSION_POSTFIX}")
 endif()
 
 add_definitions(${GIT_COMMIT_ID})
@@ -83,7 +163,8 @@ add_definitions(-Wno-overloaded-virtual)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CXX_STANDARD_REQUIRED ON)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual")
+
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Bsymbolic -Bsymbolic-functions")
 
 include_directories(include)
 
@@ -111,10 +192,14 @@ endif()
 
 ENDFOREACH()
 
-
+ADD_LIBRARY(hclcpu SHARED ${TOPERATOR_LIB_SRCS})
 ADD_LIBRARY(tengine SHARED ${TENGINE_LIB_SRCS} ${TENGINE_SIGN_SRCS})
 
-ADD_DEPENDENCIES(tengine KERNEL_ASM_TARGET)
+#executor
+ADD_DEPENDENCIES(hclcpu KERNEL_ASM_TARGET)
+TARGET_LINK_LIBRARIES(hclcpu tengine)
+
+#target_compile_definitions(operator,"--allow-shlib-undefined")
 
 if(PROTOBUF_DIR)
     if(ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
@@ -146,11 +231,11 @@ if(CONFIG_ARCH_BLAS)
    if( BLAS_DIR)
      if(ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7-a"))
           TARGET_LINK_LIBRARIES(tengine ${BLAS_DIR}/arm32/lib/libopenblas.so)
-     endif()
+     endif()   
      if(ANDROID AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64"))
-        TARGET_LINK_LIBRARIES(tengine ${BLAS_DIR}/arm64/lib/libopenblas.so)
-      endif()
-   else()
+          TARGET_LINK_LIBRARIES(tengine ${BLAS_DIR}/arm64/lib/libopenblas.so)
+     endif()
+   else() 
       message(FATAL_ERROR "need to set the blas path")
    endif()
 endif()
@@ -172,8 +257,8 @@ if(CONFIG_ACL_GPU)
 endif()
 
 install (TARGETS tengine  DESTINATION lib)
+install (TARGETS hclcpu  DESTINATION lib)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/include/tengine_c_api.h DESTINATION include)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/include/cpu_device.h DESTINATION include)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/include/tengine_test_api.h DESTINATION include)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/include/tengine_c_compat.h DESTINATION include)
 

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 OPEN AI LAB
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.