提交 50bbc9f3 authored 作者: sentient07's avatar sentient07

addressed comments

上级 42028b46
...@@ -222,12 +222,6 @@ class GpuElemwise(GpuOp): ...@@ -222,12 +222,6 @@ class GpuElemwise(GpuOp):
self.sync = d.get('sync', True) self.sync = d.get('sync', True)
self._rehash() self._rehash()
def __eq__(self, other):
return (type(self) == type(other) and
self.scalar_op == other.scalar_op and
self.inplace_pattern == other.inplace_pattern and
self.sync == other.sync)
def _rehash(self): def _rehash(self):
items = list(self.inplace_pattern.items()) items = list(self.inplace_pattern.items())
items.sort() items.sort()
...@@ -570,7 +564,7 @@ class GpuCAReduce(GpuOp): ...@@ -570,7 +564,7 @@ class GpuCAReduce(GpuOp):
""" """
__props__ = ("reduce_mask", "scalar_op", ) __props__ = ("reduce_mask", "scalar_op", "pre_scalar_op", )
def __init__(self, reduce_mask, scalar_op, pre_scalar_op=None): def __init__(self, reduce_mask, scalar_op, pre_scalar_op=None):
self.reduce_mask = tuple(reduce_mask) self.reduce_mask = tuple(reduce_mask)
...@@ -582,18 +576,6 @@ class GpuCAReduce(GpuOp): ...@@ -582,18 +576,6 @@ class GpuCAReduce(GpuOp):
if pre_scalar_op: if pre_scalar_op:
assert pre_scalar_op.nin == 1 assert pre_scalar_op.nin == 1
def __eq__(self, other):
return (type(self) == type(other) and
self.reduce_mask == other.reduce_mask and
self.scalar_op == other.scalar_op and
self.pre_scalar_op == other.pre_scalar_op)
def __hash__(self):
return (hash(type(self)) ^
hash(self.reduce_mask) ^
hash(type(self.scalar_op)) ^
hash(type(self.pre_scalar_op)))
def __str__(self): def __str__(self):
pre = "" pre = ""
if self.pre_scalar_op: if self.pre_scalar_op:
......
...@@ -1590,7 +1590,7 @@ def local_conv_gemm(node): ...@@ -1590,7 +1590,7 @@ def local_conv_gemm(node):
# need to flip the kernel for valid convolution # need to flip the kernel for valid convolution
kern = kern[:, :, ::-1, ::-1] kern = kern[:, :, ::-1, ::-1]
# By default use GpuCorrMM # By default use GpuCorrMM
rval = GpuCorrMM(**node.op._props_dict())( rval = GpuCorrMM(border_mode, subsample)(
gpu_contiguous(img), gpu_contiguous(kern)) gpu_contiguous(img), gpu_contiguous(kern))
# call GpuCorrMM_gradWeights if good # call GpuCorrMM_gradWeights if good
......
...@@ -504,7 +504,7 @@ second dimension ...@@ -504,7 +504,7 @@ second dimension
""" """
__props__ = ("scalar_op",) __props__ = ("scalar_op", "inplace_pattern")
def __init__(self, scalar_op, inplace_pattern=None, name=None, def __init__(self, scalar_op, inplace_pattern=None, name=None,
nfunc_spec=None, openmp=None): nfunc_spec=None, openmp=None):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论