Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
94b172a7
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
94b172a7
编写于
8月 06, 2017
作者:
T
tensor-tang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix mkldnn lib bug, and mkldnnbase
上级
3c3a11a0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
101 addition
and
1 deletion
+101
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
paddle/gserver/layers/MkldnnBase.h
paddle/gserver/layers/MkldnnBase.h
+99
-0
paddle/gserver/layers/MkldnnLayer.h
paddle/gserver/layers/MkldnnLayer.h
+1
-0
未找到文件。
CMakeLists.txt
浏览文件 @
94b172a7
...
...
@@ -144,7 +144,7 @@ if(WITH_GPU)
endif
(
WITH_GPU
)
if
(
WITH_MKLDNN
)
list
(
APPEND EXTERNAL_LIBS
${
MKLDNN_LIB
RARY
}
${
MKLDNN_IOMP_LIB
}
)
list
(
APPEND EXTERNAL_LIBS
${
MKLDNN_LIB
}
${
MKLDNN_IOMP_LIB
}
)
endif
()
if
(
USE_NNPACK
)
...
...
paddle/gserver/layers/MkldnnBase.h
0 → 100644
浏览文件 @
94b172a7
/* Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#pragma once
#include "mkldnn.hpp"
namespace
paddle
{
typedef
enum
{
DNN_BASE
=
1
,
DNN_TESTS
=
1
,
DNN_SIZES
,
DNN_FMTS
,
DNN_TESTS_DETAILS
,
DNN_TESTS_MORE
,
DNN_ALL
,
}
DNN_LOG_LEVEL
;
/**
* @brief MKLDNN CPU engine.
*
*/
class
CpuEngine
{
public:
static
CpuEngine
&
Instance
()
{
// Thread-safe in C++11.
static
CpuEngine
myInstance
;
return
myInstance
;
}
// Disallow copy or move
CpuEngine
(
const
CpuEngine
&
)
=
delete
;
// Copy constructor
CpuEngine
(
CpuEngine
&&
)
=
delete
;
// Move constructor
CpuEngine
&
operator
=
(
const
CpuEngine
&
)
=
delete
;
// Copy assignment
CpuEngine
&
operator
=
(
CpuEngine
&&
)
=
delete
;
// Move assignment
mkldnn
::
engine
&
getEngine
()
{
return
cpuEngine_
;
}
protected:
CpuEngine
()
:
cpuEngine_
(
mkldnn
::
engine
::
cpu
,
0
)
{}
// CpuEngine() : cpuEngine_(mkldnn::engine::cpu_lazy, 0) {}
~
CpuEngine
()
{}
private:
mkldnn
::
engine
cpuEngine_
;
};
/**
* @brief MKLDNN Stream.
*
*/
class
MkldnnStream
{
public:
MkldnnStream
()
:
ready_
(
false
)
{
resetState
();
}
virtual
~
MkldnnStream
()
{}
/**
* @brief Submit stream
* @param prims The primitives vector
* block Waiting for the stream to complete
*/
void
submit
(
std
::
vector
<
mkldnn
::
primitive
>&
prims
,
bool
block
=
true
)
{
resetState
();
stream_
->
submit
(
prims
).
wait
(
block
);
ready_
=
false
;
}
/**
* @brief Reset the mkldnn stream
*/
void
resetState
()
{
if
(
ready_
)
{
return
;
}
// TODO(TJ): change me when mkldnn have method to reset this state
stream_
.
reset
(
new
mkldnn
::
stream
(
mkldnn
::
stream
::
kind
::
eager
));
// stream_.reset(new mkldnn::stream(mkldnn::stream::kind::lazy));
ready_
=
true
;
}
private:
bool
ready_
;
std
::
shared_ptr
<
mkldnn
::
stream
>
stream_
;
};
}
// namespace paddle
paddle/gserver/layers/MkldnnLayer.h
浏览文件 @
94b172a7
...
...
@@ -16,6 +16,7 @@ limitations under the License. */
#include <vector>
#include "Layer.h"
#include "MkldnnBase.h"
#include "mkldnn.hpp"
namespace
paddle
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录