Removed preprocessor definition for enabling/disabling inclusion of residue in computing quantization range. Not including the residue is actually a bug and now the residue is always included when computing the quantization range

Math/CNTKMathTest/MatrixQuantizerTests.cpp

@@ -48,10 +48,7 @@ namespace CNTKMathTest
                 for (int i = 0; i < numRows; i++)
                 {
                     size_t flatIdx = (j * numRows) + i;
-                    ElemType val = inMatrix[flatIdx];
-#ifdef INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE
-                    val += prevResidualMatrix[flatIdx];
-#endif
+                    ElemType val = inMatrix[flatIdx] + prevResidualMatrix[flatIdx];
                     if (val < mean)
                     {
                         mean0Sum += val;

Math/Math/ColumnQuantizer.h

@@ -201,12 +201,6 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             size_t subset, size_t subsets,
             F1 allReduceElem, F2 allReduceUint)
         {
-#ifdef WIN32
-#ifndef INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE
-            UNREFERENCED_PARAMETER(inResidual);
-#endif
-#endif
-
             // quantization range, cut off after how many standard deviations (make this a parameter if we care)
             size_t rows = M;
             // compute mean
@@ -227,10 +221,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
             for (size_t i = subset; i < rows; i += subsets)
             {
                 size_t ij = ColMIDX(i, j, M);
-                meanacc += inMat[ij];
-#ifdef INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE
-                meanacc += inResidual[ij];
-#endif
+                meanacc += inMat[ij] + inResidual[ij];
             }
             // multi-subset (CUDA): reduce to one thread
             allReduceElem(meanacc);
@@ -250,10 +241,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
                 for (size_t i = subset; i < rows; i += subsets)
                 {
                     size_t ij = ColMIDX(i, j, M);
-                    ElemType val = inMat[ij];
-#ifdef INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE
-                    val += inResidual[ij];
-#endif
+                    ElemType val = inMat[ij] + inResidual[ij];
                     if (val < mean)
                     {
                         meanacc0 += val;
@@ -311,10 +299,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
                 for (size_t i = subset; i < rows; i += subsets)
                 {
                     size_t ij = ColMIDX(i, j, M);
-                    ElemType val = inMat[ij];
-#ifdef INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE
-                    val += inResidual[ij];
-#endif
+                    ElemType val = inMat[ij] + inResidual[ij];
                     varacc += (val - mean) * (val - mean);
                 }
                 // multi-subset (CUDA): reduce to one thread

Math/Math/ValueQuantizer.h

@@ -49,9 +49,6 @@ namespace Microsoft { namespace MSR { namespace CNTK {
     // force 1-bit quant to threshold against 0 rather than the midpoint between lower and upper
     #define ZERO_THRESHOLD_FOR_1BIT 
 
-    // in 1-bit quantization, compute the quantization range boundaries including the residual values
-    #define INCLUDE_RESIDUE_FOR_QUANTIZATION_RANGE 
-
     template<class ElemType>
     class ValueQuantizer
     {