Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
4ee35881
Unverified
提交
4ee35881
authored
3月 08, 2024
作者:
Trey Wenger
提交者:
GitHub
3月 08, 2024
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prevent `local_sum_make_vector` from introducing internal `float64` (#659)
上级
d175203b
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
38 行增加
和
26 行删除
+38
-26
basic.py
pytensor/tensor/rewriting/basic.py
+6
-1
test_basic.py
tests/tensor/rewriting/test_basic.py
+32
-25
没有找到文件。
pytensor/tensor/rewriting/basic.py
浏览文件 @
4ee35881
...
@@ -28,7 +28,7 @@ from typing import Union
...
@@ -28,7 +28,7 @@ from typing import Union
import
numpy
as
np
import
numpy
as
np
import
pytensor.scalar.basic
as
ps
import
pytensor.scalar.basic
as
ps
from
pytensor
import
compile
from
pytensor
import
compile
,
config
from
pytensor.compile.ops
import
ViewOp
from
pytensor.compile.ops
import
ViewOp
from
pytensor.graph
import
FunctionGraph
from
pytensor.graph
import
FunctionGraph
from
pytensor.graph.basic
import
Constant
,
Variable
from
pytensor.graph.basic
import
Constant
,
Variable
...
@@ -941,6 +941,11 @@ def local_sum_make_vector(fgraph, node):
...
@@ -941,6 +941,11 @@ def local_sum_make_vector(fgraph, node):
elements
=
array
.
owner
.
inputs
elements
=
array
.
owner
.
inputs
acc_dtype
=
node
.
op
.
acc_dtype
acc_dtype
=
node
.
op
.
acc_dtype
out_dtype
=
node
.
op
.
dtype
out_dtype
=
node
.
op
.
dtype
# Skip rewrite if it would add unnecessary float64 to the graph
if
acc_dtype
==
"float64"
and
out_dtype
!=
"float64"
and
config
.
floatX
!=
"float64"
:
return
if
len
(
elements
)
==
0
:
if
len
(
elements
)
==
0
:
element_sum
=
zeros
(
dtype
=
out_dtype
,
shape
=
())
element_sum
=
zeros
(
dtype
=
out_dtype
,
shape
=
())
elif
len
(
elements
)
==
1
:
elif
len
(
elements
)
==
1
:
...
...
tests/tensor/rewriting/test_basic.py
浏览文件 @
4ee35881
...
@@ -12,7 +12,7 @@ from pytensor.compile.function import function
...
@@ -12,7 +12,7 @@ from pytensor.compile.function import function
from
pytensor.compile.mode
import
get_default_mode
,
get_mode
from
pytensor.compile.mode
import
get_default_mode
,
get_mode
from
pytensor.compile.ops
import
DeepCopyOp
,
deep_copy_op
from
pytensor.compile.ops
import
DeepCopyOp
,
deep_copy_op
from
pytensor.configdefaults
import
config
from
pytensor.configdefaults
import
config
from
pytensor.graph.basic
import
equal_computations
,
vars_between
from
pytensor.graph.basic
import
equal_computations
from
pytensor.graph.fg
import
FunctionGraph
from
pytensor.graph.fg
import
FunctionGraph
from
pytensor.graph.rewriting.basic
import
check_stack_trace
,
out2in
from
pytensor.graph.rewriting.basic
import
check_stack_trace
,
out2in
from
pytensor.graph.rewriting.db
import
RewriteDatabaseQuery
from
pytensor.graph.rewriting.db
import
RewriteDatabaseQuery
...
@@ -26,12 +26,12 @@ from pytensor.tensor.basic import (
...
@@ -26,12 +26,12 @@ from pytensor.tensor.basic import (
ScalarFromTensor
,
ScalarFromTensor
,
Split
,
Split
,
TensorFromScalar
,
TensorFromScalar
,
cast
,
join
,
join
,
tile
,
tile
,
)
)
from
pytensor.tensor.elemwise
import
DimShuffle
,
Elemwise
from
pytensor.tensor.elemwise
import
DimShuffle
,
Elemwise
from
pytensor.tensor.math
import
(
from
pytensor.tensor.math
import
(
Sum
,
add
,
add
,
bitwise_and
,
bitwise_and
,
bitwise_or
,
bitwise_or
,
...
@@ -1298,41 +1298,48 @@ def test_local_join_make_vector():
...
@@ -1298,41 +1298,48 @@ def test_local_join_make_vector():
def
test_local_sum_make_vector
():
def
test_local_sum_make_vector
():
# To check that rewrite is applied, we must enforce dtype to
# allow rewrite to occur even if floatX != "float64"
a
,
b
,
c
=
scalars
(
"abc"
)
a
,
b
,
c
=
scalars
(
"abc"
)
mv
=
MakeVector
(
config
.
floatX
)
mv
=
MakeVector
(
config
.
floatX
)
output
=
mv
(
a
,
b
,
c
)
.
sum
()
output
=
mv
(
a
,
b
,
c
)
.
sum
(
dtype
=
"float64"
)
rewrite_output
=
rewrite_graph
(
output
)
output
=
rewrite_graph
(
output
)
expected_output
=
cast
(
between
=
vars_between
([
a
,
b
,
c
],
[
output
])
add
(
*
[
cast
(
value
,
"float64"
)
for
value
in
[
a
,
b
,
c
]]),
dtype
=
"float64"
for
var
in
between
:
)
assert
(
var
.
owner
is
None
)
or
(
not
isinstance
(
var
.
owner
.
op
,
MakeVector
)
)
assert
equal_computations
([
expected_output
],
[
rewrite_output
]
)
#
Check for empty sum
#
Empty axes should return input vector since no sum is applied
a
,
b
,
c
=
scalars
(
"abc"
)
a
,
b
,
c
=
scalars
(
"abc"
)
mv
=
MakeVector
(
config
.
floatX
)
mv
=
MakeVector
(
config
.
floatX
)
output
=
mv
(
a
,
b
,
c
)
.
sum
(
axis
=
[])
output
=
mv
(
a
,
b
,
c
)
.
sum
(
axis
=
[])
rewrite_output
=
rewrite_graph
(
output
)
expected_output
=
mv
(
a
,
b
,
c
)
assert
equal_computations
([
expected_output
],
[
rewrite_output
])
output
=
rewrite_graph
(
output
)
# Empty input should return 0
between
=
vars_between
([
a
,
b
,
c
],
[
output
])
for
var
in
between
:
assert
(
var
.
owner
is
None
)
or
(
not
isinstance
(
var
.
owner
.
op
,
Sum
))
# Check empty MakeVector
mv
=
MakeVector
(
config
.
floatX
)
mv
=
MakeVector
(
config
.
floatX
)
output
=
mv
()
.
sum
()
output
=
mv
()
.
sum
()
rewrite_output
=
rewrite_graph
(
output
)
expected_output
=
pt
.
as_tensor
(
0
,
dtype
=
config
.
floatX
)
assert
equal_computations
([
expected_output
],
[
rewrite_output
])
output
=
rewrite_graph
(
output
)
# Single element input should return element value
between
=
vars_between
([
a
,
b
,
c
],
[
output
])
a
=
scalars
(
"a"
)
for
var
in
between
:
assert
(
var
.
owner
is
None
)
or
(
not
isinstance
(
var
.
owner
.
op
,
Sum
))
mv
=
MakeVector
(
config
.
floatX
)
mv
=
MakeVector
(
config
.
floatX
)
output
=
mv
(
a
)
.
sum
()
output
=
mv
(
a
)
.
sum
()
rewrite_output
=
rewrite_graph
(
output
)
output
=
rewrite_graph
(
output
)
expected_output
=
cast
(
a
,
config
.
floatX
)
between
=
vars_between
([
a
,
b
,
c
],
[
output
])
assert
equal_computations
([
expected_output
],
[
rewrite_output
])
for
var
in
between
:
assert
(
var
.
owner
is
None
)
or
(
not
isinstance
(
var
.
owner
.
op
,
Sum
))
# This is a regression test for #653. Ensure that rewrite is NOT
# applied when user requests float32
with
config
.
change_flags
(
floatX
=
"float32"
,
warn_float64
=
"raise"
):
a
,
b
,
c
=
scalars
(
"abc"
)
mv
=
MakeVector
(
config
.
floatX
)
output
=
mv
(
a
,
b
,
c
)
.
sum
()
rewrite_output
=
rewrite_graph
(
output
)
assert
equal_computations
([
output
],
[
rewrite_output
])
@pytest.mark.parametrize
(
@pytest.mark.parametrize
(
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论