提交 57092897 authored 作者: affanv14's avatar affanv14

remove staticmethod call

上级 55c95357
...@@ -2158,11 +2158,11 @@ def dconv2di(border_mode, subsample, filter_dilation, num_groups): ...@@ -2158,11 +2158,11 @@ def dconv2di(border_mode, subsample, filter_dilation, num_groups):
class Cudnn_grouped_conv(Grouped_conv_noOptim): class Cudnn_grouped_conv(Grouped_conv_noOptim):
mode = mode_with_gpu mode = mode_with_gpu
conv2d = staticmethod(dconv2d) conv2d = dconv2d
conv2d_gradw = staticmethod(dconv2dw) conv2d_gradw = dconv2dw
conv2d_gradi = staticmethod(dconv2di) conv2d_gradi = dconv2di
conv2d_op = staticmethod(dnn.GpuDnnConv) conv2d_op = dnn.GpuDnnConv
conv2d_gradw_op = staticmethod(dnn.GpuDnnConvGradW) conv2d_gradw_op = dnn.GpuDnnConvGradW
conv2d_gradi_op = staticmethod(dnn.GpuDnnConvGradI) conv2d_gradi_op = dnn.GpuDnnConvGradI
flip_filter = False flip_filter = False
is_dnn = True is_dnn = True
...@@ -224,11 +224,11 @@ class TestCorrMM(unittest.TestCase): ...@@ -224,11 +224,11 @@ class TestCorrMM(unittest.TestCase):
class TestGroupGpuCorr2d(Grouped_conv_noOptim): class TestGroupGpuCorr2d(Grouped_conv_noOptim):
mode = theano.compile.get_mode("FAST_RUN") mode = theano.compile.get_mode("FAST_RUN")
conv2d = staticmethod(GpuCorrMM) conv2d = GpuCorrMM
conv2d_gradw = staticmethod(GpuCorrMM_gradWeights) conv2d_gradw = GpuCorrMM_gradWeights
conv2d_gradi = staticmethod(GpuCorrMM_gradInputs) conv2d_gradi = GpuCorrMM_gradInputs
conv2d_op = staticmethod(GpuCorrMM) conv2d_op = GpuCorrMM
conv2d_gradw_op = staticmethod(GpuCorrMM_gradWeights) conv2d_gradw_op = GpuCorrMM_gradWeights
conv2d_gradi_op = staticmethod(GpuCorrMM_gradInputs) conv2d_gradi_op = GpuCorrMM_gradInputs
flip_filter = True flip_filter = True
is_dnn = False is_dnn = False
...@@ -1702,12 +1702,12 @@ class TestConv2dGrads(unittest.TestCase): ...@@ -1702,12 +1702,12 @@ class TestConv2dGrads(unittest.TestCase):
class Grouped_conv_noOptim(unittest.TestCase): class Grouped_conv_noOptim(unittest.TestCase):
conv2d = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d) conv2d = theano.tensor.nnet.abstract_conv.AbstractConv2d
conv2d_gradw = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d_gradWeights) conv2d_gradw = theano.tensor.nnet.abstract_conv.AbstractConv2d_gradWeights
conv2d_gradi = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d_gradInputs) conv2d_gradi = theano.tensor.nnet.abstract_conv.AbstractConv2d_gradInputs
conv2d_op = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d) conv2d_op = theano.tensor.nnet.abstract_conv.AbstractConv2d
conv2d_gradw_op = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d_gradWeights) conv2d_gradw_op = theano.tensor.nnet.abstract_conv.AbstractConv2d_gradWeights
conv2d_gradi_op = staticmethod(theano.tensor.nnet.abstract_conv.AbstractConv2d_gradInputs) conv2d_gradi_op = theano.tensor.nnet.abstract_conv.AbstractConv2d_gradInputs
mode = theano.Mode(optimizer=None) mode = theano.Mode(optimizer=None)
flip_filter = False flip_filter = False
is_dnn = False is_dnn = False
......
...@@ -422,12 +422,12 @@ class TestGroupCorr2d(Grouped_conv_noOptim): ...@@ -422,12 +422,12 @@ class TestGroupCorr2d(Grouped_conv_noOptim):
mode = theano.compile.get_mode("FAST_RUN") mode = theano.compile.get_mode("FAST_RUN")
else: else:
mode = None mode = None
conv2d = staticmethod(corr.CorrMM) conv2d = corr.CorrMM
conv2d_gradw = staticmethod(corr.CorrMM_gradWeights) conv2d_gradw = corr.CorrMM_gradWeights
conv2d_gradi = staticmethod(corr.CorrMM_gradInputs) conv2d_gradi = corr.CorrMM_gradInputs
conv2d_op = staticmethod(corr.CorrMM) conv2d_op = corr.CorrMM
conv2d_gradw_op = staticmethod(corr.CorrMM_gradWeights) conv2d_gradw_op = corr.CorrMM_gradWeights
conv2d_gradi_op = staticmethod(corr.CorrMM_gradInputs) conv2d_gradi_op = corr.CorrMM_gradInputs
flip_filter = True flip_filter = True
is_dnn = False is_dnn = False
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论