Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
326cb2e3
提交
326cb2e3
authored
9月 29, 2023
作者:
Ricardo Vieira
提交者:
Ricardo Vieira
10月 01, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fail graciously in local_pow_to_nested_squaring when static type shape is updated
上级
3169197c
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
34 行增加
和
8 行删除
+34
-8
math.py
pytensor/tensor/rewriting/math.py
+7
-5
test_math.py
tests/tensor/rewriting/test_math.py
+27
-3
没有找到文件。
pytensor/tensor/rewriting/math.py
浏览文件 @
326cb2e3
...
@@ -2081,7 +2081,6 @@ def local_pow_to_nested_squaring(fgraph, node):
...
@@ -2081,7 +2081,6 @@ def local_pow_to_nested_squaring(fgraph, node):
Note: This sounds like the kind of thing any half-decent compiler can do by itself?
Note: This sounds like the kind of thing any half-decent compiler can do by itself?
"""
"""
if
node
.
op
==
at_pow
:
# the idea here is that we have pow(x, y)
# the idea here is that we have pow(x, y)
odtype
=
node
.
outputs
[
0
]
.
dtype
odtype
=
node
.
outputs
[
0
]
.
dtype
xsym
=
node
.
inputs
[
0
]
xsym
=
node
.
inputs
[
0
]
...
@@ -2127,16 +2126,19 @@ def local_pow_to_nested_squaring(fgraph, node):
...
@@ -2127,16 +2126,19 @@ def local_pow_to_nested_squaring(fgraph, node):
if
abs
(
y
)
>
2
:
if
abs
(
y
)
>
2
:
# We fuse all the pow together here to make
# We fuse all the pow together here to make
# compilation faster
# compilation faster
rval1
=
Elemwis
e
(
rval1
=
Elemwise
(
aes
.
Composite
([
pow2_scal
[
0
]],
[
rval1_scal
]))
.
make_nod
e
(
aes
.
Composite
([
pow2_scal
[
0
]],
[
rval1_scal
])
xsym
)
.
make_node
(
xsym
)
)
if
y
<
0
:
if
y
<
0
:
rval
=
[
reciprocal
(
rval1
)]
rval
=
[
reciprocal
(
rval1
)]
else
:
else
:
rval
=
[
rval1
]
rval
=
[
rval1
]
if
rval
:
if
rval
:
rval
[
0
]
=
cast
(
rval
[
0
],
odtype
)
rval
[
0
]
=
cast
(
rval
[
0
],
odtype
)
assert
rval
[
0
]
.
type
==
node
.
outputs
[
0
]
.
type
,
(
rval
,
node
.
outputs
)
# TODO: We can add a specify_broadcastable and/or unbroadcast to make the
# output types compatible. Or work on #408 and let TensorType.filter_variable do it.
if
rval
[
0
]
.
type
.
broadcastable
!=
node
.
outputs
[
0
]
.
type
.
broadcastable
:
return
None
return
rval
return
rval
...
...
tests/tensor/rewriting/test_math.py
浏览文件 @
326cb2e3
...
@@ -29,8 +29,9 @@ from pytensor.graph.rewriting.db import RewriteDatabaseQuery
...
@@ -29,8 +29,9 @@ from pytensor.graph.rewriting.db import RewriteDatabaseQuery
from
pytensor.graph.rewriting.utils
import
is_same_graph
,
rewrite_graph
from
pytensor.graph.rewriting.utils
import
is_same_graph
,
rewrite_graph
from
pytensor.misc.safe_asarray
import
_asarray
from
pytensor.misc.safe_asarray
import
_asarray
from
pytensor.printing
import
debugprint
from
pytensor.printing
import
debugprint
from
pytensor.scalar
import
Pow
from
pytensor.tensor
import
inplace
from
pytensor.tensor
import
inplace
from
pytensor.tensor.basic
import
Alloc
,
join
,
second
,
switch
from
pytensor.tensor.basic
import
Alloc
,
constant
,
join
,
second
,
switch
from
pytensor.tensor.blas
import
Dot22
,
Gemv
from
pytensor.tensor.blas
import
Dot22
,
Gemv
from
pytensor.tensor.blas_c
import
CGemv
from
pytensor.tensor.blas_c
import
CGemv
from
pytensor.tensor.elemwise
import
CAReduce
,
DimShuffle
,
Elemwise
from
pytensor.tensor.elemwise
import
CAReduce
,
DimShuffle
,
Elemwise
...
@@ -69,7 +70,7 @@ from pytensor.tensor.math import max as at_max
...
@@ -69,7 +70,7 @@ from pytensor.tensor.math import max as at_max
from
pytensor.tensor.math
import
maximum
from
pytensor.tensor.math
import
maximum
from
pytensor.tensor.math
import
min
as
at_min
from
pytensor.tensor.math
import
min
as
at_min
from
pytensor.tensor.math
import
minimum
,
mul
,
neg
,
neq
from
pytensor.tensor.math
import
minimum
,
mul
,
neg
,
neq
from
pytensor.tensor.math
import
pow
as
a
t_pow
from
pytensor.tensor.math
import
pow
as
p
t_pow
from
pytensor.tensor.math
import
(
from
pytensor.tensor.math
import
(
prod
,
prod
,
rad2deg
,
rad2deg
,
...
@@ -1746,6 +1747,29 @@ def test_local_pow_to_nested_squaring():
...
@@ -1746,6 +1747,29 @@ def test_local_pow_to_nested_squaring():
utt
.
assert_allclose
(
f
(
val_no0
),
val_no0
**
(
-
16
))
utt
.
assert_allclose
(
f
(
val_no0
),
val_no0
**
(
-
16
))
def
test_local_pow_to_nested_squaring_fails_gracefully
():
# Reported in #456
x
=
vector
(
"x"
,
shape
=
(
1
,))
# Create an Apply that does not have precise output shape
node
=
Apply
(
op
=
pt_pow
,
inputs
=
[
x
,
constant
([
2.0
])],
outputs
=
[
tensor
(
shape
=
(
None
,))],
)
y
=
node
.
default_output
()
fn
=
function
([
x
],
y
)
# Check rewrite is not applied (this could change in the future)
assert
any
(
(
isinstance
(
node
.
op
,
Elemwise
)
and
isinstance
(
node
.
op
.
scalar_op
,
Pow
))
for
node
in
fn
.
maker
.
fgraph
.
apply_nodes
)
np
.
testing
.
assert_allclose
(
fn
([
2.0
]),
np
.
array
([
4.0
]))
class
TestFuncInverse
:
class
TestFuncInverse
:
def
setup_method
(
self
):
def
setup_method
(
self
):
mode
=
get_default_mode
()
mode
=
get_default_mode
()
...
@@ -2449,7 +2473,7 @@ class TestLocalMergeSwitchSameCond:
...
@@ -2449,7 +2473,7 @@ class TestLocalMergeSwitchSameCond:
le
,
le
,
eq
,
eq
,
neq
,
neq
,
a
t_pow
,
p
t_pow
,
):
):
g
=
rewrite
(
FunctionGraph
(
mats
,
[
op
(
s1
,
s2
)]))
g
=
rewrite
(
FunctionGraph
(
mats
,
[
op
(
s1
,
s2
)]))
assert
debugprint
(
g
,
file
=
"str"
)
.
count
(
"Switch"
)
==
1
assert
debugprint
(
g
,
file
=
"str"
)
.
count
(
"Switch"
)
==
1
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论