Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
3b0dd5f6
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
未验证
提交
3b0dd5f6
编写于
11月 20, 2020
作者:
Z
Zhou Wei
提交者:
GitHub
11月 20, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug that to_tensor not support paddle.Place (#28717)
上级
e1c8d6bc
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
4 deletion
+10
-4
paddle/fluid/pybind/imperative.cc
paddle/fluid/pybind/imperative.cc
+4
-1
python/paddle/fluid/tests/unittests/test_var_base.py
python/paddle/fluid/tests/unittests/test_var_base.py
+3
-0
python/paddle/tensor/creation.py
python/paddle/tensor/creation.py
+3
-3
未找到文件。
paddle/fluid/pybind/imperative.cc
浏览文件 @
3b0dd5f6
...
@@ -69,9 +69,12 @@ static const platform::Place PyObjectToPlace(const py::object &place_obj) {
...
@@ -69,9 +69,12 @@ static const platform::Place PyObjectToPlace(const py::object &place_obj) {
return
place_obj
.
cast
<
platform
::
XPUPlace
>
();
return
place_obj
.
cast
<
platform
::
XPUPlace
>
();
}
else
if
(
py
::
isinstance
<
platform
::
CUDAPinnedPlace
>
(
place_obj
))
{
}
else
if
(
py
::
isinstance
<
platform
::
CUDAPinnedPlace
>
(
place_obj
))
{
return
place_obj
.
cast
<
platform
::
CUDAPinnedPlace
>
();
return
place_obj
.
cast
<
platform
::
CUDAPinnedPlace
>
();
}
else
if
(
py
::
isinstance
<
platform
::
Place
>
(
place_obj
))
{
return
place_obj
.
cast
<
platform
::
Place
>
();
}
else
{
}
else
{
PADDLE_THROW
(
platform
::
errors
::
InvalidArgument
(
PADDLE_THROW
(
platform
::
errors
::
InvalidArgument
(
"Place should be one of CPUPlace/XPUPlace/CUDAPlace/CUDAPinnedPlace"
));
"Place should be one of "
"Place/CPUPlace/XPUPlace/CUDAPlace/CUDAPinnedPlace"
));
}
}
}
}
...
...
python/paddle/fluid/tests/unittests/test_var_base.py
浏览文件 @
3b0dd5f6
...
@@ -40,6 +40,9 @@ class TestVarBase(unittest.TestCase):
...
@@ -40,6 +40,9 @@ class TestVarBase(unittest.TestCase):
self
.
assertTrue
(
np
.
array_equal
(
x
.
numpy
(),
[
1
]))
self
.
assertTrue
(
np
.
array_equal
(
x
.
numpy
(),
[
1
]))
self
.
assertNotEqual
(
x
.
dtype
,
core
.
VarDesc
.
VarType
.
FP32
)
self
.
assertNotEqual
(
x
.
dtype
,
core
.
VarDesc
.
VarType
.
FP32
)
y
=
paddle
.
to_tensor
(
2
,
place
=
x
.
place
)
self
.
assertEqual
(
str
(
x
.
place
),
str
(
y
.
place
))
# set_default_dtype should not take effect on numpy
# set_default_dtype should not take effect on numpy
x
=
paddle
.
to_tensor
(
x
=
paddle
.
to_tensor
(
np
.
array
([
1.2
]).
astype
(
'float16'
),
np
.
array
([
1.2
]).
astype
(
'float16'
),
...
...
python/paddle/tensor/creation.py
浏览文件 @
3b0dd5f6
...
@@ -126,10 +126,10 @@ def to_tensor(data, dtype=None, place=None, stop_gradient=True):
...
@@ -126,10 +126,10 @@ def to_tensor(data, dtype=None, place=None, stop_gradient=True):
if
place
is
None
:
if
place
is
None
:
place
=
_current_expected_place
()
place
=
_current_expected_place
()
elif
not
isinstance
(
place
,
elif
not
isinstance
(
place
,
(
core
.
Place
,
core
.
CPUPlace
,
core
.
CUDAPinnedPlace
,
(
core
.
CPUPlace
,
core
.
CUDAPinnedPlace
,
core
.
CUDAPlace
)):
core
.
CUDAPlace
)):
raise
ValueError
(
raise
ValueError
(
"'place' must be any of paddle.Place, paddle.CUDAPinnedPlace, paddle.CUDAPlace"
"'place' must be any of paddle.Place, paddle.C
PUPlace, paddle.C
UDAPinnedPlace, paddle.CUDAPlace"
)
)
#Todo(zhouwei): Support allocate tensor on any other specified card
#Todo(zhouwei): Support allocate tensor on any other specified card
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录