提交 0e4a9310 authored 作者: Nicolas Ballas's avatar Nicolas Ballas

Small fixes

上级 b096b2f8
...@@ -124,7 +124,7 @@ TODO: Give examples on how to use these things! They are pretty complicated. ...@@ -124,7 +124,7 @@ TODO: Give examples on how to use these things! They are pretty complicated.
- :func:`GpuCorr3dMM <theano.sandbox.cuda.blas.GpuCorr3dMM>` - :func:`GpuCorr3dMM <theano.sandbox.cuda.blas.GpuCorr3dMM>`
This is a GPU-only 3d correlation relying on a Toeplitz matrix This is a GPU-only 3d correlation relying on a Toeplitz matrix
and gemm implementation (see sandbox.cuda.blas.GpuCorrMM) and gemm implementation (see `GpuCorrMM <theano.sandbox.cuda.blas.GpuCorrMM>`)
It needs extra memory for the Toeplitz matrix, which is a 2D matrix of shape It needs extra memory for the Toeplitz matrix, which is a 2D matrix of shape
``(no of channels * filter width * filter height * filter depth, output width * output height * output depth)``. ``(no of channels * filter width * filter height * filter depth, output width * output height * output depth)``.
As it provides a gradient, you can use it as a replacement for nnet.conv3d. As it provides a gradient, you can use it as a replacement for nnet.conv3d.
...@@ -135,7 +135,7 @@ TODO: Give examples on how to use these things! They are pretty complicated. ...@@ -135,7 +135,7 @@ TODO: Give examples on how to use these things! They are pretty complicated.
overhead is small compared to conv3d_fft, there are no restrictions on overhead is small compared to conv3d_fft, there are no restrictions on
input or kernel shapes and strides are supported. If using it, input or kernel shapes and strides are supported. If using it,
please see the warning about a bug in CUDA 5.0 to 6.0 please see the warning about a bug in CUDA 5.0 to 6.0
in sandbox.cuda.blas.GpuCorrMM. in `GpuCorrMM <theano.sandbox.cuda.blas.GpuCorrMM>`.
- :func:`conv3d2d <theano.tensor.nnet.conv3d2d.conv3d>` - :func:`conv3d2d <theano.tensor.nnet.conv3d2d.conv3d>`
Another conv3d implementation that uses the conv2d with data reshaping. Another conv3d implementation that uses the conv2d with data reshaping.
......
...@@ -526,8 +526,6 @@ class BaseGpuCorrMM(GpuOp): ...@@ -526,8 +526,6 @@ class BaseGpuCorrMM(GpuOp):
and self.pad == other.pad and self.pad == other.pad
def __hash__(self): def __hash__(self):
# don't use hash(self.version) as hash(-1)==-2 and
# hash(-2)==-2 in python!
return hash(type(self)) \ return hash(type(self)) \
^ hash(self.border_mode) \ ^ hash(self.border_mode) \
^ hash(self.subsample) \ ^ hash(self.subsample) \
...@@ -985,8 +983,6 @@ class BaseGpuCorr3dMM(GpuOp): ...@@ -985,8 +983,6 @@ class BaseGpuCorr3dMM(GpuOp):
and self.pad == other.pad and self.pad == other.pad
def __hash__(self): def __hash__(self):
# don't use hash(self.version) as hash(-1)==-2 and
# hash(-2)==-2 in python!
return hash(type(self)) \ return hash(type(self)) \
^ hash(self.border_mode) \ ^ hash(self.border_mode) \
^ hash(self.subsample) \ ^ hash(self.subsample) \
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论