Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
e28dc04e
提交
e28dc04e
authored
8月 01, 2017
作者:
Gijs van Tulder
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check for indexing with Python bools (unsupported).
上级
08d90db3
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
35 行增加
和
0 行删除
+35
-0
test_subtensor.py
theano/tensor/tests/test_subtensor.py
+8
-0
var.py
theano/tensor/var.py
+27
-0
没有找到文件。
theano/tensor/tests/test_subtensor.py
浏览文件 @
e28dc04e
...
@@ -399,6 +399,14 @@ class T_subtensor(unittest.TestCase, utt.TestOptimizationMixin):
...
@@ -399,6 +399,14 @@ class T_subtensor(unittest.TestCase, utt.TestOptimizationMixin):
assert_array_equal
(
numpy_n4
[
numpy_n
>
2
,
...
],
n4
[
n
>
2
,
...
]
.
eval
())
assert_array_equal
(
numpy_n4
[
numpy_n
>
2
,
...
],
n4
[
n
>
2
,
...
]
.
eval
())
assert_array_equal
(
numpy_n4
[
numpy_n
>
2
,
...
,
1
],
n4
[
n
>
2
,
...
,
1
]
.
eval
())
assert_array_equal
(
numpy_n4
[
numpy_n
>
2
,
...
,
1
],
n4
[
n
>
2
,
...
,
1
]
.
eval
())
# special cases: Python bools and bools nested in Python arrays are not supported
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
(
True
,))
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
(
False
,))
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
(
True
,
False
))
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
([
True
,
False
]))
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
([
0
,
1
],
[
0
,
False
]))
self
.
assertRaises
(
TypeError
,
n
.
__getitem__
,
([
0
,
1
],
[
0
,
theano
.
shared
(
True
)]))
def
test_newaxis
(
self
):
def
test_newaxis
(
self
):
"""
"""
newaxis support comes from logic in the __getitem__ of TensorType
newaxis support comes from logic in the __getitem__ of TensorType
...
...
theano/tensor/var.py
浏览文件 @
e28dc04e
from
__future__
import
absolute_import
,
print_function
,
division
from
__future__
import
absolute_import
,
print_function
,
division
import
collections
import
copy
import
copy
import
traceback
as
tb
import
traceback
as
tb
import
warnings
import
warnings
...
@@ -458,6 +459,18 @@ class _tensor_py_operators(object):
...
@@ -458,6 +459,18 @@ class _tensor_py_operators(object):
# SLICING/INDEXING
# SLICING/INDEXING
def
__getitem__
(
self
,
args
):
def
__getitem__
(
self
,
args
):
def
includes_bool
(
args_el
):
if
(
isinstance
(
args_el
,
(
np
.
bool_
,
bool
))
or
(
hasattr
(
args_el
,
'dtype'
)
and
args_el
.
dtype
==
'bool'
)):
return
True
if
(
not
isinstance
(
args_el
,
theano
.
tensor
.
Variable
)
and
isinstance
(
args_el
,
collections
.
Iterable
)):
for
el
in
args_el
:
if
includes_bool
(
el
):
return
True
return
False
if
(
isinstance
(
args
,
list
)
and
if
(
isinstance
(
args
,
list
)
and
any
([
isinstance
(
a
,
slice
)
for
a
in
args
])):
any
([
isinstance
(
a
,
slice
)
for
a
in
args
])):
pass
pass
...
@@ -467,11 +480,25 @@ class _tensor_py_operators(object):
...
@@ -467,11 +480,25 @@ class _tensor_py_operators(object):
# Convert boolean arrays to calls to mask.nonzero()
# Convert boolean arrays to calls to mask.nonzero()
tmp_args
=
[]
tmp_args
=
[]
for
arg
in
args
:
for
arg
in
args
:
# NumPy arrays or tensors of type bool can be converted to
# normal integer indices.
if
(
isinstance
(
arg
,
(
np
.
ndarray
,
theano
.
tensor
.
Variable
))
and
if
(
isinstance
(
arg
,
(
np
.
ndarray
,
theano
.
tensor
.
Variable
))
and
hasattr
(
arg
,
'dtype'
)
and
hasattr
(
arg
,
'nonzero'
)
and
hasattr
(
arg
,
'dtype'
)
and
hasattr
(
arg
,
'nonzero'
)
and
arg
.
dtype
==
'bool'
):
arg
.
dtype
==
'bool'
):
tmp_args
+=
arg
.
nonzero
()
tmp_args
+=
arg
.
nonzero
()
else
:
else
:
# Python arrays can contain a mixture of bools and integers,
# which requires complex rules to handle all special cases.
# These rules differ slightly between NumPy versions.
# Since earlier versions of Theano did not support any boolean
# indexing, it is safe to throw an error if we encounter
# any of these difficult cases.
if
includes_bool
(
arg
):
raise
TypeError
(
'TensorType does not support Python bools '
'for indexing, such as tensor[[True, False]]. '
'To use a boolean mask, convert the mask to '
'a NumPy array first, e.g., '
'tensor[numpy.array([True, False])].'
)
tmp_args
.
append
(
arg
)
tmp_args
.
append
(
arg
)
args
=
tuple
(
tmp_args
)
args
=
tuple
(
tmp_args
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论