diff options
Diffstat (limited to 'generic/SpatialConvolutionMap.c')
-rw-r--r-- | generic/SpatialConvolutionMap.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/generic/SpatialConvolutionMap.c b/generic/SpatialConvolutionMap.c index 81117f4..4c289fb 100644 --- a/generic/SpatialConvolutionMap.c +++ b/generic/SpatialConvolutionMap.c @@ -4,7 +4,7 @@ static int nn_(SpatialConvolutionMap_updateOutput)(lua_State *L) { - THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id)); + THTensor *input = luaT_checkudata(L, 2, torch_Tensor); int kW = luaT_getfieldcheckint(L, 1, "kW"); int kH = luaT_getfieldcheckint(L, 1, "kH"); int dW = luaT_getfieldcheckint(L, 1, "dW"); @@ -12,10 +12,10 @@ static int nn_(SpatialConvolutionMap_updateOutput)(lua_State *L) int nInputPlane = luaT_getfieldcheckint(L, 1, "nInputPlane"); int nOutputPlane = luaT_getfieldcheckint(L, 1, "nOutputPlane"); - THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_(Tensor_id)); - THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_(Tensor_id)); - THTensor *bias = luaT_getfieldcheckudata(L, 1, "bias", torch_(Tensor_id)); - THTensor *output = luaT_getfieldcheckudata(L, 1, "output", torch_(Tensor_id)); + THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_Tensor); + THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_Tensor); + THTensor *bias = luaT_getfieldcheckudata(L, 1, "bias", torch_Tensor); + THTensor *output = luaT_getfieldcheckudata(L, 1, "output", torch_Tensor); luaL_argcheck(L, input->nDimension == 3, 2, "3D tensor expected"); luaL_argcheck(L, input->size[0] == nInputPlane, 2, "invalid number of input planes"); @@ -81,15 +81,15 @@ static int nn_(SpatialConvolutionMap_updateOutput)(lua_State *L) static int nn_(SpatialConvolutionMap_updateGradInput)(lua_State *L) { - THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id)); - THTensor *gradOutput = luaT_checkudata(L, 3, torch_(Tensor_id)); + THTensor *input = luaT_checkudata(L, 2, torch_Tensor); + THTensor *gradOutput = luaT_checkudata(L, 3, torch_Tensor); int dW = luaT_getfieldcheckint(L, 1, "dW"); int dH = luaT_getfieldcheckint(L, 1, "dH"); int nInputPlane = luaT_getfieldcheckint(L, 1, "nInputPlane"); - THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_(Tensor_id)); - THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_(Tensor_id)); - THTensor *gradInput = luaT_getfieldcheckudata(L, 1, "gradInput", torch_(Tensor_id)); + THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_Tensor); + THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_Tensor); + THTensor *gradInput = luaT_getfieldcheckudata(L, 1, "gradInput", torch_Tensor); // contiguous gradInput = THTensor_(newContiguous)(gradInput); @@ -145,17 +145,17 @@ static int nn_(SpatialConvolutionMap_updateGradInput)(lua_State *L) static int nn_(SpatialConvolutionMap_accGradParameters)(lua_State *L) { - THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id)); - THTensor *gradOutput = luaT_checkudata(L, 3, torch_(Tensor_id)); + THTensor *input = luaT_checkudata(L, 2, torch_Tensor); + THTensor *gradOutput = luaT_checkudata(L, 3, torch_Tensor); int dW = luaT_getfieldcheckint(L, 1, "dW"); int dH = luaT_getfieldcheckint(L, 1, "dH"); int nOutputPlane = luaT_getfieldcheckint(L, 1, "nOutputPlane"); real scale = luaL_optnumber(L, 4, 1); - THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_(Tensor_id)); - THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_(Tensor_id)); - THTensor *gradWeight = luaT_getfieldcheckudata(L, 1, "gradWeight", torch_(Tensor_id)); - THTensor *gradBias = luaT_getfieldcheckudata(L, 1, "gradBias", torch_(Tensor_id)); + THTensor *connTable = luaT_getfieldcheckudata(L, 1, "connTable", torch_Tensor); + THTensor *weight = luaT_getfieldcheckudata(L, 1, "weight", torch_Tensor); + THTensor *gradWeight = luaT_getfieldcheckudata(L, 1, "gradWeight", torch_Tensor); + THTensor *gradBias = luaT_getfieldcheckudata(L, 1, "gradBias", torch_Tensor); // contiguous input = THTensor_(newContiguous)(input); @@ -216,7 +216,7 @@ static const struct luaL_Reg nn_(SpatialConvolutionMap__) [] = { static void nn_(SpatialConvolutionMap_init)(lua_State *L) { - luaT_pushmetaclass(L, torch_(Tensor_id)); + luaT_pushmetatable(L, torch_Tensor); luaT_registeratname(L, nn_(SpatialConvolutionMap__), "nn"); lua_pop(L,1); } |