Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
fa2c06fb
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,发现更多精彩内容 >>
提交
fa2c06fb
编写于
12月 13, 2016
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add comments
上级
a3043989
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
130 addition
and
69 deletion
+130
-69
paddle/math/RowBuffer.h
paddle/math/RowBuffer.h
+127
-0
paddle/math/SparseRowMatrix.h
paddle/math/SparseRowMatrix.h
+3
-69
未找到文件。
paddle/math/RowBuffer.h
0 → 100644
浏览文件 @
fa2c06fb
/* Copyright (c) 2016 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 <vector>
#include "MemoryHandle.h"
#include "paddle/utils/Util.h"
namespace
paddle
{
/**
* @brief The RowBuffer class
* Represent the SparseRow Matrix Data.
*
* If not set memory handler, then the data could be auto growth.
*/
class
RowBuffer
{
public:
/**
* @brief RowBuffer create a auto-growth row buffer. The row length is width.
* @param width the length of each row, a.k.a matrix width.
*/
explicit
RowBuffer
(
size_t
width
)
:
width_
(
width
)
{}
/**
* @brief RowBuffer create a row buffer, which cannot be auto-growth.
* @param mem the pre-allocated memory.
* @param width the length of each row, a.k.a matrix width.
*/
RowBuffer
(
const
CpuMemHandlePtr
&
mem
,
size_t
width
)
:
preallocatedBuf_
(
mem
),
width_
(
width
)
{}
/**
* @brief resize resize the buffer with rowCount
* @param rowCnt number of row. matrix height.
*/
inline
void
resize
(
int
rowCnt
)
{
if
(
preallocatedBuf_
)
{
CHECK
(
preallocatedBuf_
->
getSize
()
<
rowCnt
*
width_
*
sizeof
(
real
));
}
else
{
rowStore_
.
resize
(
rowCnt
*
width_
);
}
}
/**
* @brief get a row buffer with row index.
* @param row the index of row.
* @return row buffer.
*/
inline
const
real
*
get
(
int
row
)
const
{
if
(
preallocatedBuf_
)
{
CHECK_LE
((
row
+
1
)
*
width_
*
sizeof
(
real
),
preallocatedBuf_
->
getSize
());
return
reinterpret_cast
<
real
*>
(
preallocatedBuf_
->
getBuf
())
+
row
*
width_
;
}
else
{
CHECK_LE
((
row
+
1
)
*
width_
,
rowStore_
.
size
());
return
rowStore_
.
data
()
+
row
*
width_
;
}
}
/**
* @brief get a row buffer with row index. If row index is larger than local
* buffer, the size of local buffer will grow.
* @param row the index of row.
* @return row buffer.
*/
inline
const
real
*
getWithAutoGrowth
(
int
row
)
{
if
(
preallocatedBuf_
)
{
return
get
(
row
);
}
else
{
if
((
rowStore_
.
size
()
<=
row
*
width_
))
{
rowStore_
.
resize
((
row
+
1
)
*
width_
);
}
return
rowStore_
.
data
()
+
row
*
width_
;
}
}
/**
* @return raw data buffer.
*/
inline
real
*
data
()
{
if
(
preallocatedBuf_
)
{
return
reinterpret_cast
<
real
*>
(
preallocatedBuf_
->
getBuf
());
}
else
{
return
rowStore_
.
data
();
}
}
/**
* @brief clear local buffer. It only affect auto-growth buffer.
*/
inline
void
clear
()
{
rowStore_
.
clear
();
}
/**
* @brief get current number of rows.
* @return number of rows.
*/
inline
size_t
getRowCount
()
const
{
if
(
preallocatedBuf_
)
{
return
preallocatedBuf_
->
getSize
()
/
sizeof
(
float
)
/
width_
;
}
else
{
return
rowStore_
.
size
()
/
width_
;
}
}
/**
* @brief get is this buffer can automatically grow or not.
* @return ture if can automacitally grow.
*/
inline
bool
isAutoGrowth
()
const
{
return
preallocatedBuf_
==
nullptr
;
}
private:
CpuMemHandlePtr
preallocatedBuf_
;
std
::
vector
<
real
,
AlignedAllocator
<
real
,
32
>>
rowStore_
;
size_t
width_
;
};
}
// namespace paddle
paddle/math/SparseRowMatrix.h
浏览文件 @
fa2c06fb
...
...
@@ -17,6 +17,7 @@ limitations under the License. */
#include <string.h>
#include <algorithm>
#include "Matrix.h"
#include "RowBuffer.h"
#include "paddle/utils/CommandLineParser.h"
#include "paddle/utils/Util.h"
...
...
@@ -24,73 +25,6 @@ P_DECLARE_bool(allow_inefficient_sparse_update);
namespace
paddle
{
/**
* @brief The RowBuffer class
* Represent the SparseRow Matrix Data.
*
* If not set memory handler, then the data could be auto growth.
*/
class
RowBuffer
{
public:
explicit
RowBuffer
(
size_t
width
)
:
width_
(
width
)
{}
RowBuffer
(
const
CpuMemHandlePtr
&
mem
,
size_t
width
)
:
preallocatedBuf_
(
mem
),
width_
(
width
)
{}
inline
void
reserve
(
int
rowCnt
)
{
if
(
preallocatedBuf_
)
{
CHECK
(
preallocatedBuf_
->
getSize
()
<
rowCnt
*
width_
*
sizeof
(
real
));
}
else
{
rowStore_
.
reserve
(
rowCnt
*
width_
);
}
}
inline
const
real
*
get
(
int
row
)
const
{
if
(
preallocatedBuf_
)
{
CHECK_LE
((
row
+
1
)
*
width_
*
sizeof
(
real
),
preallocatedBuf_
->
getSize
());
return
reinterpret_cast
<
real
*>
(
preallocatedBuf_
->
getBuf
())
+
row
*
width_
;
}
else
{
CHECK_LE
((
row
+
1
)
*
width_
,
rowStore_
.
size
());
return
rowStore_
.
data
()
+
row
*
width_
;
}
}
inline
const
real
*
getWithAutoGrowth
(
int
row
)
{
if
(
preallocatedBuf_
)
{
return
get
(
row
);
}
else
{
if
((
rowStore_
.
size
()
<=
row
*
width_
))
{
rowStore_
.
resize
((
row
+
1
)
*
width_
);
}
return
rowStore_
.
data
()
+
row
*
width_
;
}
}
inline
real
*
data
()
{
if
(
preallocatedBuf_
)
{
return
reinterpret_cast
<
real
*>
(
preallocatedBuf_
->
getBuf
());
}
else
{
return
rowStore_
.
data
();
}
}
inline
void
clear
()
{
rowStore_
.
clear
();
}
inline
size_t
getRowCount
()
const
{
if
(
preallocatedBuf_
)
{
return
preallocatedBuf_
->
getSize
()
/
sizeof
(
float
)
/
width_
;
}
else
{
return
rowStore_
.
size
()
/
width_
;
}
}
inline
bool
canAutoGrowth
()
const
{
return
preallocatedBuf_
==
nullptr
;
}
private:
CpuMemHandlePtr
preallocatedBuf_
;
std
::
vector
<
real
,
AlignedAllocator
<
real
,
32
>>
rowStore_
;
size_t
width_
;
};
/**
* Sparse Row
*/
...
...
@@ -146,7 +80,7 @@ public:
* This is only used when SparseRowCpuMatrix is constructed with
* indexDictHandle.
*/
void
reserveStore
()
{
buf_
->
res
erv
e
(
localIndices_
->
size
());
}
void
reserveStore
()
{
buf_
->
res
iz
e
(
localIndices_
->
size
());
}
// row is the row id in the original matrix
virtual
real
*
getRowBuf
(
size_t
row
)
{
return
getRow
(
row
);
}
...
...
@@ -249,7 +183,7 @@ protected:
}
inline
void
checkStoreSize
()
{
if
(
buf_
->
can
AutoGrowth
())
{
if
(
buf_
->
is
AutoGrowth
())
{
if
(
buf_
->
getRowCount
()
>
0.5
*
height_
)
{
LOG
(
WARNING
)
<<
"There are more than 0.5*height ("
<<
localIndices_
->
size
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录