提交 79112666 authored 作者: Brandon T. Willard's avatar Brandon T. Willard 提交者: Brandon T. Willard

Remove unused CheckAndRaise code and minor refactoring to MergeOptimizer

上级 48c9ef88
差异被折叠。
...@@ -324,7 +324,7 @@ class TestMergeOptimizer: ...@@ -324,7 +324,7 @@ class TestMergeOptimizer:
@pytest.mark.skip(reason="This was disabled for some unknown reason") @pytest.mark.skip(reason="This was disabled for some unknown reason")
def test_one_assert_merge(self): def test_one_assert_merge(self):
# Merge two nodes, one has assert, the other not. """Merge two nodes, one has assert, the other not."""
x1 = matrix("x1") x1 = matrix("x1")
x2 = matrix("x2") x2 = matrix("x2")
e = dot(x1, x2) + dot(assert_op(x1, (x1 > x2).all()), x2) e = dot(x1, x2) + dot(assert_op(x1, (x1 > x2).all()), x2)
...@@ -342,8 +342,7 @@ class TestMergeOptimizer: ...@@ -342,8 +342,7 @@ class TestMergeOptimizer:
assert add_inputs[0] is add_inputs[1] assert add_inputs[0] is add_inputs[1]
def test_both_assert_merge_identical(self): def test_both_assert_merge_identical(self):
# Merge two nodes, both have assert on the same node """Merge two nodes, both have `Assert`s on the same node with the same conditions."""
# with the same conditions.
x1 = matrix("x1") x1 = matrix("x1")
x2 = matrix("x2") x2 = matrix("x2")
e = dot(assert_op(x1, (x1 > x2).all()), x2) + dot( e = dot(assert_op(x1, (x1 > x2).all()), x2) + dot(
...@@ -434,7 +433,7 @@ class TestMergeOptimizer: ...@@ -434,7 +433,7 @@ class TestMergeOptimizer:
assert add_inputs[0] is add_inputs[1] assert add_inputs[0] is add_inputs[1]
def test_merge_noinput(self): def test_merge_noinput(self):
# Check that identical Apply nodes without inputs will be merged """Check that identical Apply nodes without inputs will be merged."""
x = NoInputOp(param=0)() x = NoInputOp(param=0)()
y = NoInputOp(param=0)() y = NoInputOp(param=0)()
z = NoInputOp(param=1)() z = NoInputOp(param=1)()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论