diff options
author | soumith <soumith@gmail.com> | 2016-03-17 22:11:17 +0300 |
---|---|---|
committer | soumith <soumith@gmail.com> | 2016-03-17 22:11:17 +0300 |
commit | 501dc97f6720f448c8e4fc4fa70829230afe987e (patch) | |
tree | eb07331652c86449204e3ef5ad595acf5ac85c33 | |
parent | 75b21693b61365cda1499a841f250f165eef6ed1 (diff) |
add _input and _gradOutput to clearState everywhere
-rw-r--r-- | Pointwise.lua | 1 | ||||
-rw-r--r-- | Pooling.lua | 1 | ||||
-rw-r--r-- | Pooling3D.lua | 1 | ||||
-rw-r--r-- | SpatialCrossMapLRN.lua | 1 | ||||
-rw-r--r-- | SpatialDivisiveNormalization.lua | 5 | ||||
-rw-r--r-- | SpatialSoftMax.lua | 4 | ||||
-rw-r--r-- | TemporalConvolution.lua | 2 | ||||
-rw-r--r-- | VolumetricConvolution.lua | 2 |
8 files changed, 15 insertions, 2 deletions
diff --git a/Pointwise.lua b/Pointwise.lua index 51fdcca..0a79545 100644 --- a/Pointwise.lua +++ b/Pointwise.lua @@ -69,5 +69,6 @@ end function Pointwise:clearState() self:clearDesc() + self._gradOutput = nil return parent.clearState(self) end diff --git a/Pooling.lua b/Pooling.lua index e9c9025..c2061e3 100644 --- a/Pooling.lua +++ b/Pooling.lua @@ -132,5 +132,6 @@ end function Pooling:clearState() self:clearDesc() + self._gradOutput = nil return parent.clearState(self) end diff --git a/Pooling3D.lua b/Pooling3D.lua index a1fd3e3..072f2c3 100644 --- a/Pooling3D.lua +++ b/Pooling3D.lua @@ -141,5 +141,6 @@ end function Pooling:clearState() self:clearDesc() + self._gradOutput = nil return parent.clearState(self) end diff --git a/SpatialCrossMapLRN.lua b/SpatialCrossMapLRN.lua index 43cba69..aefe618 100644 --- a/SpatialCrossMapLRN.lua +++ b/SpatialCrossMapLRN.lua @@ -106,5 +106,6 @@ end function LRN:clearState() self:clearDesc() + self._gradOutput = nil return nn.Module.clearState(self) end diff --git a/SpatialDivisiveNormalization.lua b/SpatialDivisiveNormalization.lua index 50d7923..3462b61 100644 --- a/SpatialDivisiveNormalization.lua +++ b/SpatialDivisiveNormalization.lua @@ -98,3 +98,8 @@ function DivisiveNorm:write(f) end f:writeObject(var) end + +function DivisiveNorm:clearState() + self._gradOutput = nil + return parent.clearState(self) +end diff --git a/SpatialSoftMax.lua b/SpatialSoftMax.lua index f180526..493477f 100644 --- a/SpatialSoftMax.lua +++ b/SpatialSoftMax.lua @@ -30,7 +30,7 @@ function SpatialSoftMax:createIODescriptors(input) batch = false end assert(input:dim() == 4 and input:isContiguous()); - + if not self.iDesc or not self.oDesc or input:size(1) ~= self.iSize[1] or input:size(2) ~= self.iSize[2] or input:size(3) ~= self.iSize[3] or input:size(4) ~= self.iSize[4] then @@ -106,6 +106,6 @@ end function SpatialSoftMax:clearState() self:clearDesc() - nn.utils.clear(self, '_gradOutput') + self._gradOutput = nil return parent.clearState(self) end diff --git a/TemporalConvolution.lua b/TemporalConvolution.lua index 6ab84bd..f59a5bd 100644 --- a/TemporalConvolution.lua +++ b/TemporalConvolution.lua @@ -122,5 +122,7 @@ end function TemporalConvolution:clearState() self:clearDesc() + self._gradOutput = nil + self._input = nil return parent.clearState(self) end diff --git a/VolumetricConvolution.lua b/VolumetricConvolution.lua index 9081e61..1f8025c 100644 --- a/VolumetricConvolution.lua +++ b/VolumetricConvolution.lua @@ -308,5 +308,7 @@ end function VolumetricConvolution:clearState() self:clearDesc() nn.utils.clear(self, 'extraBuffer') + self._gradOutput = nil + self._input = nil return nn.Module.clearState(self) end |