Upgraded all code to new torch master.torch-master

14 files changed, 56 insertions, 56 deletions

diff --git a/generic/Abs.c b/generic/Abs.c
index c45c0ab..8c65813 100644
--- a/generic/Abs.c
+++ b/generic/Abs.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/Abs.c"
 #else
 
-static int nn_(Abs_forward)(lua_State *L)
+static int nn_(Abs_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *output = luaT_getfieldcheckudata(L, 1, "output", torch_(Tensor_id));
@@ -14,7 +14,7 @@ static int nn_(Abs_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(Abs_backward)(lua_State *L)
+static int nn_(Abs_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *gradOutput = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -28,8 +28,8 @@ static int nn_(Abs_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(Abs__) [] = {
-  {"Abs_forward", nn_(Abs_forward)},
-  {"Abs_backward", nn_(Abs_backward)},
+  {"Abs_updateOutput", nn_(Abs_updateOutput)},
+  {"Abs_updateGradInput", nn_(Abs_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/DistMarginCriterion.c b/generic/DistMarginCriterion.c
index 6e94c9d..8859bdd 100644
--- a/generic/DistMarginCriterion.c
+++ b/generic/DistMarginCriterion.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/DistMarginCriterion.c"
 #else
 
-static int nn_(DistMarginCriterion_forward)(lua_State *L)
+static int nn_(DistMarginCriterion_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   int sizeAverage = luaT_getfieldcheckboolean(L, 1, "sizeAverage");
@@ -82,7 +82,7 @@ static int nn_(DistMarginCriterion_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(DistMarginCriterion_backward)(lua_State *L)
+static int nn_(DistMarginCriterion_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   int sizeAverage = luaT_getfieldcheckboolean(L, 1, "sizeAverage");
@@ -172,8 +172,8 @@ static int nn_(DistMarginCriterion_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(DistMarginCriterion__) [] = {
-  {"DistMarginCriterion_forward", nn_(DistMarginCriterion_forward)},
-  {"DistMarginCriterion_backward", nn_(DistMarginCriterion_backward)},
+  {"DistMarginCriterion_updateOutput", nn_(DistMarginCriterion_updateOutput)},
+  {"DistMarginCriterion_updateGradInput", nn_(DistMarginCriterion_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/HardShrink.c b/generic/HardShrink.c
index d3bcfcd..d75e071 100644
--- a/generic/HardShrink.c
+++ b/generic/HardShrink.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/HardShrink.c"
 #else
 
-static int nn_(HardShrink_forward)(lua_State *L)
+static int nn_(HardShrink_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *output = luaT_getfieldcheckudata(L, 1, "output", torch_(Tensor_id));
@@ -16,7 +16,7 @@ static int nn_(HardShrink_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(HardShrink_backward)(lua_State *L)
+static int nn_(HardShrink_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *gradOutput = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -32,8 +32,8 @@ static int nn_(HardShrink_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(HardShrink__) [] = {
-  {"HardShrink_forward", nn_(HardShrink_forward)},
-  {"HardShrink_backward", nn_(HardShrink_backward)},
+  {"HardShrink_updateOutput", nn_(HardShrink_updateOutput)},
+  {"HardShrink_updateGradInput", nn_(HardShrink_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SparseCriterion.c b/generic/SparseCriterion.c
index 76da569..f4ebb8e 100644
--- a/generic/SparseCriterion.c
+++ b/generic/SparseCriterion.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SparseCriterion.c"
 #else
 
-static int nn_(SparseCriterion_forward)(lua_State *L)
+static int nn_(SparseCriterion_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));  
   int sizeAverage = luaT_getfieldcheckboolean(L, 1, "sizeAverage");
@@ -19,7 +19,7 @@ static int nn_(SparseCriterion_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SparseCriterion_backward)(lua_State *L)
+static int nn_(SparseCriterion_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   int sizeAverage = luaT_getfieldcheckboolean(L, 1, "sizeAverage");
@@ -34,8 +34,8 @@ static int nn_(SparseCriterion_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SparseCriterion__) [] = {
-  {"SparseCriterion_forward", nn_(SparseCriterion_forward)},
-  {"SparseCriterion_backward", nn_(SparseCriterion_backward)},
+  {"SparseCriterion_updateOutput", nn_(SparseCriterion_updateOutput)},
+  {"SparseCriterion_updateGradInput", nn_(SparseCriterion_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialClassNLLCriterion.c b/generic/SpatialClassNLLCriterion.c
index 517af80..ddbbe1f 100644
--- a/generic/SpatialClassNLLCriterion.c
+++ b/generic/SpatialClassNLLCriterion.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SpatialClassNLLCriterion.c"
 #else
 
-static int nn_(SpatialClassNLLCriterion_forward)(lua_State *L)
+static int nn_(SpatialClassNLLCriterion_updateOutput)(lua_State *L)
 {
   THTensor *input  = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *target  = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -20,7 +20,7 @@ static int nn_(SpatialClassNLLCriterion_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialClassNLLCriterion_backward)(lua_State *L)
+static int nn_(SpatialClassNLLCriterion_updateGradInput)(lua_State *L)
 {
   THTensor *input  = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *target  = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -39,8 +39,8 @@ static int nn_(SpatialClassNLLCriterion_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialClassNLLCriterion__) [] = {
-  {"SpatialClassNLLCriterion_forward", nn_(SpatialClassNLLCriterion_forward)},
-  {"SpatialClassNLLCriterion_backward", nn_(SpatialClassNLLCriterion_backward)},
+  {"SpatialClassNLLCriterion_updateOutput", nn_(SpatialClassNLLCriterion_updateOutput)},
+  {"SpatialClassNLLCriterion_updateGradInput", nn_(SpatialClassNLLCriterion_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialGraph.c b/generic/SpatialGraph.c
index 29d8bbf..a1db79a 100644
--- a/generic/SpatialGraph.c
+++ b/generic/SpatialGraph.c
@@ -7,7 +7,7 @@
 #endif
 #define square(x) ((x)*(x))
 
-static int nn_(SpatialGraph_forward)(lua_State *L)
+static int nn_(SpatialGraph_updateOutput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -109,7 +109,7 @@ static int nn_(SpatialGraph_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialGraph_backward)(lua_State *L)
+static int nn_(SpatialGraph_updateGradInput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -245,8 +245,8 @@ static int nn_(SpatialGraph_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialGraph__) [] = {
-  {"SpatialGraph_forward", nn_(SpatialGraph_forward)},
-  {"SpatialGraph_backward", nn_(SpatialGraph_backward)},
+  {"SpatialGraph_updateOutput", nn_(SpatialGraph_updateOutput)},
+  {"SpatialGraph_updateGradInput", nn_(SpatialGraph_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialLinear.c b/generic/SpatialLinear.c
index 903c3b8..524d313 100644
--- a/generic/SpatialLinear.c
+++ b/generic/SpatialLinear.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SpatialLinear.c"
 #else
 
-static int nn_(SpatialLinear_forward)(lua_State *L)
+static int nn_(SpatialLinear_updateOutput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -43,7 +43,7 @@ static int nn_(SpatialLinear_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialLinear_backward)(lua_State *L)
+static int nn_(SpatialLinear_updateGradInput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -118,8 +118,8 @@ static int nn_(SpatialLinear_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialLinear__) [] = {
-  {"SpatialLinear_forward", nn_(SpatialLinear_forward)},
-  {"SpatialLinear_backward", nn_(SpatialLinear_backward)},
+  {"SpatialLinear_updateOutput", nn_(SpatialLinear_updateOutput)},
+  {"SpatialLinear_updateGradInput", nn_(SpatialLinear_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialMSECriterion.c b/generic/SpatialMSECriterion.c
index 8f59497..33fc2e3 100644
--- a/generic/SpatialMSECriterion.c
+++ b/generic/SpatialMSECriterion.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SpatialMSECriterion.c"
 #else
 
-static int nn_(SpatialMSECriterion_forward)(lua_State *L)
+static int nn_(SpatialMSECriterion_updateOutput)(lua_State *L)
 {
   THTensor *input  = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *target  = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -14,7 +14,7 @@ static int nn_(SpatialMSECriterion_forward)(lua_State *L)
     return 1;
 }
 
-static int nn_(SpatialMSECriterion_backward)(lua_State *L)
+static int nn_(SpatialMSECriterion_updateGradInput)(lua_State *L)
 {
   THTensor *input  = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *target  = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -40,8 +40,8 @@ static int nn_(SpatialMSECriterion_retarget)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialMSECriterion__) [] = {
-  {"SpatialMSECriterion_forward", nn_(SpatialMSECriterion_forward)},
-  {"SpatialMSECriterion_backward", nn_(SpatialMSECriterion_backward)},
+  {"SpatialMSECriterion_updateOutput", nn_(SpatialMSECriterion_updateOutput)},
+  {"SpatialMSECriterion_updateGradInput", nn_(SpatialMSECriterion_updateGradInput)},
   {"SpatialMSECriterion_retarget", nn_(SpatialMSECriterion_retarget)},
   {NULL, NULL}
 };
diff --git a/generic/SpatialMaxSampling.c b/generic/SpatialMaxSampling.c
index 5b795b3..fcdd54d 100644
--- a/generic/SpatialMaxSampling.c
+++ b/generic/SpatialMaxSampling.c
@@ -9,7 +9,7 @@
 #define MIN(a,b) ( ((a)<(b)) ? (a) : (b) )
 #endif
 
-static int nn_(SpatialMaxSampling_forward)(lua_State *L)
+static int nn_(SpatialMaxSampling_updateOutput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -99,7 +99,7 @@ static int nn_(SpatialMaxSampling_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialMaxSampling_backward)(lua_State *L)
+static int nn_(SpatialMaxSampling_updateGradInput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));  
@@ -165,8 +165,8 @@ static int nn_(SpatialMaxSampling_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialMaxSampling__) [] = {
-  {"SpatialMaxSampling_forward", nn_(SpatialMaxSampling_forward)},
-  {"SpatialMaxSampling_backward", nn_(SpatialMaxSampling_backward)},
+  {"SpatialMaxSampling_updateOutput", nn_(SpatialMaxSampling_updateOutput)},
+  {"SpatialMaxSampling_updateGradInput", nn_(SpatialMaxSampling_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialReSampling.c b/generic/SpatialReSampling.c
index 4312615..927add2 100644
--- a/generic/SpatialReSampling.c
+++ b/generic/SpatialReSampling.c
@@ -9,7 +9,7 @@
 #define MIN(a,b) ( ((a)<(b)) ? (a) : (b) )
 #endif
 
-static int nn_(SpatialReSampling_forward)(lua_State *L)
+static int nn_(SpatialReSampling_updateOutput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -85,7 +85,7 @@ static int nn_(SpatialReSampling_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialReSampling_backward)(lua_State *L)
+static int nn_(SpatialReSampling_updateGradInput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));  
@@ -166,8 +166,8 @@ static int nn_(SpatialReSampling_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialReSampling__) [] = {
-  {"SpatialReSampling_forward", nn_(SpatialReSampling_forward)},
-  {"SpatialReSampling_backward", nn_(SpatialReSampling_backward)},
+  {"SpatialReSampling_updateOutput", nn_(SpatialReSampling_updateOutput)},
+  {"SpatialReSampling_updateGradInput", nn_(SpatialReSampling_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialSparseCriterion.c b/generic/SpatialSparseCriterion.c
index 6b83476..3a3c540 100644
--- a/generic/SpatialSparseCriterion.c
+++ b/generic/SpatialSparseCriterion.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SpatialSparseCriterion.c"
 #else
 
-static int nn_(SpatialSparseCriterion_forward)(lua_State *L)
+static int nn_(SpatialSparseCriterion_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));  
   int sizeAverage = luaT_getfieldcheckboolean(L, 1, "sizeAverage");
@@ -23,7 +23,7 @@ static int nn_(SpatialSparseCriterion_forward)(lua_State *L)
   return 0;
 }
 
-static int nn_(SpatialSparseCriterion_backward)(lua_State *L)
+static int nn_(SpatialSparseCriterion_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *gradInput = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -45,8 +45,8 @@ static int nn_(SpatialSparseCriterion_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialSparseCriterion__) [] = {
-  {"SpatialSparseCriterion_forward", nn_(SpatialSparseCriterion_forward)},
-  {"SpatialSparseCriterion_backward", nn_(SpatialSparseCriterion_backward)},
+  {"SpatialSparseCriterion_updateOutput", nn_(SpatialSparseCriterion_updateOutput)},
+  {"SpatialSparseCriterion_updateGradInput", nn_(SpatialSparseCriterion_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/SpatialUpSampling.c b/generic/SpatialUpSampling.c
index 8a21efe..ea9828c 100644
--- a/generic/SpatialUpSampling.c
+++ b/generic/SpatialUpSampling.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/SpatialUpSampling.c"
 #else
 
-static int nn_(SpatialUpSampling_forward)(lua_State *L)
+static int nn_(SpatialUpSampling_updateOutput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -44,7 +44,7 @@ static int nn_(SpatialUpSampling_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(SpatialUpSampling_backward)(lua_State *L)
+static int nn_(SpatialUpSampling_updateGradInput)(lua_State *L)
 {
   // get all params
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
@@ -92,8 +92,8 @@ static int nn_(SpatialUpSampling_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(SpatialUpSampling__) [] = {
-  {"SpatialUpSampling_forward", nn_(SpatialUpSampling_forward)},
-  {"SpatialUpSampling_backward", nn_(SpatialUpSampling_backward)},
+  {"SpatialUpSampling_updateOutput", nn_(SpatialUpSampling_updateOutput)},
+  {"SpatialUpSampling_updateGradInput", nn_(SpatialUpSampling_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/Template.c b/generic/Template.c
index 9d1f444..6a75b88 100644
--- a/generic/Template.c
+++ b/generic/Template.c
@@ -2,19 +2,19 @@
 #define TH_GENERIC_FILE "generic/Template.c"
 #else
 
-static int nn_(Template_forward)(lua_State *L)
+static int nn_(Template_updateOutput)(lua_State *L)
 {
 
 }
 
-static int nn_(Template_backward)(lua_State *L)
+static int nn_(Template_updateGradInput)(lua_State *L)
 {
 
 }
 
 static const struct luaL_Reg nn_(Template__) [] = {
-  {"Template_forward", nn_(Template_forward)},
-  {"Template_backward", nn_(Template_backward)},
+  {"Template_updateOutput", nn_(Template_updateOutput)},
+  {"Template_updateGradInput", nn_(Template_updateGradInput)},
   {NULL, NULL}
 };
 
diff --git a/generic/Threshold.c b/generic/Threshold.c
index f25fddd..760e842 100644
--- a/generic/Threshold.c
+++ b/generic/Threshold.c
@@ -2,7 +2,7 @@
 #define TH_GENERIC_FILE "generic/Threshold.c"
 #else
 
-static int nn_(Threshold_forward)(lua_State *L)
+static int nn_(Threshold_updateOutput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   real val = luaT_getfieldchecknumber(L, 1, "val");
@@ -16,7 +16,7 @@ static int nn_(Threshold_forward)(lua_State *L)
   return 1;
 }
 
-static int nn_(Threshold_backward)(lua_State *L)
+static int nn_(Threshold_updateGradInput)(lua_State *L)
 {
   THTensor *input = luaT_checkudata(L, 2, torch_(Tensor_id));
   THTensor *gradOutput = luaT_checkudata(L, 3, torch_(Tensor_id));
@@ -32,8 +32,8 @@ static int nn_(Threshold_backward)(lua_State *L)
 }
 
 static const struct luaL_Reg nn_(Threshold__) [] = {
-  {"Threshold_forward", nn_(Threshold_forward)},
-  {"Threshold_backward", nn_(Threshold_backward)},
+  {"Threshold_updateOutput", nn_(Threshold_updateOutput)},
+  {"Threshold_updateGradInput", nn_(Threshold_updateGradInput)},
   {NULL, NULL}
 };