Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/nn.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Gross <colesbury@gmail.com>2015-05-05 01:53:50 +0300
committerSam Gross <colesbury@gmail.com>2015-05-05 01:53:50 +0300
commitd30ab5a0f6871e8efc27f9cd833241ac32363dd7 (patch)
tree16a2f6a0f95714bda63a033bfd56212938e86201 /test.lua
parentd65686fd2eba7ae744eb1258e7bf004d21ac4277 (diff)
Rename unpack to table.unpack for Lua 5.2
Torch7 defines table.unpack to unpack if it is not defined.
Diffstat (limited to 'test.lua')
-rw-r--r--test.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/test.lua b/test.lua
index a28674a..2f7857b 100644
--- a/test.lua
+++ b/test.lua
@@ -2863,7 +2863,7 @@ function nntest.View()
local target = template:size():totable()
local module = nn.View(template:size())
mytester:assertTableEq(module:forward(input):size():totable(), target, "Error in forward (1)")
- local module = nn.View(unpack(target))
+ local module = nn.View(table.unpack(target))
mytester:assertTableEq(module:forward(input):size():totable(), target, "Error in forward (2)")
-- Minibatch
@@ -2919,7 +2919,7 @@ function nntest.Reshape()
local target = template:size():totable()
local module = nn.Reshape(template:size())
mytester:assertTableEq(module:forward(input):size():totable(), target, "Error in forward (1)")
- local module = nn.View(unpack(target))
+ local module = nn.View(table.unpack(target))
mytester:assertTableEq(module:forward(input):size():totable(), target, "Error in forward (2)")
-- Minibatch
@@ -2945,7 +2945,7 @@ function nntest.SpatialUpSamplingNearest()
end
-- Check that the gradient is correct by using finite elements
- local input = torch.Tensor(unpack(shape)):zero()
+ local input = torch.Tensor(table.unpack(shape)):zero()
local err = jac.testJacobian(m, input)
mytester:assertlt(err, precision, ' error on state ')
@@ -3190,7 +3190,7 @@ function nntest.MM()
local gradOutput = torch.randn(M, P)
local gradInput = mm:backward({A, B}, gradOutput)
mytester:assert(#gradInput == 2, 'gradInput must be table of size 2')
- local gradA, gradB = unpack(gradInput)
+ local gradA, gradB = table.unpack(gradInput)
mytester:assertTableEq(gradA:size():totable(), A:size():totable(),
'Gradient for input A has wrong size')
mytester:assertTableEq(gradB:size():totable(), B:size():totable(),
@@ -3221,7 +3221,7 @@ function nntest.BatchMMNoTranspose()
local gradOutput = torch.randn(bSize, M, P)
local gradInput = mm:backward({A, B}, gradOutput)
mytester:assert(#gradInput == 2, 'gradInput must be table of size 2')
- local gradA, gradB = unpack(gradInput)
+ local gradA, gradB = table.unpack(gradInput)
mytester:assertTableEq(gradA:size():totable(), A:size():totable(),
'Gradient for input A has wrong size')
mytester:assertTableEq(gradB:size():totable(), B:size():totable(),
@@ -3255,7 +3255,7 @@ function nntest.BatchMMTransposeA()
local gradOutput = torch.randn(bSize, M, P)
local gradInput = mm:backward({A, B}, gradOutput)
mytester:assert(#gradInput == 2, 'gradInput must be table of size 2')
- local gradA, gradB = unpack(gradInput)
+ local gradA, gradB = table.unpack(gradInput)
mytester:assertTableEq(gradA:size():totable(), A:size():totable(),
'Gradient for input A has wrong size')
mytester:assertTableEq(gradB:size():totable(), B:size():totable(),
@@ -3289,7 +3289,7 @@ function nntest.BatchMMTransposeB()
local gradOutput = torch.randn(bSize, M, P)
local gradInput = mm:backward({A, B}, gradOutput)
mytester:assert(#gradInput == 2, 'gradInput must be table of size 2')
- local gradA, gradB = unpack(gradInput)
+ local gradA, gradB = table.unpack(gradInput)
mytester:assertTableEq(gradA:size():totable(), A:size():totable(),
'Gradient for input A has wrong size')
mytester:assertTableEq(gradB:size():totable(), B:size():totable(),
@@ -3323,7 +3323,7 @@ function nntest.BatchMMTransposeBoth()
local gradOutput = torch.randn(bSize, M, P)
local gradInput = mm:backward({A, B}, gradOutput)
mytester:assert(#gradInput == 2, 'gradInput must be table of size 2')
- local gradA, gradB = unpack(gradInput)
+ local gradA, gradB = table.unpack(gradInput)
mytester:assertTableEq(gradA:size():totable(), A:size():totable(),
'Gradient for input A has wrong size')
mytester:assertTableEq(gradB:size():totable(), B:size():totable(),