commit b50dc9cd04a949a1b6c6fbf519694ee210218c29
author nicholas-leonard <nick@nikopia.org> Tue Jun 10 17:08:36 2014 -0400
committer nicholas-leonard <nick@nikopia.org> Tue Jun 10 17:08:36 2014 -0400
tree 08ba372d08ce13e1a537af6e5e4076ede7006ab3
parent 872b67b636373c9ae72573599296e578f592b9fd

renorm only renormalizes rows with greater norms than maxnorm

generic/THTensorMath.c

diff --git a/generic/THTensorMath.c b/generic/THTensorMath.c
index 56ce630..4675a93 100644
--- a/generic/THTensorMath.c
+++ b/generic/THTensorMath.c
@@ -1416,17 +1416,19 @@
     
     THTensor_(select)(rowS, src, dimension, i);
     THTensor_(select)(rowR, res, dimension, i);
-    
-    TH_TENSOR_APPLY(real, rowS, norm += pow(fabs(*row_data), value);)
+    TH_TENSOR_APPLY(real, rowS, norm += pow(fabs(*rowS_data), value););
     
     norm = pow(norm, 1/value);
-    new_norm = min(norm, maxnorm);
-    new_norm /= (norm + 1e-7);
-    
-    TH_TENSOR_APPLY2(
-      real, rowR, real, rowS, 
-      *rowR_data = *rowS_data / new_norm;
-    )
+    if (norm > maxnorm)
+    {
+      new_norm = maxnorm / (norm + 1e-7);
+      TH_TENSOR_APPLY2(
+        real, rowR, real, rowS, 
+        *rowR_data = (*rowS_data) * new_norm;
+      )
+    }
+    else
+      THTensor_(copy)(rowR, rowS);
   }
   
   THTensor_(free)(rowR);