Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
7f506669
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
7f506669
编写于
3月 20, 2023
作者:
H
Huang Jiyi
提交者:
GitHub
3月 20, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update (#51773)
上级
604b7a53
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
10 deletion
+5
-10
paddle/phi/api/include/tensor_utils.h
paddle/phi/api/include/tensor_utils.h
+5
-6
paddle/phi/api/lib/tensor_utils.cc
paddle/phi/api/lib/tensor_utils.cc
+0
-4
未找到文件。
paddle/phi/api/include/tensor_utils.h
浏览文件 @
7f506669
...
@@ -33,12 +33,11 @@ using Deleter = std::function<void(void*)>;
...
@@ -33,12 +33,11 @@ using Deleter = std::function<void(void*)>;
* @param dtype The data type of the tensor, should correspond to data type of
* @param dtype The data type of the tensor, should correspond to data type of
* `data`. See PD_FOR_EACH_DATA_TYPE in `phi/common/data_type.h`
* `data`. See PD_FOR_EACH_DATA_TYPE in `phi/common/data_type.h`
* @param layout The data layout of the tensor.
* @param layout The data layout of the tensor.
* @param place The place where the tensor is located, should correspond to
* @param place The place where the tensor is located.
* place of `data`.
* If `place` is default value, it will be inferred from `data`,
* If `place` use the default value, it will be inferred from
* However,the feature is only supported on CPU or GPU.
* `data`, However,the feature is only supported on CPU or GPU.
* If `place` is not default value, make sure that `place` is equal
* So make sure that `place` is equal to the place of `data` when
* to the place of `data`
* using other devices.
* @param deleter A function or function object that will be called to free the
* @param deleter A function or function object that will be called to free the
* memory buffer.
* memory buffer.
*
*
...
...
paddle/phi/api/lib/tensor_utils.cc
浏览文件 @
7f506669
...
@@ -14,8 +14,6 @@ limitations under the License. */
...
@@ -14,8 +14,6 @@ limitations under the License. */
#include "paddle/phi/api/include/tensor_utils.h"
#include "paddle/phi/api/include/tensor_utils.h"
#include <set>
#include "paddle/phi/api/lib/api_registry.h"
#include "paddle/phi/api/lib/api_registry.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/dense_tensor.h"
...
@@ -72,8 +70,6 @@ PADDLE_API Tensor from_blob(void* data,
...
@@ -72,8 +70,6 @@ PADDLE_API Tensor from_blob(void* data,
phi
::
errors
::
InvalidArgument
(
phi
::
errors
::
InvalidArgument
(
"shape cannot be constructed from a Tensor."
));
"shape cannot be constructed from a Tensor."
));
// TODO(huangjiyi): We need copy data to specified place when
// the input place is different with place of data.
phi
::
Place
data_place
;
phi
::
Place
data_place
;
if
(
place
.
GetType
()
==
phi
::
AllocationType
::
UNDEFINED
||
if
(
place
.
GetType
()
==
phi
::
AllocationType
::
UNDEFINED
||
place
.
GetType
()
==
phi
::
AllocationType
::
CPU
||
place
.
GetType
()
==
phi
::
AllocationType
::
CPU
||
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录