Improve nn.legacy compatibility with Torch7 (#738)

mvitez · soumith · commit 937ba581d780 · 2017-02-16T21:17:12.000+05:30
diff --git a/torch/legacy/nn/SpatialMaxPooling.py b/torch/legacy/nn/SpatialMaxPooling.py
@@ -31,7 +31,7 @@ def floor(self):
         return self
 
     def updateOutput(self, input):
-        if self.indices is None:
+        if not hasattr(self, 'indices') or self.indices is None:
             self.indices = input.new()
         self.indices = self.indices.long()
 
diff --git a/torch/utils/serialization/read_lua_file.py b/torch/utils/serialization/read_lua_file.py
@@ -396,6 +396,7 @@ def ensure_type(obj, type_map):
 decrement('Index', 'dimension')
 decrement('SelectTable', 'index')
 decrement('SplitTable', 'dimension')
+decrement_positive('JoinTable', 'dimension')
 decrement('Parallel', 'inputDimension', 'outputDimension')
 decrement('Concat', 'dimension')
 decrement('DepthConcat', 'dimension')
