Skip to content

adding multiple types to squeeze #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soumith merged 1 commit into from
Aug 19, 2016
Merged

adding multiple types to squeeze #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions TensorMath.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,44 @@ for k, Tensor_ in pairs(handledTypenames) do
{name="boolean", default=0}}
)

wrap("squeeze",
cname("squeeze"),
{{name=Tensor, default=true, returned=true, postcall=function(arg)
local txt = {}
if arg.returned then
table.insert(txt, string.format('if(arg%d->nDimension == 1 && arg%d->size[0] == 1)', arg.i, arg.i)) -- number
if Tensor == 'CudaHalfTensor' then
table.insert(txt, string.format('lua_pushnumber(L, (lua_Number)THC_half2float(TH%s_get1d(cutorch_getstate(L), arg%d, 0)));', Tensor, arg.i))
else
table.insert(txt, string.format('lua_pushnumber(L, (lua_Number)(TH%s_get1d(cutorch_getstate(L), arg%d, 0)));', Tensor, arg.i))
end
end
return table.concat(txt, '\n')
end},
{name=Tensor}},
cname("squeeze1d"),
{{name=Tensor, default=true, returned=true,
postcall=
function(arg)
local txt = {}
if arg.returned then
table.insert(txt, string.format('if(!hasdims && arg%d->nDimension == 1 && arg%d->size[0] == 1)', arg.i, arg.i)) -- number
if Tensor == 'CudaHalfTensor' then
table.insert(txt, string.format('lua_pushnumber(L, (lua_Number)THC_half2float(TH%s_get1d(cutorch_getstate(L), arg%d, 0)));}', Tensor, arg.i))
else
table.insert(txt, string.format('lua_pushnumber(L, (lua_Number)(TH%s_get1d(cutorch_getstate(L), arg%d, 0)));}', Tensor, arg.i))
end
end
return table.concat(txt, '\n')
end},

{name=Tensor,
precall=
function(arg)
return string.format('{int hasdims = arg%d->nDimension > 1;', arg.i)
end},
{name="index"}})


-- BLAS functions
if real == 'float' or real == 'double' or real == 'half' then
Expand Down
17 changes: 13 additions & 4 deletions test/test.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,19 +376,28 @@ end
function test.squeeze()
local sz = chooseInt(minsize, maxsize)
local x = torch.FloatTensor():rand(sz, 1, sz, 1)
compareFloatAndCuda(x, 'squeeze')
for k, typename in ipairs(typenames) do
local x = x:type(typename)
compareCPUAndCUDATypeTensorArgs(typename, nil, x, 'squeeze')
end

local y = x:cuda():squeeze()
tester:assert(y:dim() == 2, "squeeze err")

x = torch.FloatTensor():rand(sz, 1, 1, sz)
compareFloatAndCuda(x, 'squeeze', 2)
for k, typename in ipairs(typenames) do
local x = x:type(typename)
compareCPUAndCUDATypeTensorArgs(typename, nil, x, 'squeeze', 2)
end

local y = x:cuda():squeeze(2)
tester:assert(y:dim() == 3, "squeeze1d err")

x = torch.FloatTensor(1)
compareFloatAndCuda(x, 'squeeze')
x = torch.FloatTensor(1):normal()
for k, typename in ipairs(typenames) do
local x = x:type(typename)
compareCPUAndCUDATypeTensorArgs(typename, nil, x, 'squeeze')
end
end

function test.expand()
Expand Down