Skip to content

Commit

Permalink
[release 1.1.2] 统一发布版本
Browse files Browse the repository at this point in the history
1、更新首页说明文档 #23
2、统一包命名方式 #22
3、清理资源文件
  • Loading branch information
kuloud committed Dec 25, 2019
1 parent 68603ea commit 81d84b7
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 30 deletions.
9 changes: 4 additions & 5 deletions Android/global_config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion Android/third_party/mnn/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion Android/third_party/ncnn/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion Android/third_party/pytorch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion Android/third_party/tensorflow-lite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
3 changes: 1 addition & 2 deletions Android/version.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@


ext {
aoe_major_version = '1.1.1'
aoe_suffix_version = 9
aoe_version_name = '1.1.2'
}
69 changes: 52 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="middle">
<img alt="AoE Logo" src="./images/aoe_logo_01.png" width="300" align="middle">
<img alt="AoE Logo" src="https://img0.didiglobal.com/static/gstar/img/AwRPnWCJkW1577246025490.png" width="300" align="middle">
</div>

![](https://github.com/didi/aoe/workflows/Android%20CI/badge.svg)
Expand All @@ -12,41 +12,76 @@
[路线图](./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)
- [iOS用户指南](./iOS/README.md)
- [Android Demo](./Android/examples/demo)
- [iOS Demo](./iOS/Demo)

## 三、Q&A
## 三、适配信息
<table>
<tr>
<th>AoE 版本</th>
<th>推理框架</th>
<th>依赖信息</th>
<th>推理框架版本</th>
</tr>
<tr>
<td rowspan="4">1.1.2</td>
<td>TensorFlow Lite</td>
<td>
[ Android ] com.didi.aoe.runtime-tensorflow-lite:1.1.2 <br>
[ iOS ] pod 'AoERuntime/TensorFlowLite','~> 1.1.2', <br>
</td>
<td>2.0.0</td>
</tr>
<tr>
<td>PyTorch</td>
<td>
[ Android ] com.didi.aoe.runtime-pytorch:1.1.2
</th>
<td>1.3.1</td>
</tr>
<tr>
<td>MNN</td>
<td>
[ Android ] com.didi.aoe.runtime-mnn:1.1.2 <br>
[ iOS ] pod 'AoERuntime/MNN','~> 1.1.2', <br>
</td>
<td>0.2.1.5</td>
</tr>
<tr>
<td>NCNN</td>
<td>
[ Android ] com.didi.aoe.runtime-ncnn:1.1.2 <br>
[ iOS ] pod 'AoERuntime/NCNN','~> 1.1.2', <br>
[ linux ] runtime-ncnn:1.1.2
</td>
<td>20191113</td>
</tr>
</table>

## 四、Q&A

加微信入群:*普惠出行产品技术*(备注 `AoE`

<img alt="普惠出行产品技术" src="https://img0.didiglobal.com/static/gstar/img/P8X9qN1d1B1576217775521.jpeg" width="196">



## 四、项目成员
## 五、项目成员
### 核心成员

[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 )研发助手,你值得拥有 :)
* 普惠出行产品技术公众号,欢迎关注。

<img alt="普惠出行产品技术公众号" src="https://img0.didiglobal.com/static/gstar/img/NlLuFeiqKU1570690897784.jpg" width="196">
2 changes: 1 addition & 1 deletion README_en.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="middle">
<img alt="AoE Logo" src="./images/aoe_logo_01.png" width="320" align="middle">
<img alt="AoE Logo" src="https://img0.didiglobal.com/static/gstar/img/AwRPnWCJkW1577246025490.png" width="320" align="middle">
</div>

[![Build Status](https://travis-ci.org/didi/AoE.svg?branch=master)](https://travis-ci.org/didi/AoE)
Expand Down
Binary file removed images/aoe_qq.jpeg
Binary file not shown.
Binary file removed images/mnist_android.jpeg
Binary file not shown.
Binary file removed images/squeeze_android.jpeg
Binary file not shown.
2 changes: 1 addition & 1 deletion linux/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_subdirectory(tool)
add_subdirectory(plugin)
add_subdirectory(core)
add_subdirectory(sample)
# add_subdirectory(sample) # opencv required


0 comments on commit 81d84b7

Please sign in to comment.