提交 aff013c8 authored 作者: Brandon T. Willard's avatar Brandon T. Willard 提交者: Thomas Wiecki

Move theano.tensor.nnet.conv2d to theano.tensor.nnet.abstract_conv

上级 9eb77476
...@@ -334,7 +334,7 @@ class TestAssertShape: ...@@ -334,7 +334,7 @@ class TestAssertShape:
input = tensor4() input = tensor4()
filters = tensor4() filters = tensor4()
out = conv.conv2d( out = conv.abstract_conv2d(
input, filters, input_shape=(3, 5, 7, 11), filter_shape=(7, 5, 3, 3) input, filters, input_shape=(3, 5, 7, 11), filter_shape=(7, 5, 3, 3)
) )
f = theano.function([input, filters], out) f = theano.function([input, filters], out)
...@@ -888,7 +888,7 @@ class BaseTestConv2d(BaseTestConv): ...@@ -888,7 +888,7 @@ class BaseTestConv2d(BaseTestConv):
self, self,
inputs_shape, inputs_shape,
filters_shape, filters_shape,
conv_fn=conv.conv2d, conv_fn=conv.abstract_conv2d,
conv_op=conv.AbstractConv2d, conv_op=conv.AbstractConv2d,
ref=conv2d_corr, ref=conv2d_corr,
**kwargs, **kwargs,
...@@ -1447,7 +1447,7 @@ class TestConvTypes: ...@@ -1447,7 +1447,7 @@ class TestConvTypes:
out_shape = lvector() out_shape = lvector()
output = conv.conv2d(input, filters) output = conv.abstract_conv2d(input, filters)
grad_input, grad_filters = theano.grad(output.sum(), wrt=(input, filters)) grad_input, grad_filters = theano.grad(output.sum(), wrt=(input, filters))
assert grad_input.type == input.type, ( assert grad_input.type == input.type, (
grad_input, grad_input,
...@@ -1505,7 +1505,7 @@ class TestConvTypes: ...@@ -1505,7 +1505,7 @@ class TestConvTypes:
out_shape = lvector() out_shape = lvector()
# Check the forward Op # Check the forward Op
output = conv.conv2d(constant_tensor, filters) output = conv.abstract_conv2d(constant_tensor, filters)
grad_filters = theano.grad(output.sum(), wrt=filters) grad_filters = theano.grad(output.sum(), wrt=filters)
assert grad_filters.type == filters.type, ( assert grad_filters.type == filters.type, (
grad_filters, grad_filters,
...@@ -1514,7 +1514,7 @@ class TestConvTypes: ...@@ -1514,7 +1514,7 @@ class TestConvTypes:
filters.type, filters.type,
) )
output = conv.conv2d(input, constant_tensor) output = conv.abstract_conv2d(input, constant_tensor)
grad_input = theano.grad(output.sum(), wrt=input) grad_input = theano.grad(output.sum(), wrt=input)
assert grad_input.type == input.type, ( assert grad_input.type == input.type, (
grad_input, grad_input,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论