Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野马c
Mace
提交
b6ad52d6
Mace
项目概览
野马c
/
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,发现更多精彩内容 >>
提交
b6ad52d6
编写于
12月 28, 2017
作者:
刘
刘琦
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-no-return' into 'master'
Fix no return error See merge request !190
上级
1359d640
e175a1fc
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
27 addition
and
22 deletion
+27
-22
mace/codegen/BUILD
mace/codegen/BUILD
+4
-4
mace/core/BUILD
mace/core/BUILD
+2
-2
mace/core/operator.cc
mace/core/operator.cc
+4
-1
mace/examples/BUILD
mace/examples/BUILD
+3
-3
mace/kernels/BUILD
mace/kernels/BUILD
+3
-2
mace/ops/BUILD
mace/ops/BUILD
+3
-3
mace/tools/benchmark/BUILD
mace/tools/benchmark/BUILD
+2
-2
mace/utils/BUILD
mace/utils/BUILD
+6
-5
未找到文件。
mace/codegen/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -10,7 +10,7 @@ load("//mace:mace.bzl", "if_embed_binary_program")
cc_library
(
name
=
"generated_models_lib"
,
srcs
=
glob
([
"models/*/*.cc"
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
deps
=
[
"//mace/core"
,
...
...
@@ -25,21 +25,21 @@ cc_library(
cc_library
(
name
=
"generated_opencl_lib"
,
srcs
=
glob
([
"opencl/*.cc"
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
)
cc_library
(
name
=
"generated_tuning_lib"
,
srcs
=
glob
([
"tuning/*.cc"
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
)
cc_library
(
name
=
"version_lib"
,
srcs
=
glob
([
"version/*.cc"
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
deps
=
[
"//mace/core"
,
...
...
mace/core/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -21,7 +21,7 @@ cc_library(
"runtime/opencl/cl2.hpp"
,
"runtime/opencl/*.h"
,
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
]
+
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
]
+
if_profiling_enabled
([
"-DMACE_OPENCL_PROFILING"
])
+
if_embed_binary_program
([
"-DMACE_EMBED_BINARY_PROGRAM"
]),
linkopts
=
if_android
([
"-pie"
,
"-ldl"
]),
...
...
@@ -43,7 +43,7 @@ cc_library(
"testing/test_benchmark.cc"
,
"testing/test_benchmark_main.cc"
,
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
alwayslink
=
1
,
deps
=
[
":core"
,
...
...
mace/core/operator.cc
浏览文件 @
b6ad52d6
...
...
@@ -14,7 +14,10 @@ OperatorBase::OperatorBase(const OperatorDef &operator_def, Workspace *ws)
OpKeyBuilder
::
OpKeyBuilder
(
const
char
*
op_name
)
:
op_name_
(
op_name
)
{}
OpKeyBuilder
&
OpKeyBuilder
::
Device
(
DeviceType
device
)
{
device_type_
=
device
;
}
OpKeyBuilder
&
OpKeyBuilder
::
Device
(
DeviceType
device
)
{
device_type_
=
device
;
return
*
this
;
}
OpKeyBuilder
&
OpKeyBuilder
::
TypeConstraint
(
const
char
*
attr_name
,
const
DataType
allowed
)
{
...
...
mace/examples/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -6,7 +6,7 @@ cc_binary(
srcs
=
[
"helloworld.cc"
,
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_enable_neon
([
"-fopenmp"
]),
deps
=
[
"//mace/core"
,
...
...
@@ -18,7 +18,7 @@ cc_test(
name
=
"benchmark_example"
,
testonly
=
1
,
srcs
=
[
"benchmark_example.cc"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_enable_neon
([
"-fopenmp"
]),
linkstatic
=
1
,
deps
=
[
...
...
@@ -30,7 +30,7 @@ cc_test(
cc_binary
(
name
=
"mace_run"
,
srcs
=
[
"mace_run.cc"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_enable_neon
([
"-fopenmp"
]),
linkstatic
=
1
,
deps
=
[
...
...
mace/kernels/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -20,6 +20,7 @@ cc_library(
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
,
]
+
if_embed_binary_program
([
"-DMACE_EMBED_BINARY_PROGRAM"
])
+
if_enable_neon
([
"-fopenmp"
]),
...
...
@@ -34,7 +35,7 @@ cc_test(
name
=
"kernel_test"
,
testonly
=
1
,
srcs
=
glob
([
"test/*.cc"
]),
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_android
([
"-pie"
]),
linkstatic
=
1
,
deps
=
[
...
...
@@ -48,7 +49,7 @@ cc_test(
name
=
"benchmark"
,
testonly
=
1
,
srcs
=
glob
([
"benchmark/*.cc"
]),
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
deps
=
[
":kernels"
,
...
...
mace/ops/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -34,7 +34,7 @@ cc_library(
[
"*.h"
],
exclude
=
[
"ops_test_util.h"
],
),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
]
+
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
]
+
if_enable_neon
([
"-DMACE_ENABLE_NEON"
]),
deps
=
[
"//mace/kernels"
,
...
...
@@ -48,7 +48,7 @@ cc_test(
srcs
=
glob
(
[
"*_test.cc"
],
),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
[
"-fopenmp"
],
linkstatic
=
1
,
deps
=
[
...
...
@@ -62,7 +62,7 @@ cc_test(
name
=
"ops_benchmark"
,
testonly
=
1
,
srcs
=
glob
([
"*_benchmark.cc"
]),
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
[
"-fopenmp"
],
linkstatic
=
1
,
deps
=
[
...
...
mace/tools/benchmark/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -7,7 +7,7 @@ cc_library(
name
=
"stat_summarizer"
,
srcs
=
[
"stat_summarizer.cc"
],
hdrs
=
[
"stat_summarizer.h"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
deps
=
[
"//mace/core"
,
...
...
@@ -19,7 +19,7 @@ cc_binary(
srcs
=
[
"benchmark_model.cc"
,
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkstatic
=
1
,
deps
=
[
":stat_summarizer"
,
...
...
mace/utils/BUILD
浏览文件 @
b6ad52d6
...
...
@@ -17,7 +17,7 @@ cc_library(
hdrs
=
[
"logging.h"
,
],
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_android
([
"-llog"
,
]),
...
...
@@ -31,7 +31,7 @@ cc_library(
hdrs
=
[
"command_line_flags.h"
,
],
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
deps
=
[
":logging"
,
],
...
...
@@ -43,7 +43,7 @@ cc_library(
"tuner.h"
,
"timer.h"
,
],
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
deps
=
[
":utils_hdrs"
,
":logging"
,
...
...
@@ -56,7 +56,7 @@ cc_test(
srcs
=
[
"tuner_test.cc"
,
],
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
linkopts
=
if_android
([
"-pie"
,
"-lm"
]),
linkstatic
=
1
,
deps
=
[
...
...
@@ -72,7 +72,7 @@ cc_library(
"utils.h"
,
"env_time.h"
,
],
copts
=
[
"-std=c++11"
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
)
cc_library
(
...
...
@@ -83,4 +83,5 @@ cc_library(
":command_line_flags"
,
":logging"
,
],
copts
=
[
"-std=c++11"
,
"-D_GLIBCXX_USE_C99_MATH_TR1"
,
"-Werror=return-type"
],
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录