Merge branch 'master' into Convert

2 files changed, 11 insertions, 10 deletions

diff --git a/Convert.lua b/Convert.lua
index 308bdac..855338d 100644
--- a/Convert.lua
+++ b/Convert.lua
@@ -54,7 +54,6 @@ function Convert:buildConverter(input)
    assert(torch.isTensor(self.output), "Expecting Tensor output")
 
    self.converter:type(torch.type(self.output))
-   self.converter:serialMode(self.dpnn_serialEmpty, self.dpnn_serialType)
 
    self.modules[1] = self.converter
 end
@@ -231,14 +230,16 @@ function Convert:findAxis(axis_char, shape, silent)
    return axis_pos
 end
 
+function Convert:clearState()
+   self._input = nil
+   self._gradInput = nil
+   self.__input = nil
+   self.__output = nil
+   self.__gradInput = nil
+   self.__gradOutput =  nil
+end
+
 function Convert:type(type)
-   if not torch.isTypeOf(self.output, type) then
-      self._input = nil
-      self._gradInput = nil
-      self.__input = nil
-      self.__output = nil
-      self.__gradInput = nil
-      self.__gradOutput =  nil
-   end
+   self:clearState()
    return parent.type(self, type)
 end
diff --git a/test.lua b/test.lua
index 1b1b2c1..67b9fd9 100755
--- a/test.lua
+++ b/test.lua
@@ -4708,7 +4708,7 @@ end
 
 
 function nntest.TemporalRowConvolution()
-
+  if true then return end -- until this unit test is fixed...
   local from = math.random(1,5)
   local ki = math.random(1,5)
   local si = math.random(1,2)