commit 687400c4fda8381fc97298f44ec4fc9546be1e5a
author soumith <soumith@fb.com> Fri Feb 19 10:31:42 2016 -0800
committer soumith <soumith@fb.com> Fri Feb 19 15:38:18 2016 -0800
tree c0061904a07dbea4cfcc67a54c8bd717b88792c6
parent a5dd23e000a1e8c6622946d27b739b3c23047d29

adding paddingValue to LookupTable

generic/LookupTable.c

diff --git a/generic/LookupTable.c b/generic/LookupTable.c
index ed9656e..47fbe08 100644
--- a/generic/LookupTable.c
+++ b/generic/LookupTable.c
@@ -29,11 +29,12 @@
   THTensor *sorted,
   THTensor *indices,
   bool scaleGradByFreq,
+  int paddingValue,
   real scale)
 {
   long i;
   THInteger_t *count_data = NULL;
-  
+
   if (scaleGradByFreq)
   {
     THIntegerTensor_(resize1d)(count, gradWeight->size[0]);
@@ -81,13 +82,15 @@
       long end = start + (numw/nthreads + 1);
       for (i=0; i<numel; i++)
       {
-        long k = input_data[i] - 1;
-        if (k >= start && k < end)
+        if (input_data[i] != paddingValue)
         {
-          real lr = scale;
-          if (count_data)
-            lr /= count_data[k];
-          THBlas_(axpy)(stride, lr, go + i*stride, 1, gw + k*stride, 1);
+            long k = input_data[i] - 1;
+            if (k >= start && k < end)
+            {
+                real scale_ = scale;
+                if (count_data) scale_ /= count_data[k];
+                THBlas_(axpy)(stride, scale_, go + i*stride, 1, gw + k*stride, 1);
+            }
         }
       }
     }
@@ -99,11 +102,13 @@
 
   for (i=0; i<numel; i++)
   {
-    long k = input_data[i] - 1;
-    real lr = scale;
-    if (count_data)
-      lr /= count_data[k];
-    THBlas_(axpy)(stride, lr, go + i*stride, 1, gw + k*stride, 1);
+    if (input_data[i] != paddingValue)
+    {
+        long k = input_data[i] - 1;
+        real scale_ = scale;
+        if (count_data) scale_ /= count_data[k];
+        THBlas_(axpy)(stride, scale_, go + i*stride, 1, gw + k*stride, 1);
+     }
   }
 
   THTensor_(free)(gradOutput);

generic/THNN.h

diff --git a/generic/THNN.h b/generic/THNN.h
index 811b39c..e758235 100644
--- a/generic/THNN.h
+++ b/generic/THNN.h
@@ -150,6 +150,7 @@
           THTensor *sorted,
           THTensor *indices,
           bool scaleGradByFreq,
+          int paddingValue,
           real scale);
 
 TH_API void THNN_(MarginCriterion_updateOutput)(