adds in-place ReLU and fixes a potential divide-by-zero in nn.Sqrt

1 files changed, 19 insertions, 1 deletions

diff --git a/Threshold.lua b/Threshold.lua
index 6083957..1c35e1e 100644
--- a/Threshold.lua
+++ b/Threshold.lua
@@ -1,20 +1,38 @@
 local Threshold, parent = torch.class('nn.Threshold','nn.Module')
 
-function Threshold:__init(th,v)
+function Threshold:__init(th,v,ip)
    parent.__init(self)
    self.threshold = th or 1e-6
    self.val = v or 0
    if (th and type(th) ~= 'number') or (v and type(v) ~= 'number') then
       error('nn.Threshold(threshold, value)')
    end
+   -- default for inplace is false
+   self.inplace = ip or false
+   if (ip and type(ip) ~= 'boolean') then
+      error('in-place flag must be boolean')
+   end
+   self:validateParameters()
 end
 
 function Threshold:updateOutput(input)
+   self:validateParameters()
    input.nn.Threshold_updateOutput(self, input)
    return self.output
 end
 
 function Threshold:updateGradInput(input, gradOutput)
+   self:validateParameters()
    input.nn.Threshold_updateGradInput(self, input, gradOutput)
    return self.gradInput
 end
+
+function Threshold:validateParameters()
+   self.inplace = self.inplace or false -- backwards compatibility pre inplace
+   if self.inplace then
+      if self.val > self.threshold then
+         error('in-place processing requires value (' .. self.val ..
+                  ') not exceed threshold (' .. self.threshold .. ')')
+      end
+   end
+end