Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
闹闹不闹!
Mace
提交
df23f428
Mace
项目概览
闹闹不闹!
/
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,发现更多精彩内容 >>
提交
df23f428
编写于
9月 13, 2018
作者:
刘
刘琦
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'support_ubuntu18' into 'master'
support ubuntu18 with gcc7.3 See merge request !795
上级
9e79fef3
51ca5d0d
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
18 addition
and
7 deletion
+18
-7
mace/core/runtime/cpu/cpu_runtime.cc
mace/core/runtime/cpu/cpu_runtime.cc
+1
-1
mace/kernels/activation.h
mace/kernels/activation.h
+1
-0
mace/kernels/conv_pool_2d_util.cc
mace/kernels/conv_pool_2d_util.cc
+1
-0
mace/kernels/eltwise.h
mace/kernels/eltwise.h
+1
-0
mace/kernels/gather.h
mace/kernels/gather.h
+1
-0
mace/kernels/local_response_norm.h
mace/kernels/local_response_norm.h
+1
-0
mace/kernels/quantize.h
mace/kernels/quantize.h
+1
-0
mace/kernels/resize_bicubic.h
mace/kernels/resize_bicubic.h
+1
-0
mace/kernels/sgemm.cc
mace/kernels/sgemm.cc
+8
-5
mace/kernels/sgemm.h
mace/kernels/sgemm.h
+1
-1
mace/kernels/strided_slice.h
mace/kernels/strided_slice.h
+1
-0
未找到文件。
mace/core/runtime/cpu/cpu_runtime.cc
浏览文件 @
df23f428
...
...
@@ -39,7 +39,7 @@ int MaceOpenMPThreadCount = 1;
namespace
{
int
GetCPUCount
()
{
char
path
[
32
];
char
path
[
64
];
int
cpu_count
=
0
;
int
result
=
0
;
...
...
mace/kernels/activation.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_ACTIVATION_H_
#include <algorithm>
#include <cmath>
#include <memory>
#include <string>
#include <vector>
...
...
mace/kernels/conv_pool_2d_util.cc
浏览文件 @
df23f428
...
...
@@ -15,6 +15,7 @@
#include "mace/kernels/conv_pool_2d_util.h"
#include <algorithm>
#include <cmath>
#include <vector>
namespace
mace
{
...
...
mace/kernels/eltwise.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_ELTWISE_H_
#include <algorithm>
#include <cmath>
#include <functional>
#include <memory>
#include <utility>
...
...
mace/kernels/gather.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_GATHER_H_
#include <algorithm>
#include <cmath>
#include <functional>
#include <vector>
...
...
mace/kernels/local_response_norm.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_LOCAL_RESPONSE_NORM_H_
#include <algorithm>
#include <cmath>
#include <memory>
#include <vector>
...
...
mace/kernels/quantize.h
浏览文件 @
df23f428
...
...
@@ -15,6 +15,7 @@
#ifndef MACE_KERNELS_QUANTIZE_H_
#define MACE_KERNELS_QUANTIZE_H_
#include <cmath>
#include <vector>
#include <algorithm>
#include <limits>
...
...
mace/kernels/resize_bicubic.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_RESIZE_BICUBIC_H_
#include <algorithm>
#include <cmath>
#include <memory>
#include <vector>
...
...
mace/kernels/sgemm.cc
浏览文件 @
df23f428
...
...
@@ -965,7 +965,7 @@ void SGemm::PackPerBatch(const MatrixMap<const float> &src,
const
index_t
width
=
src
.
col
();
auto
src_data
=
src
.
batch_data
(
batch_index
);
if
(
src
.
major
()
==
Major
::
RowMajor
&&
order
==
PackOrder
::
ColMajor
)
{
if
(
src
.
ma
p_ma
jor
()
==
Major
::
RowMajor
&&
order
==
PackOrder
::
ColMajor
)
{
// This is for packing no-transpose lhs.
index_t
h
=
0
;
#if defined(MACE_ENABLE_NEON)
...
...
@@ -1011,7 +1011,8 @@ void SGemm::PackPerBatch(const MatrixMap<const float> &src,
for
(
index_t
ih
=
h
;
ih
<
height
;
++
ih
)
{
std
::
copy_n
(
src_data
+
ih
*
width
,
width
,
packed_data
+
ih
*
width
);
}
}
else
if
(
src
.
major
()
==
Major
::
ColMajor
&&
order
==
PackOrder
::
ColMajor
)
{
}
else
if
(
src
.
map_major
()
==
Major
::
ColMajor
&&
order
==
PackOrder
::
ColMajor
)
{
// This is for packing transpose-needed lhs.
index_t
h
=
0
;
#if defined(MACE_ENABLE_NEON)
...
...
@@ -1052,7 +1053,8 @@ void SGemm::PackPerBatch(const MatrixMap<const float> &src,
packed_data_ptr
[
w
]
=
src_data_ptr
[
w
*
height
];
}
}
}
else
if
(
src
.
major
()
==
Major
::
RowMajor
&&
order
==
PackOrder
::
RowMajor
)
{
}
else
if
(
src
.
map_major
()
==
Major
::
RowMajor
&&
order
==
PackOrder
::
RowMajor
)
{
// This is for packing no-transpose rhs.
index_t
w
=
0
;
#if defined(MACE_ENABLE_NEON)
...
...
@@ -1077,7 +1079,8 @@ void SGemm::PackPerBatch(const MatrixMap<const float> &src,
packed_data_ptr
[
h
]
=
src_data_ptr
[
h
*
width
];
}
}
}
else
if
(
src
.
major
()
==
Major
::
ColMajor
&&
order
==
PackOrder
::
RowMajor
)
{
}
else
if
(
src
.
map_major
()
==
Major
::
ColMajor
&&
order
==
PackOrder
::
RowMajor
)
{
// This is for packing transpose-needed rhs.
index_t
w
=
0
;
#if defined(MACE_ENABLE_NEON)
...
...
@@ -1113,7 +1116,7 @@ void SGemm::UnPackPerBatch(const float *packed_data,
const
index_t
width
=
matrix_map
->
col
();
auto
unpacked_data
=
matrix_map
->
batch_data
(
batch_index
);
if
(
matrix_map
->
major
()
==
Major
::
RowMajor
)
{
if
(
matrix_map
->
ma
p_ma
jor
()
==
Major
::
RowMajor
)
{
// This is for non-transposed result
index_t
w
=
0
;
#if defined(MACE_ENABLE_NEON)
...
...
mace/kernels/sgemm.h
浏览文件 @
df23f428
...
...
@@ -74,7 +74,7 @@ class MatrixMap {
return
stride_
;
}
Major
major
()
const
{
Major
ma
p_ma
jor
()
const
{
return
major_
;
}
...
...
mace/kernels/strided_slice.h
浏览文件 @
df23f428
...
...
@@ -16,6 +16,7 @@
#define MACE_KERNELS_STRIDED_SLICE_H_
#include <algorithm>
#include <cmath>
#include <memory>
#include <vector>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录