Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr.Vain
Mace
提交
5586b9be
Mace
项目概览
Mr.Vain
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Mace
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5586b9be
编写于
4月 02, 2019
作者:
B
Bin Li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support arm64-v8a for Hexagon DSP
上级
808a1557
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
34 addition
and
7 deletion
+34
-7
docs/user_guide/basic_usage.rst
docs/user_guide/basic_usage.rst
+2
-0
mace/BUILD.bazel
mace/BUILD.bazel
+0
-1
third_party/hta/BUILD.bazel
third_party/hta/BUILD.bazel
+0
-0
third_party/nnlib/BUILD.bazel
third_party/nnlib/BUILD.bazel
+12
-1
third_party/nnlib/arm64-v8a/libcdsprpc.so
third_party/nnlib/arm64-v8a/libcdsprpc.so
+0
-0
third_party/nnlib/arm64-v8a/libhexagon_controller.so
third_party/nnlib/arm64-v8a/libhexagon_controller.so
+0
-0
third_party/nnlib/armeabi-v7a/libhexagon_controller.so
third_party/nnlib/armeabi-v7a/libhexagon_controller.so
+0
-0
tools/build-standalone-lib.sh
tools/build-standalone-lib.sh
+13
-2
tools/device.py
tools/device.py
+5
-2
tools/sh_commands.py
tools/sh_commands.py
+2
-1
未找到文件。
docs/user_guide/basic_usage.rst
浏览文件 @
5586b9be
...
...
@@ -50,6 +50,8 @@ Here we use the mobilenet-v2 model as an example.
.. note::
- This step can be skipped if you just want to run a model using ``tools/converter.py``, such as commands in step 5.
- Libraries in ``builds/lib/armeabi-v7a/cpu_gpu/`` means it can run on ``cpu`` or ``gpu`` devices.
- The results in ``builds/lib/armeabi-v7a/cpu_gpu_dsp/`` need HVX supported.
...
...
mace/BUILD.bazel
浏览文件 @
5586b9be
...
...
@@ -73,7 +73,6 @@ config_setting(
},
values
=
{
"crosstool_top"
:
"//external:android/crosstool"
,
"cpu"
:
"armeabi-v7a"
,
},
visibility
=
[
"//visibility:public"
],
)
...
...
third_party/hta/BUILD
→
third_party/hta/BUILD
.bazel
浏览文件 @
5586b9be
文件已移动
third_party/nnlib/BUILD.bazel
浏览文件 @
5586b9be
...
...
@@ -4,9 +4,20 @@ licenses(["notice"])
exports_files
([
"license.txt"
])
load
(
"//mace:mace.bzl"
,
"if_android_armv7"
,
"if_android_arm64"
,
)
cc_library
(
name
=
"libhexagon"
,
srcs
=
[
"libhexagon_controller.so"
],
srcs
=
if_android_armv7
([
"armeabi-v7a/libhexagon_controller.so"
,
])
+
if_android_arm64
([
"arm64-v8a/libcdsprpc.so"
,
"arm64-v8a/libhexagon_controller.so"
,
]),
hdrs
=
[
"hexagon_nn.h"
,
"ops.h"
,
...
...
third_party/nnlib/arm64-v8a/libcdsprpc.so
0 → 100755
浏览文件 @
5586b9be
文件已添加
third_party/nnlib/arm64-v8a/libhexagon_controller.so
0 → 100755
浏览文件 @
5586b9be
文件已添加
third_party/nnlib/libhexagon_controller.so
→
third_party/nnlib/
armeabi-v7a/
libhexagon_controller.so
浏览文件 @
5586b9be
无法预览此类型文件
tools/build-standalone-lib.sh
浏览文件 @
5586b9be
...
...
@@ -17,6 +17,7 @@ mkdir -p $LIB_DIR/armeabi-v7a/cpu_gpu_dsp
mkdir
-p
$LIB_DIR
/armeabi-v7a/cpu_gpu
rm
-rf
$LIB_DIR
/arm64-v8a
mkdir
-p
$LIB_DIR
/arm64-v8a/cpu_gpu_dsp
mkdir
-p
$LIB_DIR
/arm64-v8a/cpu_gpu
rm
-rf
$LIB_DIR
/linux-x86-64
...
...
@@ -34,7 +35,12 @@ mkdir -p $LIB_DIR/aarch64_linux_gnu/cpu_gpu
echo
"build shared lib for armeabi-v7a + cpu_gpu_dsp"
bazel build
--config
android
--config
optimization mace/libmace:libmace_dynamic
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
hexagon
=
true
--define
quantize
=
true
--cpu
=
armeabi-v7a
cp
bazel-bin/mace/libmace/libmace.so
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
cp
third_party/nnlib/
*
so
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
cp
third_party/nnlib/armeabi-v7a/
*
so
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
echo
"build shared lib for arm64-v8a + cpu_gpu_dsp"
bazel build
--config
android
--config
optimization mace/libmace:libmace_dynamic
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
hexagon
=
true
--define
quantize
=
true
--cpu
=
arm64-v8a
cp
bazel-bin/mace/libmace/libmace.so
$LIB_DIR
/arm64-v8a/cpu_gpu_dsp/
cp
third_party/nnlib/arm64-v8a/
*
so
$LIB_DIR
/arm64-v8a/cpu_gpu_dsp/
echo
"build shared lib for armeabi-v7a + cpu_gpu"
bazel build
--config
android
--config
optimization mace/libmace:libmace_dynamic
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
quantize
=
true
--cpu
=
armeabi-v7a
...
...
@@ -62,7 +68,12 @@ fi
echo
"build static lib for armeabi-v7a + cpu_gpu_dsp"
bazel build
--config
android
--config
optimization mace/libmace:libmace_static
--config
symbol_hidden
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
hexagon
=
true
--define
quantize
=
true
--cpu
=
armeabi-v7a
cp
bazel-genfiles/mace/libmace/libmace.a
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
cp
third_party/nnlib/
*
so
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
cp
third_party/nnlib/armeabi-v7a/
*
so
$LIB_DIR
/armeabi-v7a/cpu_gpu_dsp/
echo
"build static lib for arm64-v8a + cpu_gpu_dsp"
bazel build
--config
android
--config
optimization mace/libmace:libmace_static
--config
symbol_hidden
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
hexagon
=
true
--define
quantize
=
true
--cpu
=
arm64-v8a
cp
bazel-genfiles/mace/libmace/libmace.a
$LIB_DIR
/arm64-v8a/cpu_gpu_dsp/
cp
third_party/nnlib/arm64-v8a/
*
so
$LIB_DIR
/arm64-v8a/cpu_gpu_dsp/
echo
"build static lib for armeabi-v7a + cpu_gpu"
bazel build
--config
android
--config
optimization mace/libmace:libmace_static
--config
symbol_hidden
--define
neon
=
true
--define
openmp
=
true
--define
opencl
=
true
--define
quantize
=
true
--cpu
=
armeabi-v7a
...
...
tools/device.py
浏览文件 @
5586b9be
...
...
@@ -270,8 +270,11 @@ class DeviceWrapper:
if
os
.
path
.
exists
(
opencl_parameter_file
):
self
.
push
(
opencl_parameter_file
,
self
.
data_dir
)
self
.
push
(
"third_party/nnlib/libhexagon_controller.so"
,
self
.
data_dir
)
if
self
.
system
==
SystemType
.
android
\
and
device_type
==
common
.
DeviceType
.
HEXAGON
:
self
.
push
(
"third_party/nnlib/%s/libhexagon_controller.so"
%
abi
,
self
.
data_dir
)
mace_model_phone_path
=
""
if
model_graph_format
==
ModelFormat
.
file
:
...
...
tools/sh_commands.py
浏览文件 @
5586b9be
...
...
@@ -902,7 +902,8 @@ def build_run_throughput_test(abi,
adb_push
(
"codegen/models/%s/%s.data"
%
dsp_model_tag
,
phone_data_dir
,
serialno
)
adb_push
(
"third_party/nnlib/libhexagon_controller.so"
,
adb_push
(
"third_party/nnlib/%s/libhexagon_controller.so"
%
abi
,
phone_data_dir
,
serialno
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录