Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
9f588cc2
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看板
未验证
提交
9f588cc2
编写于
9月 15, 2021
作者:
W
WeiXin
提交者:
GitHub
9月 15, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
support numpy.ndarray index. (#35748)
* support numpy.ndarray index. * polish code.
上级
46ec5b3e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
9 deletion
+33
-9
python/paddle/fluid/dygraph/varbase_patch_methods.py
python/paddle/fluid/dygraph/varbase_patch_methods.py
+3
-2
python/paddle/fluid/tests/unittests/test_var_base.py
python/paddle/fluid/tests/unittests/test_var_base.py
+9
-0
python/paddle/fluid/variable_index.py
python/paddle/fluid/variable_index.py
+21
-7
未找到文件。
python/paddle/fluid/dygraph/varbase_patch_methods.py
浏览文件 @
9f588cc2
...
...
@@ -553,8 +553,9 @@ def monkey_patch_varbase():
or
isinstance
(
slice_item
.
step
,
Variable
):
return
True
else
:
if
isinstance
(
slice_item
,
Variable
)
and
Variable
.
dtype
!=
paddle
.
bool
:
if
isinstance
(
slice_item
,
(
Variable
,
np
.
ndarray
))
and
Variable
.
dtype
!=
paddle
.
bool
:
return
True
return
False
...
...
python/paddle/fluid/tests/unittests/test_var_base.py
浏览文件 @
9f588cc2
...
...
@@ -813,6 +813,11 @@ class TestVarBase(unittest.TestCase):
[
0.
,
0.
,
42.
,
42.
,
42.
,
0.
]])
self
.
assertTrue
(
np
.
array_equal
(
res
,
exp
))
# case3:
row
=
np
.
array
([
0
,
1
,
2
])
col
=
np
.
array
([
2
,
1
,
3
])
self
.
assertTrue
(
np
.
array_equal
(
array
[
row
,
col
],
x
[
row
,
col
].
numpy
()))
def
test_slice
(
self
):
with
fluid
.
dygraph
.
guard
():
self
.
_test_slice
()
...
...
@@ -834,6 +839,10 @@ class TestVarBase(unittest.TestCase):
with
self
.
assertRaises
(
IndexError
):
y
=
var
[
0
-
self
.
shape
[
0
]
-
1
]
with
self
.
assertRaises
(
IndexError
):
mask
=
np
.
array
([
1
,
0
,
1
,
0
],
dtype
=
bool
)
var
[
paddle
.
to_tensor
([
0
,
1
]),
mask
]
def
test_var_base_to_np
(
self
):
with
fluid
.
dygraph
.
guard
():
var
=
fluid
.
dygraph
.
to_variable
(
self
.
array
)
...
...
python/paddle/fluid/variable_index.py
浏览文件 @
9f588cc2
...
...
@@ -67,6 +67,7 @@ class SliceInfo:
def
__init__
(
self
):
self
.
pre_shape
=
None
self
.
indexes
=
[]
self
.
dtype
=
None
def
update
(
self
,
index
):
if
is_list_tuple
(
index
,
int
)
or
isinstance
(
index
,
(
...
...
@@ -75,6 +76,14 @@ class SliceInfo:
if
not
isinstance
(
index
,
paddle
.
fluid
.
Variable
):
index
=
paddle
.
assign
(
index
)
if
self
.
dtype
is
None
:
self
.
dtype
=
index
.
dtype
else
:
if
index
.
dtype
!=
self
.
dtype
:
raise
IndexError
(
"Data type of Tensor/List index should be same. The current data type is {}, but the previous data type is {}."
.
format
(
index
.
dtype
,
self
.
dtype
))
self
.
indexes
.
append
(
index
)
if
self
.
pre_shape
is
None
:
...
...
@@ -214,6 +223,16 @@ def replace_ellipsis(var, item):
return
item
def
replace_ndarray
(
item
):
new_item
=
[]
for
slice_item
in
item
:
if
isinstance
(
slice_item
,
np
.
ndarray
):
new_item
.
append
(
paddle
.
assign
(
slice_item
))
else
:
new_item
.
append
(
slice_item
)
return
new_item
def
replace_none
(
item
):
new_item
=
[]
none_axes
=
[]
...
...
@@ -278,6 +297,7 @@ def _getitem_impl_(var, item):
reverse_axes
=
[]
use_strided_slice
=
False
item
=
replace_ndarray
(
item
)
item
,
none_axes
=
replace_none
(
item
)
item
=
replace_ellipsis
(
var
,
item
)
slice_info
=
SliceInfo
()
...
...
@@ -361,9 +381,6 @@ def _getitem_impl_(var, item):
idx
=
assign
(
np
.
array
(
slice_item
).
astype
(
"int32"
))
return
index_select
(
var
,
index
=
idx
,
axis
=
0
)
elif
isinstance
(
slice_item
,
np
.
ndarray
):
slice_info
.
update
(
slice_item
)
continue
elif
isinstance
(
slice_item
,
(
Variable
)):
if
len
(
item
)
==
1
:
...
...
@@ -499,6 +516,7 @@ def _setitem_impl_(var, item, value):
ends
=
[]
steps
=
[]
item
=
replace_ndarray
(
item
)
item
,
none_axes
=
replace_none
(
item
)
item
=
replace_ellipsis
(
var
,
item
)
slice_info
=
SliceInfo
()
...
...
@@ -556,10 +574,6 @@ def _setitem_impl_(var, item, value):
idx_tensor
=
assign
(
slice_item
)
return
set_value_for_bool_tensor
(
var
,
idx_tensor
,
value
)
elif
isinstance
(
slice_item
,
np
.
ndarray
):
slice_info
.
update
(
slice_item
)
continue
elif
isinstance
(
slice_item
,
Variable
):
if
slice_item
.
dtype
==
core
.
VarDesc
.
VarType
.
BOOL
:
if
len
(
item
)
!=
1
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录