Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	RNN.lua

2 files changed, 7 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f9b50e..b4deeed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,10 @@ ENDIF()
 FIND_PACKAGE(Torch REQUIRED)
 FIND_PACKAGE(CUDA 7.0 REQUIRED)
 
-FIND_PACKAGE(CUDNN 5.1 EXACT QUIET)
+FIND_PACKAGE(CUDNN 5 EXACT QUIET)
 IF(NOT CUDNN_FOUND)
   CUDNN_INSTALL(5.1 "${Torch_INSTALL_LIB}" "${Torch_INSTALL_INCLUDE}" "")
-  FIND_PACKAGE(CUDNN 5.1 EXACT REQUIRED)
+  FIND_PACKAGE(CUDNN 5 EXACT REQUIRED)
 ENDIF()
 
 
diff --git a/RNN.lua b/RNN.lua
index 2836228..80ee760 100644
--- a/RNN.lua
+++ b/RNN.lua
@@ -614,11 +614,11 @@ local function retrieveLinearParams(self, cuDNNMethod)
                 filterDimA:data())
 
             local offset
-	    if type(jit) == 'table' then
-	       offset = matrixPointer[0] - self.weight:data()
-	    else
-	       offset = (tonumber(matrixPointer[0]) - tonumber(self.weight:data()))/self.weight:elementSize()
-	    end
+            if jit then
+                offset = matrixPointer[0] - self.weight:data()
+            else
+                offset = (tonumber(matrixPointer[0]) - tonumber(self.weight:data()))/self.weight:elementSize()
+            end
             local params = torch.CudaTensor(self.weight:storage(), offset + self.weight:storageOffset(), filterDimA:prod())
             table.insert(layerInfo, params)
         end