Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
9c52adef
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,发现更多精彩内容 >>
未验证
提交
9c52adef
编写于
6月 02, 2021
作者:
L
liym27
提交者:
GitHub
6月 02, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[slice getitem] Support getitem idx is Tensor or List (#33000)
上级
b30a7e31
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
93 addition
and
5 deletion
+93
-5
python/paddle/fluid/tests/unittests/test_variable.py
python/paddle/fluid/tests/unittests/test_variable.py
+67
-4
python/paddle/fluid/variable_index.py
python/paddle/fluid/variable_index.py
+26
-1
未找到文件。
python/paddle/fluid/tests/unittests/test_variable.py
浏览文件 @
9c52adef
...
...
@@ -164,12 +164,75 @@ class TestVariable(unittest.TestCase):
self
.
assertTrue
(
np
.
array_equal
(
local_out
[
15
],
tensor_array
[::
-
1
,
::
-
1
,
::
-
1
]))
def
test_slice
(
self
):
place
=
fluid
.
CPUPlace
()
self
.
_test_slice
(
place
)
def
_test_slice_index_tensor
(
self
,
place
):
data
=
np
.
random
.
rand
(
2
,
3
).
astype
(
"float32"
)
prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
prog
):
x
=
paddle
.
assign
(
data
)
idx0
=
[
1
,
0
]
idx1
=
[
0
,
1
]
idx2
=
[
0
,
0
]
idx3
=
[
1
,
1
]
out0
=
x
[
paddle
.
assign
(
np
.
array
(
idx0
))]
out1
=
x
[
paddle
.
assign
(
np
.
array
(
idx1
))]
out2
=
x
[
paddle
.
assign
(
np
.
array
(
idx2
))]
out3
=
x
[
paddle
.
assign
(
np
.
array
(
idx3
))]
exe
=
paddle
.
static
.
Executor
(
place
)
result
=
exe
.
run
(
prog
,
fetch_list
=
[
out0
,
out1
,
out2
,
out3
])
expected
=
[
data
[
idx0
],
data
[
idx1
],
data
[
idx2
],
data
[
idx3
]]
self
.
assertTrue
((
result
[
0
]
==
expected
[
0
]).
all
())
self
.
assertTrue
((
result
[
1
]
==
expected
[
1
]).
all
())
self
.
assertTrue
((
result
[
2
]
==
expected
[
2
]).
all
())
self
.
assertTrue
((
result
[
3
]
==
expected
[
3
]).
all
())
with
self
.
assertRaises
(
IndexError
):
one
=
paddle
.
ones
(
shape
=
[
1
])
res
=
x
[
one
,
[
0
,
0
]]
def
_test_slice_index_list
(
self
,
place
):
data
=
np
.
random
.
rand
(
2
,
3
).
astype
(
"float32"
)
prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
prog
):
x
=
paddle
.
assign
(
data
)
idx0
=
[
1
,
0
]
idx1
=
[
0
,
1
]
idx2
=
[
0
,
0
]
idx3
=
[
1
,
1
]
out0
=
x
[
idx0
]
out1
=
x
[
idx1
]
out2
=
x
[
idx2
]
out3
=
x
[
idx3
]
exe
=
paddle
.
static
.
Executor
(
place
)
result
=
exe
.
run
(
prog
,
fetch_list
=
[
out0
,
out1
,
out2
,
out3
])
expected
=
[
data
[
idx0
],
data
[
idx1
],
data
[
idx2
],
data
[
idx3
]]
self
.
assertTrue
((
result
[
0
]
==
expected
[
0
]).
all
())
self
.
assertTrue
((
result
[
1
]
==
expected
[
1
]).
all
())
self
.
assertTrue
((
result
[
2
]
==
expected
[
2
]).
all
())
self
.
assertTrue
((
result
[
3
]
==
expected
[
3
]).
all
())
with
self
.
assertRaises
(
IndexError
):
res
=
x
[[
1
,
0
],
[
0
,
0
]]
with
self
.
assertRaises
(
TypeError
):
res
=
x
[[
1.2
,
0
]]
def
test_slice
(
self
):
places
=
[
fluid
.
CPUPlace
()]
if
core
.
is_compiled_with_cuda
():
self
.
_test_slice
(
core
.
CUDAPlace
(
0
))
places
.
append
(
core
.
CUDAPlace
(
0
))
for
place
in
places
:
self
.
_test_slice
(
place
)
self
.
_test_slice_index_tensor
(
place
)
self
.
_test_slice_index_list
(
place
)
def
_tostring
(
self
):
b
=
default_main_program
().
current_block
()
...
...
python/paddle/fluid/variable_index.py
浏览文件 @
9c52adef
...
...
@@ -87,7 +87,7 @@ def _getitem_impl_(var, item):
Returns:
Sliced variable
"""
from
.framework
import
default_main_program
from
.framework
import
default_main_program
,
Variable
if
not
isinstance
(
item
,
tuple
):
item
=
(
item
,
)
...
...
@@ -126,6 +126,31 @@ def _getitem_impl_(var, item):
start
=
0
if
start
is
None
else
start
end
=
MAX_INTEGER
if
end
is
None
else
end
elif
isinstance
(
slice_item
,
list
):
for
i
in
slice_item
:
if
not
isinstance
(
i
,
int
):
raise
TypeError
(
"Only support int value in list"
)
if
len
(
item
)
!=
1
:
raise
IndexError
(
"When index contains a list, its length must be 1, but received {}"
.
format
(
len
(
item
)))
from
.layers
import
assign
from
..tensor
import
index_select
idx
=
assign
(
np
.
array
(
slice_item
))
return
index_select
(
var
,
index
=
idx
,
axis
=
0
)
elif
isinstance
(
slice_item
,
Variable
):
if
len
(
item
)
!=
1
:
raise
IndexError
(
"When index contains a Tensor, its length must be 1, but received {}"
.
format
(
len
(
item
)))
from
..tensor
import
index_select
return
index_select
(
var
,
index
=
slice_item
,
axis
=
0
)
else
:
raise
IndexError
(
"Valid index accept int or slice or ellipsis, but received {}."
.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录