Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
f00f4fcf
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,发现更多精彩内容 >>
未验证
提交
f00f4fcf
编写于
11月 05, 2021
作者:
Z
Zeng Jinle
提交者:
GitHub
11月 05, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add more copy_from method (#36978)
上级
d572fa27
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
61 addition
and
10 deletion
+61
-10
paddle/fluid/pybind/pybind.cc
paddle/fluid/pybind/pybind.cc
+22
-10
python/paddle/fluid/tests/unittests/test_tensor_copy_from.py
python/paddle/fluid/tests/unittests/test_tensor_copy_from.py
+39
-0
未找到文件。
paddle/fluid/pybind/pybind.cc
浏览文件 @
f00f4fcf
...
...
@@ -506,6 +506,17 @@ static int GetNCCLVersion() {
}
#endif
template
<
typename
PlaceType
>
static
void
TensorCopyFrom
(
framework
::
Tensor
*
dst
,
const
framework
::
Tensor
&
src
,
const
PlaceType
&
place
,
int64_t
batch_size
)
{
if
(
batch_size
<
0
)
{
framework
::
TensorCopy
(
src
,
place
,
dst
);
}
else
{
auto
sliced
=
src
.
Slice
(
0
,
batch_size
);
framework
::
TensorCopy
(
sliced
,
place
,
dst
);
}
}
#ifdef PADDLE_WITH_AVX
PYBIND11_MODULE
(
core_avx
,
m
)
{
#else
...
...
@@ -755,16 +766,17 @@ PYBIND11_MODULE(core_noavx, m) {
paddle
::
framework
::
proto
::
VarType
::
Type
type
)
{
return
reinterpret_cast
<
uintptr_t
>
(
self
.
mutable_data
(
place
,
type
));
})
.
def
(
"_copy_from"
,
[](
framework
::
Tensor
&
self
,
const
framework
::
Tensor
&
other
,
const
platform
::
Place
&
place
,
int64_t
batch_size
)
{
if
(
batch_size
<
0
)
{
framework
::
TensorCopy
(
other
,
place
,
&
self
);
}
else
{
auto
sliced
=
other
.
Slice
(
0
,
batch_size
);
framework
::
TensorCopy
(
sliced
,
place
,
&
self
);
}
},
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
CPUPlace
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
XPUPlace
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
CUDAPlace
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
NPUPlace
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
CUDAPinnedPlace
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"_copy_from"
,
&
TensorCopyFrom
<
paddle
::
platform
::
Place
>
,
py
::
arg
(
"tensor"
),
py
::
arg
(
"place"
),
py
::
arg
(
"batch_size"
)
=
-
1
)
.
def
(
"set"
,
SetTensorFromPyArray
<
paddle
::
platform
::
CPUPlace
>
,
py
::
arg
(
"array"
),
py
::
arg
(
"place"
),
py
::
arg
(
"zero_copy"
)
=
false
)
...
...
python/paddle/fluid/tests/unittests/test_tensor_copy_from.py
0 → 100644
浏览文件 @
f00f4fcf
# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
#
# 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.
import
paddle
import
unittest
import
numpy
as
np
from
paddle.fluid.core
import
LoDTensor
as
Tensor
class
TestTensorCopyFrom
(
unittest
.
TestCase
):
def
test_main
(
self
):
place
=
paddle
.
CPUPlace
()
np_value
=
np
.
random
.
random
(
size
=
[
10
,
30
]).
astype
(
'float32'
)
t_src
=
Tensor
()
t_src
.
set
(
np_value
,
place
)
self
.
assertTrue
(
np
.
array_equal
(
np_value
,
t_src
))
t_dst1
=
Tensor
()
t_dst1
.
_copy_from
(
t_src
,
place
)
self
.
assertTrue
(
np
.
array_equal
(
np_value
,
t_dst1
))
t_dst2
=
Tensor
()
t_dst2
.
_copy_from
(
t_src
,
place
,
5
)
self
.
assertTrue
(
np
.
array_equal
(
np
.
array
(
np_value
[
0
:
5
]),
t_dst2
))
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录