Merge pull request #83 from szagoruyko/mode

Initialize mode on updateOutput

8 files changed, 10 insertions, 25 deletions

diff --git a/LogSoftMax.lua b/LogSoftMax.lua
index 1ea1f7f..fc63c4f 100644
--- a/LogSoftMax.lua
+++ b/LogSoftMax.lua
@@ -1,7 +1,7 @@
 local SoftMax, parent = torch.class('cudnn.LogSoftMax', 'cudnn.SpatialSoftMax')
 
-function SoftMax:__init(fast)
-   parent.__init(self, fast)
+function SoftMax:updateOutput(input)
    self.mode = 'CUDNN_SOFTMAX_MODE_INSTANCE'
    self.algorithm = 'CUDNN_SOFTMAX_LOG'
+   return parent.updateOutput(self, input)
 end
diff --git a/ReLU.lua b/ReLU.lua
index 75eaeef..3d86d0d 100644
--- a/ReLU.lua
+++ b/ReLU.lua
@@ -1,10 +1,5 @@
 local ReLU, parent = torch.class('cudnn.ReLU','cudnn._Pointwise')
 
-function ReLU:__init(inplace)
-   parent.__init(self, inplace)
-   self.mode = 'CUDNN_ACTIVATION_RELU'
-end
-
 function ReLU:updateOutput(input)
   if not self.mode then self.mode = 'CUDNN_ACTIVATION_RELU' end
   return parent.updateOutput(self, input)
diff --git a/Sigmoid.lua b/Sigmoid.lua
index e7469ff..fb3676e 100644
--- a/Sigmoid.lua
+++ b/Sigmoid.lua
@@ -1,10 +1,5 @@
 local Sigmoid, parent = torch.class('cudnn.Sigmoid','cudnn._Pointwise')
 
-function Sigmoid:__init(inplace)
-   parent.__init(self, inplace)
-   self.mode = 'CUDNN_ACTIVATION_SIGMOID'
-end
-
 function Sigmoid:updateOutput(input)
   if not self.mode then self.mode = 'CUDNN_ACTIVATION_SIGMOID' end
   return parent.updateOutput(self, input)
diff --git a/SoftMax.lua b/SoftMax.lua
index b6d3eca..d3223c0 100644
--- a/SoftMax.lua
+++ b/SoftMax.lua
@@ -1,6 +1,6 @@
 local SoftMax, parent = torch.class('cudnn.SoftMax', 'cudnn.SpatialSoftMax')
 
-function SoftMax:__init(fast)
-   parent.__init(self, fast)
+function SoftMax:updateOutput(input)
    self.mode = 'CUDNN_SOFTMAX_MODE_INSTANCE'
+   return parent.updateOutput(self, input)
 end
diff --git a/SpatialMaxPooling.lua b/SpatialMaxPooling.lua
index bd6bdbc..ed7aad6 100644
--- a/SpatialMaxPooling.lua
+++ b/SpatialMaxPooling.lua
@@ -1,8 +1,8 @@
 local SpatialMaxPooling, parent = torch.class('cudnn.SpatialMaxPooling', 'cudnn._Pooling')
 
-function SpatialMaxPooling:__init(kW, kH, dW, dH, padW, padH)
-   parent.__init(self, kW, kH, dW, dH, padW, padH)
+function SpatialMaxPooling:updateOutput(input)
    self.mode = 'CUDNN_POOLING_MAX'
+   return parent.updateOutput(self, input)
 end
 
 function SpatialMaxPooling:__tostring__()
diff --git a/Tanh.lua b/Tanh.lua
index ac222e6..778feb5 100644
--- a/Tanh.lua
+++ b/Tanh.lua
@@ -1,10 +1,5 @@
 local Tanh, parent = torch.class('cudnn.Tanh','cudnn._Pointwise')
 
-function Tanh:__init(inplace)
-   parent.__init(self, inplace)
-   self.mode = 'CUDNN_ACTIVATION_TANH'
-end
-
 function Tanh:updateOutput(input)
   if not self.mode then self.mode = 'CUDNN_ACTIVATION_TANH' end
   return parent.updateOutput(self, input)
diff --git a/VolumetricAveragePooling.lua b/VolumetricAveragePooling.lua
index f63212e..bcebeba 100644
--- a/VolumetricAveragePooling.lua
+++ b/VolumetricAveragePooling.lua
@@ -1,6 +1,6 @@
 local VolumetricAveragePooling, parent = torch.class('cudnn.VolumetricAveragePooling', 'cudnn._Pooling3D')
 
-function VolumetricAveragePooling:__init(kT, kW, kH, dT, dW, dH, padT, padW, padH)
-   parent.__init(self, kT, kW, kH, dT, dW, dH, padT, padW, padH)
+function VolumetricAveragePooling:updateOutput(input)
    self.mode = 'CUDNN_POOLING_AVERAGE_COUNT_INCLUDE_PADDING'
+   return parent.updateOutput(self, input)
 end
diff --git a/VolumetricMaxPooling.lua b/VolumetricMaxPooling.lua
index d200e36..cf4d60b 100644
--- a/VolumetricMaxPooling.lua
+++ b/VolumetricMaxPooling.lua
@@ -1,6 +1,6 @@
 local VolumetricMaxPooling, parent = torch.class('cudnn.VolumetricMaxPooling', 'cudnn._Pooling3D')
 
-function VolumetricMaxPooling:__init(kT, kW, kH, dT, dW, dH, padT, padW, padH)
-   parent.__init(self, kT, kW, kH, dT, dW, dH, padT, padW, padH)
+function VolumetricMaxPooling:updateOutput(input)
    self.mode = 'CUDNN_POOLING_MAX'
+   return parent.updateOutput(self, input)
 end