Merge pull request #196 from TimZaman/fix/warp-type-issue

Fixes warp type-cast issue in #189
torch · Oct 4, 2016 · ad5a376 · ad5a376
2 parents 88f4e3d + f682842
commit ad5a376
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/init.lua b/init.lua
@@ -954,7 +954,6 @@ local function warp(...)
       dok.error('Incorrect arguments (clamp_mode is not clamp | pad)!', 'image.warp')
    end
 
-   local field = field:typeAs(torch.Tensor()) -- coerce matrix to default tensor type
    local dim2 = false
    if src:nDimension() == 2 then
       dim2 = true

diff --git a/test/test_warp.lua b/test/test_warp.lua
@@ -137,3 +137,10 @@ image.display{image = im_lanczos, zoom = 4, legend = 'rotation lanczos (pad 1)'}
 
 image.display{image = im, zoom = 4, legend = 'source image'}
 
+-- ***********************************************
+-- NOW MAKE SURE BOTH FLOAT AND DOUBLE INPUTS WORK
+-- ***********************************************
+
+mtx = torch.zeros(2, 32, 32)
+out = image.warp(im:float(), mtx:float(), 'bilinear')
+out = image.warp(im:double(), mtx:double(), 'bilinear')