Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
f22573bd
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f22573bd
编写于
11月 08, 2016
作者:
W
wangyang59
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
changed to isUsingGpu() in PaddleAPI.h and throw exceptions instead of CHECK
上级
2be3a747
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
18 deletion
+33
-18
paddle/api/Matrix.cpp
paddle/api/Matrix.cpp
+6
-2
paddle/api/PaddleAPI.h
paddle/api/PaddleAPI.h
+14
-11
paddle/api/Util.cpp
paddle/api/Util.cpp
+1
-1
paddle/api/Vector.cpp
paddle/api/Vector.cpp
+12
-4
未找到文件。
paddle/api/Matrix.cpp
浏览文件 @
f22573bd
...
...
@@ -53,10 +53,14 @@ Matrix* Matrix::createDense(const std::vector<float>& data, size_t height,
}
Matrix
*
Matrix
::
createDenseFromNumpy
(
float
*
data
,
int
dim1
,
int
dim2
,
bool
copy
,
bool
useGpu
)
{
bool
copy
,
bool
useGpu
)
throw
(
UnsupportError
)
{
if
(
useGpu
)
{
/// Gpu mode only supports copy=True
CHECK
(
copy
);
if
(
!
copy
)
{
UnsupportError
e
;
throw
e
;
}
return
Matrix
::
createGpuDenseFromNumpy
(
data
,
dim1
,
dim2
);
}
else
{
return
Matrix
::
createCpuDenseFromNumpy
(
data
,
dim1
,
dim2
,
copy
);
...
...
paddle/api/PaddleAPI.h
浏览文件 @
f22573bd
...
...
@@ -43,7 +43,7 @@ using namespace paddle::enumeration_wrapper; // NOLINT
void
initPaddle
(
int
argc
,
char
**
argv
);
/// Return FLAGS_use_gpu
bool
isUs
e
Gpu
();
bool
isUs
ing
Gpu
();
/// Return true if this py_paddle is compiled in GPU Version
bool
isGpuVersion
();
...
...
@@ -105,7 +105,7 @@ public:
* Create A Matrix with height,width, which is filled by zero.
*/
static
Matrix
*
createZero
(
size_t
height
,
size_t
width
,
bool
useGpu
=
isUs
e
Gpu
());
bool
useGpu
=
isUs
ing
Gpu
());
/**
* Create Sparse Matrix.
...
...
@@ -118,7 +118,7 @@ public:
*/
static
Matrix
*
createSparse
(
size_t
height
,
size_t
width
,
size_t
nnz
,
bool
isNonVal
=
true
,
bool
trans
=
false
,
bool
useGpu
=
isUs
e
Gpu
());
bool
useGpu
=
isUs
ing
Gpu
());
/**
* Create Dense Matrix.
...
...
@@ -127,11 +127,12 @@ public:
* @note the value will be copy into a new matrix.
*/
static
Matrix
*
createDense
(
const
std
::
vector
<
float
>&
data
,
size_t
height
,
size_t
width
,
bool
useGpu
=
isUs
e
Gpu
());
size_t
width
,
bool
useGpu
=
isUs
ing
Gpu
());
static
Matrix
*
createDenseFromNumpy
(
float
*
data
,
int
dim1
,
int
dim2
,
bool
copy
=
true
,
bool
useGpu
=
isUseGpu
());
bool
useGpu
=
isUsingGpu
())
throw
(
UnsupportError
)
;
/**
* Create Cpu Dense Matrix from numpy matrix, dtype=float32
...
...
@@ -229,7 +230,7 @@ public:
~
Vector
();
/// Create Vector filled with zero.
static
Vector
*
createZero
(
size_t
sz
,
bool
useGpu
=
isUs
e
Gpu
());
static
Vector
*
createZero
(
size_t
sz
,
bool
useGpu
=
isUs
ing
Gpu
());
/**
* Create Vector from list of float.
...
...
@@ -237,10 +238,11 @@ public:
* It will create a new vector, and copy data into it.
*/
static
Vector
*
create
(
const
std
::
vector
<
float
>&
data
,
bool
useGpu
=
isUs
e
Gpu
());
bool
useGpu
=
isUs
ing
Gpu
());
static
Vector
*
createVectorFromNumpy
(
float
*
data
,
int
dim
,
bool
copy
=
true
,
bool
useGpu
=
isUseGpu
());
bool
useGpu
=
isUsingGpu
())
throw
(
UnsupportError
)
;
/**
* Create Cpu Vector from numpy array, which dtype=float32
*
...
...
@@ -290,17 +292,18 @@ class IVector {
public:
/// Create IVector filled with zero
static
IVector
*
createZero
(
size_t
sz
,
bool
useGpu
=
isUs
e
Gpu
());
static
IVector
*
createZero
(
size_t
sz
,
bool
useGpu
=
isUs
ing
Gpu
());
/**
* Create IVector from list of int.
* It will create a new vector, and copy data into it.
*/
static
IVector
*
create
(
const
std
::
vector
<
int
>&
data
,
bool
useGpu
=
isUs
e
Gpu
());
bool
useGpu
=
isUs
ing
Gpu
());
static
IVector
*
createVectorFromNumpy
(
int
*
data
,
int
dim
,
bool
copy
=
true
,
bool
useGpu
=
isUseGpu
());
bool
useGpu
=
isUsingGpu
())
throw
(
UnsupportError
)
;
/**
* Create Cpu IVector from numpy array, which dtype=int32
...
...
paddle/api/Util.cpp
浏览文件 @
f22573bd
...
...
@@ -41,7 +41,7 @@ IntWithFloatArray::IntWithFloatArray(const float* v, const int* i, size_t l,
bool
f
)
:
valBuf
(
v
),
idxBuf
(
i
),
length
(
l
),
needFree
(
f
)
{}
bool
isUs
e
Gpu
()
{
return
FLAGS_use_gpu
;}
bool
isUs
ing
Gpu
()
{
return
FLAGS_use_gpu
;}
bool
isGpuVersion
()
{
#ifdef PADDLE_ONLY_CPU
...
...
paddle/api/Vector.cpp
浏览文件 @
f22573bd
...
...
@@ -40,10 +40,14 @@ IVector* IVector::create(const std::vector<int>& data, bool useGpu) {
}
IVector
*
IVector
::
createVectorFromNumpy
(
int
*
data
,
int
dim
,
bool
copy
,
bool
useGpu
)
{
bool
useGpu
)
throw
(
UnsupportError
)
{
if
(
useGpu
)
{
/// if use gpu only copy=true is supported
CHECK
(
copy
);
if
(
!
copy
)
{
UnsupportError
e
;
throw
e
;
}
return
IVector
::
createGpuVectorFromNumpy
(
data
,
dim
);
}
else
{
return
IVector
::
createCpuVectorFromNumpy
(
data
,
dim
,
copy
);
...
...
@@ -200,10 +204,14 @@ Vector* Vector::createByPaddleVectorPtr(void* ptr) {
}
Vector
*
Vector
::
createVectorFromNumpy
(
float
*
data
,
int
dim
,
bool
copy
,
bool
useGpu
)
{
bool
useGpu
)
throw
(
UnsupportError
)
{
if
(
useGpu
)
{
/// if use gpu only copy=True is supported
CHECK
(
copy
);
if
(
!
copy
)
{
UnsupportError
e
;
throw
e
;
}
return
Vector
::
createGpuVectorFromNumpy
(
data
,
dim
);
}
else
{
return
Vector
::
createCpuVectorFromNumpy
(
data
,
dim
,
copy
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录