Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
毕竟曾有刹那
Mace
提交
684d27fc
Mace
项目概览
毕竟曾有刹那
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
0
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,发现更多精彩内容 >>
提交
684d27fc
编写于
9月 24, 2019
作者:
B
Bin Li
提交者:
叶剑武
10月 28, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the same Android API for cmake and bazel
上级
f76207d3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
6 deletion
+7
-6
mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
+3
-3
tools/cmake/cmake-build-arm64-v8a.sh
tools/cmake/cmake-build-arm64-v8a.sh
+1
-1
tools/cmake/cmake-build-armeabi-v7a.sh
tools/cmake/cmake-build-armeabi-v7a.sh
+1
-1
tools/python/transform/transformer.py
tools/python/transform/transformer.py
+2
-1
未找到文件。
mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
浏览文件 @
684d27fc
...
@@ -313,9 +313,9 @@ bool HexagonHTAWrapper::ExecuteGraphNew(
...
@@ -313,9 +313,9 @@ bool HexagonHTAWrapper::ExecuteGraphNew(
}
}
auto
output_tensor
=
output_tensors
->
at
(
output_info_
[
i
].
name
);
auto
output_tensor
=
output_tensors
->
at
(
output_info_
[
i
].
name
);
MACE_CHECK
(
static_cast
<
index_t
>
(
outputs
[
i
].
data_valid_len
)
MACE_CHECK
(
static_cast
<
index_t
>
(
outputs
[
i
].
data_valid_len
)
==
output_tensor
->
raw_
size
(),
==
output_tensor
->
size
(),
outputs
[
i
].
data_valid_len
,
" vs "
,
output_tensor
->
raw_
size
(),
outputs
[
i
].
data_valid_len
,
" vs "
,
output_tensor
->
size
(),
" wrong output
bytes
inferred."
);
" wrong output
size
inferred."
);
const
uint8_t
*
output_data_u8
=
output_info_
[
i
].
tensor_u8
->
data
<
uint8_t
>
();
const
uint8_t
*
output_data_u8
=
output_info_
[
i
].
tensor_u8
->
data
<
uint8_t
>
();
float
*
output_data
=
output_tensor
->
mutable_data
<
float
>
();
float
*
output_data
=
output_tensor
->
mutable_data
<
float
>
();
...
...
tools/cmake/cmake-build-arm64-v8a.sh
浏览文件 @
684d27fc
...
@@ -29,7 +29,7 @@ fi
...
@@ -29,7 +29,7 @@ fi
mkdir
-p
${
BUILD_DIR
}
&&
cd
${
BUILD_DIR
}
mkdir
-p
${
BUILD_DIR
}
&&
cd
${
BUILD_DIR
}
cmake
-DANDROID_ABI
=
"arm64-v8a"
\
cmake
-DANDROID_ABI
=
"arm64-v8a"
\
-DCMAKE_TOOLCHAIN_FILE
=
${
ANDROID_NDK_HOME
}
/build/cmake/android.toolchain.cmake
\
-DCMAKE_TOOLCHAIN_FILE
=
${
ANDROID_NDK_HOME
}
/build/cmake/android.toolchain.cmake
\
-DANDROID_NATIVE_API_LEVEL
=
2
8
\
-DANDROID_NATIVE_API_LEVEL
=
2
1
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DANDROID_STL
=
c++_shared
\
-DANDROID_STL
=
c++_shared
\
-DMACE_ENABLE_NEON
=
ON
\
-DMACE_ENABLE_NEON
=
ON
\
...
...
tools/cmake/cmake-build-armeabi-v7a.sh
浏览文件 @
684d27fc
...
@@ -31,7 +31,7 @@ mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
...
@@ -31,7 +31,7 @@ mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
cmake
-DANDROID_ABI
=
"armeabi-v7a"
\
cmake
-DANDROID_ABI
=
"armeabi-v7a"
\
-DANDROID_ARM_NEON
=
ON
\
-DANDROID_ARM_NEON
=
ON
\
-DCMAKE_TOOLCHAIN_FILE
=
${
ANDROID_NDK_HOME
}
/build/cmake/android.toolchain.cmake
\
-DCMAKE_TOOLCHAIN_FILE
=
${
ANDROID_NDK_HOME
}
/build/cmake/android.toolchain.cmake
\
-DANDROID_NATIVE_API_LEVEL
=
2
8
\
-DANDROID_NATIVE_API_LEVEL
=
2
1
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DANDROID_STL
=
c++_shared
\
-DANDROID_STL
=
c++_shared
\
-DMACE_ENABLE_NEON
=
ON
\
-DMACE_ENABLE_NEON
=
ON
\
...
...
tools/python/transform/transformer.py
浏览文件 @
684d27fc
...
@@ -887,7 +887,8 @@ class Transformer(base_converter.ConverterInterface):
...
@@ -887,7 +887,8 @@ class Transformer(base_converter.ConverterInterface):
def
flatten_atrous_conv
(
self
):
def
flatten_atrous_conv
(
self
):
if
self
.
_option
.
device
!=
DeviceType
.
GPU
.
value
\
if
self
.
_option
.
device
!=
DeviceType
.
GPU
.
value
\
and
self
.
_option
.
device
!=
DeviceType
.
APU
.
value
:
and
self
.
_option
.
device
!=
DeviceType
.
APU
.
value
\
and
self
.
_option
.
device
!=
DeviceType
.
HTA
.
value
:
return
return
net
=
self
.
_model
net
=
self
.
_model
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录