Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
TonyTonyFun
Paddle
提交
200d57c7
P
Paddle
项目概览
TonyTonyFun
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
200d57c7
编写于
6月 03, 2021
作者:
L
liym27
提交者:
GitHub
6月 03, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[getitem] Support index is None for getitem in static mode (#33001)
上级
23b9ed34
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
101 addition
and
4 deletion
+101
-4
python/paddle/fluid/tests/unittests/test_variable.py
python/paddle/fluid/tests/unittests/test_variable.py
+56
-0
python/paddle/fluid/variable_index.py
python/paddle/fluid/variable_index.py
+45
-4
未找到文件。
python/paddle/fluid/tests/unittests/test_variable.py
浏览文件 @
200d57c7
...
...
@@ -295,5 +295,61 @@ class TestVariable(unittest.TestCase):
self
.
assertRaises
(
Exception
,
_test
)
class
TestVariableSlice
(
unittest
.
TestCase
):
def
_test_item_none
(
self
,
place
):
data
=
np
.
random
.
rand
(
2
,
3
,
4
).
astype
(
"float32"
)
prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
prog
):
x
=
paddle
.
assign
(
data
)
out0
=
x
[
0
:,
None
,
1
:]
out1
=
x
[
0
:,
None
]
out2
=
x
[
None
,
1
:]
out3
=
x
[
None
]
outs
=
[
out0
,
out1
,
out2
,
out3
]
exe
=
paddle
.
static
.
Executor
(
place
)
result
=
exe
.
run
(
prog
,
fetch_list
=
outs
)
expected
=
[
data
[
0
:,
None
,
1
:],
data
[
0
:,
None
],
data
[
None
,
1
:],
data
[
None
]
]
for
i
in
range
(
len
(
outs
)):
self
.
assertEqual
(
outs
[
i
].
shape
,
expected
[
i
].
shape
)
self
.
assertTrue
((
result
[
i
]
==
expected
[
i
]).
all
())
def
_test_item_none_and_decrease
(
self
,
place
):
data
=
np
.
random
.
rand
(
2
,
3
,
4
).
astype
(
"float32"
)
prog
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
prog
):
x
=
paddle
.
assign
(
data
)
out0
=
x
[
0
,
1
:,
None
]
out1
=
x
[
0
,
None
]
out2
=
x
[
None
,
1
]
out3
=
x
[
None
]
out4
=
x
[
0
,
0
,
0
,
None
]
out5
=
x
[
None
,
0
,
0
,
0
,
None
]
outs
=
[
out0
,
out1
,
out2
,
out3
,
out4
,
out5
]
exe
=
paddle
.
static
.
Executor
(
place
)
result
=
exe
.
run
(
prog
,
fetch_list
=
outs
)
expected
=
[
data
[
0
,
1
:,
None
],
data
[
0
,
None
],
data
[
None
,
1
],
data
[
None
],
data
[
0
,
0
,
0
,
None
],
data
[
None
,
0
,
0
,
0
,
None
]
]
for
i
in
range
(
len
(
outs
)):
self
.
assertEqual
(
outs
[
i
].
shape
,
expected
[
i
].
shape
)
self
.
assertTrue
((
result
[
i
]
==
expected
[
i
]).
all
())
def
test_slice
(
self
):
places
=
[
fluid
.
CPUPlace
()]
if
core
.
is_compiled_with_cuda
():
places
.
append
(
core
.
CUDAPlace
(
0
))
for
place
in
places
:
self
.
_test_item_none
(
place
)
self
.
_test_item_none_and_decrease
(
place
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/paddle/fluid/variable_index.py
浏览文件 @
200d57c7
...
...
@@ -50,6 +50,17 @@ def replace_ellipsis(var, item):
return
item
def
replace_none
(
item
):
new_item
=
[]
none_axes
=
[]
for
i
,
slice_item
in
enumerate
(
item
):
if
slice_item
is
None
:
none_axes
.
append
(
i
)
else
:
new_item
.
append
(
slice_item
)
return
new_item
,
none_axes
def
is_integer_or_scalar_tensor
(
ele
):
from
.framework
import
Variable
if
isinstance
(
ele
,
int
):
...
...
@@ -97,9 +108,10 @@ def _getitem_impl_(var, item):
starts
=
[]
ends
=
[]
steps
=
[]
reverse_ax
i
s
=
[]
reverse_ax
e
s
=
[]
use_strided_slice
=
False
item
,
none_axes
=
replace_none
(
item
)
for
dim
,
slice_item
in
enumerate
(
item
):
if
is_integer_or_scalar_tensor
(
slice_item
):
...
...
@@ -120,7 +132,7 @@ def _getitem_impl_(var, item):
if
start
is
None
and
end
is
None
:
assert
(
step
==
-
1
)
reverse_ax
i
s
.
append
(
dim
)
reverse_ax
e
s
.
append
(
dim
)
continue
start
=
0
if
start
is
None
else
start
...
...
@@ -195,9 +207,38 @@ def _getitem_impl_(var, item):
attrs
=
attrs
)
out
=
slice_out_var
if
len
(
reverse_ax
i
s
)
>
0
:
if
len
(
reverse_ax
e
s
)
>
0
:
from
.layers.tensor
import
reverse
out
=
reverse
(
out
,
axis
=
reverse_axis
)
out
=
reverse
(
out
,
axis
=
reverse_axes
)
# Deal with cases when all axes are decreased.
# After slice, the shape of out is [1], which should have been [], but Paddle doesn't support scalar.
# In order to ensure the correctness of the final shape of out, one dimension of out needs to be decreased.
# For example:
# # x.shape: (2,3,4)
# out = x[0, 1, 1, None] # out.shape : (1)
if
len
(
decrease_axes
)
==
len
(
var
.
shape
):
none_axes
=
none_axes
[
1
:]
if
len
(
none_axes
)
>
0
:
# Deal with cases that decrease_axes is not empty
# For example:
# # x.shape: (2,3,4)
# out = x[0, 0:2, None] # out.shape : (2, 1, 4)
for
idx
,
axis
in
enumerate
(
none_axes
):
l
=
len
([
i
for
i
in
decrease_axes
if
i
<
axis
])
new_axis
=
axis
-
l
none_axes
[
idx
]
=
new_axis
# Deal with cases when all axes are decreased.
# After slice, the shape of out is [1], which should have been [], but Paddle doesn't support scalar.
# In order to ensure the correctness of the final shape of out, one dimension of out needs to be decreased.
# For example:
# # x.shape: (2,3,4)
# out = x[0, 1, 1, None] # out.shape : (1)
from
..tensor
import
unsqueeze
out
=
unsqueeze
(
out
,
axis
=
none_axes
)
return
out
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录