Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pytensor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
testgroup
pytensor
Commits
4355a58f
Unverified
提交
4355a58f
authored
1月 08, 2022
作者:
Anoop T P
提交者:
GitHub
1月 08, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change FunctionGraph.change_input to change_node_input (#734)
上级
e476ebcd
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
13 行增加
和
13 行删除
+13
-13
types.py
aesara/compile/function/types.py
+6
-6
features.py
aesara/graph/features.py
+1
-1
fg.py
aesara/graph/fg.py
+2
-2
test_fg.py
tests/graph/test_fg.py
+4
-4
没有找到文件。
aesara/compile/function/types.py
浏览文件 @
4355a58f
...
@@ -1221,11 +1221,11 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
...
@@ -1221,11 +1221,11 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
# and not(wrapped_outputs[i].borrow and wrapped_outputs[j].borrow):
# and not(wrapped_outputs[i].borrow and wrapped_outputs[j].borrow):
if
fgraph
.
outputs
[
j
]
in
views_of_output_i
:
if
fgraph
.
outputs
[
j
]
in
views_of_output_i
:
if
wrapped_outputs
[
i
]
.
borrow
and
wrapped_outputs
[
j
]
.
borrow
:
if
wrapped_outputs
[
i
]
.
borrow
and
wrapped_outputs
[
j
]
.
borrow
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
i
,
view_op
(
fgraph
.
outputs
[
i
]),
reason
=
reason
"output"
,
i
,
view_op
(
fgraph
.
outputs
[
i
]),
reason
=
reason
)
)
else
:
else
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
i
,
deep_copy_op
(
fgraph
.
outputs
[
i
]),
reason
=
reason
"output"
,
i
,
deep_copy_op
(
fgraph
.
outputs
[
i
]),
reason
=
reason
)
)
copied
=
True
copied
=
True
...
@@ -1248,7 +1248,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
...
@@ -1248,7 +1248,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
if
input_j
in
fgraph
.
inputs
:
if
input_j
in
fgraph
.
inputs
:
j
=
fgraph
.
inputs
.
index
(
input_j
)
j
=
fgraph
.
inputs
.
index
(
input_j
)
if
wrapped_outputs
[
i
]
.
borrow
and
wrapped_inputs
[
j
]
.
borrow
:
if
wrapped_outputs
[
i
]
.
borrow
and
wrapped_inputs
[
j
]
.
borrow
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
"output"
,
i
,
i
,
view_op
(
fgraph
.
outputs
[
i
]),
view_op
(
fgraph
.
outputs
[
i
]),
...
@@ -1256,7 +1256,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
...
@@ -1256,7 +1256,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
)
)
break
break
else
:
else
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
"output"
,
i
,
i
,
deep_copy_op
(
fgraph
.
outputs
[
i
]),
deep_copy_op
(
fgraph
.
outputs
[
i
]),
...
@@ -1264,7 +1264,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
...
@@ -1264,7 +1264,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
)
)
break
break
elif
wrapped_outputs
[
i
]
.
borrow
:
elif
wrapped_outputs
[
i
]
.
borrow
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
"output"
,
i
,
i
,
view_op
(
fgraph
.
outputs
[
i
]),
view_op
(
fgraph
.
outputs
[
i
]),
...
@@ -1272,7 +1272,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
...
@@ -1272,7 +1272,7 @@ def insert_deepcopy(fgraph, wrapped_inputs, wrapped_outputs):
)
)
break
break
else
:
else
:
fgraph
.
change_input
(
fgraph
.
change_
node_
input
(
"output"
,
"output"
,
i
,
i
,
deep_copy_op
(
fgraph
.
outputs
[
i
]),
deep_copy_op
(
fgraph
.
outputs
[
i
]),
...
...
aesara/graph/features.py
浏览文件 @
4355a58f
...
@@ -366,7 +366,7 @@ class LambdaExtract:
...
@@ -366,7 +366,7 @@ class LambdaExtract:
self
.
reason
=
reason
self
.
reason
=
reason
def
__call__
(
self
):
def
__call__
(
self
):
return
self
.
fgraph
.
change_input
(
return
self
.
fgraph
.
change_
node_
input
(
self
.
node
,
self
.
i
,
self
.
r
,
reason
=
(
"Revert"
,
self
.
reason
)
self
.
node
,
self
.
i
,
self
.
r
,
reason
=
(
"Revert"
,
self
.
reason
)
)
)
...
...
aesara/graph/fg.py
浏览文件 @
4355a58f
...
@@ -418,7 +418,7 @@ class FunctionGraph(MetaObject):
...
@@ -418,7 +418,7 @@ class FunctionGraph(MetaObject):
self
.
add_client
(
input
,
(
node
,
i
))
self
.
add_client
(
input
,
(
node
,
i
))
self
.
execute_callbacks
(
"on_import"
,
node
,
reason
)
self
.
execute_callbacks
(
"on_import"
,
node
,
reason
)
def
change_input
(
def
change_
node_
input
(
self
,
self
,
node
:
Union
[
Apply
,
str
],
node
:
Union
[
Apply
,
str
],
i
:
int
,
i
:
int
,
...
@@ -544,7 +544,7 @@ class FunctionGraph(MetaObject):
...
@@ -544,7 +544,7 @@ class FunctionGraph(MetaObject):
assert
(
node
==
"output"
and
self
.
outputs
[
i
]
is
var
)
or
(
assert
(
node
==
"output"
and
self
.
outputs
[
i
]
is
var
)
or
(
node
.
inputs
[
i
]
is
var
node
.
inputs
[
i
]
is
var
)
)
self
.
change_input
(
self
.
change_
node_
input
(
node
,
i
,
new_var
,
reason
=
reason
,
import_missing
=
import_missing
node
,
i
,
new_var
,
reason
=
reason
,
import_missing
=
import_missing
)
)
...
...
tests/graph/test_fg.py
浏览文件 @
4355a58f
...
@@ -193,24 +193,24 @@ class TestFunctionGraph:
...
@@ -193,24 +193,24 @@ class TestFunctionGraph:
var6
=
MyVariable2
(
"var6"
)
var6
=
MyVariable2
(
"var6"
)
with
pytest
.
raises
(
TypeError
):
with
pytest
.
raises
(
TypeError
):
fg
.
change_input
(
"output"
,
1
,
var6
)
fg
.
change_
node_
input
(
"output"
,
1
,
var6
)
with
pytest
.
raises
(
TypeError
):
with
pytest
.
raises
(
TypeError
):
fg
.
change_input
(
var5
.
owner
,
1
,
var6
)
fg
.
change_
node_
input
(
var5
.
owner
,
1
,
var6
)
old_apply_nodes
=
set
(
fg
.
apply_nodes
)
old_apply_nodes
=
set
(
fg
.
apply_nodes
)
old_variables
=
set
(
fg
.
variables
)
old_variables
=
set
(
fg
.
variables
)
old_var5_clients
=
list
(
fg
.
get_clients
(
var5
))
old_var5_clients
=
list
(
fg
.
get_clients
(
var5
))
# We're replacing with the same variable, so nothing should happen
# We're replacing with the same variable, so nothing should happen
fg
.
change_input
(
var5
.
owner
,
1
,
var2
)
fg
.
change_
node_
input
(
var5
.
owner
,
1
,
var2
)
assert
old_apply_nodes
==
fg
.
apply_nodes
assert
old_apply_nodes
==
fg
.
apply_nodes
assert
old_variables
==
fg
.
variables
assert
old_variables
==
fg
.
variables
assert
old_var5_clients
==
fg
.
get_clients
(
var5
)
assert
old_var5_clients
==
fg
.
get_clients
(
var5
)
# Perform a valid `Apply` node input change
# Perform a valid `Apply` node input change
fg
.
change_input
(
var5
.
owner
,
1
,
var1
)
fg
.
change_
node_
input
(
var5
.
owner
,
1
,
var1
)
assert
var5
.
owner
.
inputs
[
1
]
is
var1
assert
var5
.
owner
.
inputs
[
1
]
is
var1
assert
(
var5
.
owner
,
1
)
not
in
fg
.
get_clients
(
var2
)
assert
(
var5
.
owner
,
1
)
not
in
fg
.
get_clients
(
var2
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论