Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
aa5ca8a9
P
Paddle
项目概览
OPTHREE
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa5ca8a9
编写于
7月 25, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix build error
上级
d5109130
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
23 deletion
+24
-23
paddle/pybind/pybind.cc
paddle/pybind/pybind.cc
+17
-10
paddle/pybind/tensor_bind.h
paddle/pybind/tensor_bind.h
+7
-13
未找到文件。
paddle/pybind/pybind.cc
浏览文件 @
aa5ca8a9
...
...
@@ -20,6 +20,7 @@ limitations under the License. */
#include "paddle/framework/op_registry.h"
#include "paddle/framework/operator.h"
#include "paddle/framework/scope.h"
#include "paddle/platform/enforce.h"
#include "paddle/platform/place.h"
#include "paddle/pybind/tensor_bind.h"
#include "pybind11/numpy.h"
...
...
@@ -131,18 +132,24 @@ All parameter, weight, gradient are variables in Paddle.
.
def
(
"temp"
,
pd
::
OperatorBase
::
TMP_VAR_NAME
);
py
::
class_
<
paddle
::
platform
::
DeviceContext
>
(
m
,
"DeviceContext"
)
.
def_static
(
"create"
,
[](
paddle
::
platform
::
Place
)
->
paddle
::
platform
::
DeviceContext
*
{
if
(
paddle
::
platform
::
is_gpu_place
(
place
))
{
return
new
paddle
::
platform
::
GPUDeviceContext
(
place
);
}
else
if
(
paddle
::
platform
::
is_cpu_place
(
place
))
{
return
new
paddle
::
platform
::
CPUDeviceContext
();
}
});
.
def_static
(
"cpu_context"
,
[]()
->
paddle
::
platform
::
DeviceContext
*
{
return
new
paddle
::
platform
::
CPUDeviceContext
();
})
.
def_static
(
"gpu_context"
,
[](
paddle
::
platform
::
Place
&
place
)
->
paddle
::
platform
::
DeviceContext
*
{
#ifdef PADDLE_ONLY_CPU
// PADDLE_THROW("'GPUPlace' is not supported in CPU only
// device.");
return
nullptr
;
#else
return
new
paddle
::
platform
::
CUDADeviceContext
(
place
);
#endif
});
py
::
class_
<
paddle
::
platform
::
Place
>
(
m
,
"GPUPlace"
).
def
(
py
::
init
<
int
>
());
.
def
(
py
::
init
<>
());
py
::
class_
<
paddle
::
platform
::
Place
>
(
m
,
"CPUPlace"
).
def
(
py
::
init
<>
());
...
...
paddle/pybind/tensor_bind.h
浏览文件 @
aa5ca8a9
...
...
@@ -13,6 +13,7 @@
limitations under the License. */
#pragma once
#include <string>
#include "paddle/framework/tensor.h"
#include "paddle/memory/memcpy.h"
#include "pybind11/numpy.h"
...
...
@@ -57,9 +58,9 @@ struct CastToPyBufferImpl<true, I, ARGS...> {
strides
[
i
-
1
]
=
sizeof
(
CUR_TYPE
)
*
prod
;
prod
*=
dims_outside
[
i
-
1
];
}
Tensor
dst_tensor
;
framework
::
Tensor
dst_tensor
;
if
(
paddle
::
platform
::
is_gpu_place
(
tensor
.
holder_
->
place
()))
{
dst_tensor
.
CopyFrom
(
tensor
,
platform
::
CPUPlace
());
dst_tensor
.
CopyFrom
<
CUR_TYPE
>
(
tensor
,
platform
::
CPUPlace
());
}
else
if
(
paddle
::
platform
::
is_gpu_place
(
tensor
.
holder_
->
place
()))
{
dst_tensor
=
tensor
;
}
...
...
@@ -96,20 +97,13 @@ void PyTensorSetFromArray(
auto
*
dst
=
self
.
mutable_data
<
T
>
(
self
.
place
());
if
(
paddle
::
platform
::
is_cpu_place
(
self
.
place
()))
{
paddle
::
memory
::
Copy
<
paddle
::
platform
::
CPUPlace
,
paddle
::
platform
::
CPUPlace
>
(
place
,
dst
,
place
,
array
.
data
(),
sizeof
(
T
)
*
array
.
size
());
}
else
if
(
paddle
::
platform
::
is_gpu_place
(
place
))
{
std
::
memcpy
(
dst
,
array
.
data
(),
sizeof
(
T
)
*
array
.
size
());
}
else
if
(
paddle
::
platform
::
is_gpu_place
(
self
.
place
()))
{
#ifdef PADDLE_ONLY_CPU
PADDLE_THROW
(
"'GPUPlace' is not supported in CPU only device."
);
#else
paddle
::
memory
::
Copy
<
paddle
::
platform
::
GPUPlace
,
paddle
::
platform
::
CPUPlace
>
(
place
,
dst
,
paddle
::
platform
::
CPUPlace
(),
array
.
data
(),
sizeof
(
T
)
*
array
.
size
());
GpuMemcpySync
(
dst
,
array
.
data
(),
sizeof
(
T
)
*
array
.
size
(),
cudaMemcpyHostToDevice
);
#endif
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录