diff --git a/Android/global_config.gradle b/Android/global_config.gradle index 8de1960..12f1fc8 100644 --- a/Android/global_config.gradle +++ b/Android/global_config.gradle @@ -25,7 +25,6 @@ ext { aoe_target_sdk_version = 26 aoe_version_code = 3 - aoe_version_name = aoe_major_version + '.' + aoe_suffix_version kotlin_version = '1.3.61' @@ -41,10 +40,10 @@ ext { ], // 第三方推理框架的适配，版本以对应框架版本命名同步，最后加一位小版本号，如TensorFlow 版本2.0.0，AoE 对应的适配版本为2.0.0.x runtime : [ - tensorflow: isDebug() ? project(':runtime-tensorflow-lite') : "com.didi.aoe:runtime-tensorflow-lite:2.0.0.$aoe_suffix_version", - pytorch : isDebug() ? project(':runtime-pytorch') : "com.didi.aoe:runtime-pytorch:1.3.1.$aoe_suffix_version", - ncnn : isDebug() ? project(':runtime-ncnn') : "com.didi.aoe:runtime-ncnn:20191113.$aoe_suffix_version", - mnn : isDebug() ? project(':runtime-mnn') : "com.didi.aoe:runtime-mnn:0.2.1.5.$aoe_suffix_version", + tensorflow: isDebug() ? project(':runtime-tensorflow-lite') : "com.didi.aoe:runtime-tensorflow-lite:$aoe_version_name", + pytorch : isDebug() ? project(':runtime-pytorch') : "com.didi.aoe:runtime-pytorch:$aoe_version_name", + ncnn : isDebug() ? project(':runtime-ncnn') : "com.didi.aoe:runtime-ncnn:$aoe_version_name", + mnn : isDebug() ? project(':runtime-mnn') : "com.didi.aoe:runtime-mnn:$aoe_version_name", ], // 拓展插件的版本跟随 aoe 当前版本，不随框架同步更新 extensions: [ diff --git a/Android/third_party/mnn/build.gradle b/Android/third_party/mnn/build.gradle index 25eb3e3..da98b28 100644 --- a/Android/third_party/mnn/build.gradle +++ b/Android/third_party/mnn/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' ext { releaseArtifact = 'runtime-mnn' releaseDescription = 'The AoE MNN runtime library' - releaseVersion = '0.2.1.5.' + aoe_suffix_version + releaseVersion = aoe_version_name } apply from: rootProject.file('gradle/release.gradle') diff --git a/Android/third_party/ncnn/build.gradle b/Android/third_party/ncnn/build.gradle index 29c5f88..89c5dba 100644 --- a/Android/third_party/ncnn/build.gradle +++ b/Android/third_party/ncnn/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android' ext { releaseArtifact = 'runtime-ncnn' releaseDescription = 'The AoE NCNN runtime library' - releaseVersion = '20191113.' + aoe_suffix_version + releaseVersion = aoe_version_name } apply from: rootProject.file('gradle/release.gradle') diff --git a/Android/third_party/pytorch/build.gradle b/Android/third_party/pytorch/build.gradle index dc73b06..edd29a9 100644 --- a/Android/third_party/pytorch/build.gradle +++ b/Android/third_party/pytorch/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'kotlin-android' ext { releaseArtifact = 'runtime-pytorch' releaseDescription = 'The AoE PyTorch runtime library' - releaseVersion = '1.3.1.' + aoe_suffix_version + releaseVersion = aoe_version_name } apply from: rootProject.file('gradle/release.gradle') diff --git a/Android/third_party/tensorflow-lite/build.gradle b/Android/third_party/tensorflow-lite/build.gradle index 7b51c21..8973861 100644 --- a/Android/third_party/tensorflow-lite/build.gradle +++ b/Android/third_party/tensorflow-lite/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-android' ext { releaseArtifact = 'runtime-tensorflow-lite' releaseDescription = 'The AoE tensorflow lite runtime library' - releaseVersion = '2.0.0.' + aoe_suffix_version + releaseVersion = aoe_version_name } apply from: rootProject.file('gradle/release.gradle') diff --git a/Android/version.gradle b/Android/version.gradle index 126fa18..5933bd2 100644 --- a/Android/version.gradle +++ b/Android/version.gradle @@ -16,6 +16,5 @@ ext { - aoe_major_version = '1.1.1' - aoe_suffix_version = 9 + aoe_version_name = '1.1.2' } \ No newline at end of file diff --git a/README.md b/README.md index ecb8855..627b9c3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- AoE Logo + AoE Logo
![](https://github.com/didi/aoe/workflows/Android%20CI/badge.svg) @@ -12,15 +12,9 @@ [路线图](./ROADMAP.md) | [English](./README_en.md) -## 一、背景 -### 1. AoE 是什么? -**AoE** (AI on Edge，终端智能，边缘计算) 是一个滴滴开源的 **终端侧 AI 集成运行时环境 ( IRE )**。以 **“稳定性、易用性、安全性”** 为设计原则，帮助开发者将不同框架的深度学习算法轻松部署到终端高效执行。 - -为什么要做一个终端 AI 集成运行时框架： - -* **框架多样性**，随着人工智能技术快速发展，这两年涌现出了许多运行在终端的推理框架，一方面给开发者带来更多选择，另外一方面也增加了将 AI 布署到终端的成本。 -* **流程繁琐**，通过推理框架直接接入 AI 的流程比较繁琐，涉及到动态库接入、资源加载、前处理、后处理、资源释放、模型升级，以及如何保障稳定性等问题。 +## 一、简介 +**AoE** (AI on Edge) 是一个开源的 **终端侧 AI 集成运行时环境 ( IRE )**。帮助开发者将不同框架的深度学习算法轻松部署到终端高效执行。 ## 二、使用文档&示例 - [Android用户指南](./Android/README.md) @@ -28,25 +22,66 @@ - [Android Demo](./Android/examples/demo) - [iOS Demo](./iOS/Demo) -## 三、Q&A +## 三、适配信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AoE 版本推理框架依赖信息推理框架版本
1.1.2TensorFlow Lite + [ Android ] com.didi.aoe.runtime-tensorflow-lite:1.1.2
+ [ iOS ] pod 'AoERuntime/TensorFlowLite','~> 1.1.2',
+ 		2.0.0
PyTorch + [ Android ] com.didi.aoe.runtime-pytorch:1.1.2 + + 1.3.1
MNN + [ Android ] com.didi.aoe.runtime-mnn:1.1.2
+ [ iOS ] pod 'AoERuntime/MNN','~> 1.1.2',
+ 		0.2.1.5
NCNN + [ Android ] com.didi.aoe.runtime-ncnn:1.1.2
+ [ iOS ] pod 'AoERuntime/NCNN','~> 1.1.2',
+ [ linux ] runtime-ncnn:1.1.2 + 		20191113
+ +## 四、Q&A 加微信入群：*普惠出行产品技术*（备注 `AoE`） 普惠出行产品技术 - -## 四、项目成员 +## 五、项目成员 ### 核心成员 [kuloud](https://github.com/Kuloud)、 [dingc](https://github.com/qtdc1229) 、 [coleman.zou](https://github.com/zouyuefu) 、 -[yangke1120](https://github.com/yangke1120) 、 -[tangjiaxu](https://github.com/shupiankuaile) +[yangke1120](https://github.com/yangke1120) -## 五、友情链接 -1. [Dokit](https://github.com/didi/DoraemonKit)，一款功能齐全的客户端（ iOS 、Android ）研发助手，你值得拥有 :) -2. 普惠出行产品技术公众号，欢迎关注。 +## 六、友情链接 +* [Dokit](https://github.com/didi/DoraemonKit)，一款功能齐全的客户端（ iOS 、Android ）研发助手，你值得拥有 :) +* 普惠出行产品技术公众号，欢迎关注。 普惠出行产品技术公众号 diff --git a/README_en.md b/README_en.md index 0d0a92a..37a2e07 100644 --- a/README_en.md +++ b/README_en.md @@ -1,5 +1,5 @@
- AoE Logo + AoE Logo
[![Build Status](https://travis-ci.org/didi/AoE.svg?branch=master)](https://travis-ci.org/didi/AoE) diff --git a/images/aoe_qq.jpeg b/images/aoe_qq.jpeg deleted file mode 100644 index 077cdb4..0000000 Binary files a/images/aoe_qq.jpeg and /dev/null differ diff --git a/images/mnist_android.jpeg b/images/mnist_android.jpeg deleted file mode 100644 index c82e36e..0000000 Binary files a/images/mnist_android.jpeg and /dev/null differ diff --git a/images/squeeze_android.jpeg b/images/squeeze_android.jpeg deleted file mode 100644 index 4f47c50..0000000 Binary files a/images/squeeze_android.jpeg and /dev/null differ diff --git a/linux/src/CMakeLists.txt b/linux/src/CMakeLists.txt index 33cd2f0..29df7e1 100755 --- a/linux/src/CMakeLists.txt +++ b/linux/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(tool) add_subdirectory(plugin) add_subdirectory(core) -add_subdirectory(sample) +# add_subdirectory(sample) # opencv required