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

1 files changed, 6 insertions, 9 deletions

diff --git a/test/test.lua b/test/test.lua
index 3d67c9d..8ed2bab 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -1516,7 +1516,7 @@ mytester = torch.Tester()
 mytester:add(cudnntest)
 
 -- if torch.random(1,2) == 1 then
-   cudnn.fastest = true -- run manual auto-tuner
+--   cudnn.benchmark = true -- run manual auto-tuner
    cudnn.verbose = true
 --end
 
@@ -1527,19 +1527,16 @@ for i=1,cutorch.getDeviceCount() do
    print('Running test on device: #' .. i .. ' : ' .. prop.name)
 
    cutorch.setDevice(i)
-
-
-
+--   double tensor may be broken
+   print'Testing torch.CudaDoubleTensor'
+   torch.setdefaulttensortype('torch.DoubleTensor')
+   testparams = testparams_double
+   mytester:run()
 
    print'Testing torch.CudaTensor'
    testparams = testparams_float
    mytester:run()
 
---   double tensor may be broken
---   print'Testing torch.CudaDoubleTensor'
---   torch.setdefaulttensortype('torch.DoubleTensor')
---   testparams = testparams_double
---   mytester:run()
 
 --   half tensor is broken on Pascal
    print'Testing torch.CudaHalfTensor'