add TensorTests and QuantziersTests to makefile

fix build errors on Linux
coderye · Sep 1, 2016 · 07eff6b · 07eff6b
1 parent 1708674
commit 07eff6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -908,6 +908,8 @@ UNITTEST_MATH_SRC = \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/CPUMatrixTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/CPUSparseMatrixTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/fixtures.cpp \
+	$(SOURCEDIR)/../Tests/UnitTests/MathTests/QuantizersTests.cpp \
+	$(SOURCEDIR)/../Tests/UnitTests/MathTests/TensorTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUMatrixCudaBlasTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUMatrixTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/GPUSparseMatrixTests.cpp \

diff --git a/Source/Math/Quantizers.h b/Source/Math/Quantizers.h
@@ -98,7 +98,7 @@ class SymmetricQuantizer : public QuantizerBase<RawType, QuantizedType>
             LogicError("The absolute max element in the sequence to be quantized is 0.");
         }
         m_absMax = absoluteMax;
-        m_quantizeFactor = rangeMax / shiftedMax;
+        m_quantizeFactor = this->rangeMax / shiftedMax;
         m_inverseQuantizerFactor = 1 / m_quantizeFactor;
     }
 };

diff --git a/Tests/UnitTests/MathTests/TensorTests.cpp b/Tests/UnitTests/MathTests/TensorTests.cpp
@@ -23,7 +23,7 @@ BOOST_AUTO_TEST_CASE(ElementwiseAddition)
     // elementwise sum
     tensorTester.OneTensorTest("elementwise addition", 1e-8, [&tensorTester](DEVICEID_TYPE deviceId)
     {
-        return tensorTester.BroadcastingTest(TensorShape{ 512, 256 }, TensorShape({ 512, 256 }), deviceId);
+        return tensorTester.BroadcastingTest(TensorShape{ 512, 256 }, TensorShape{ 512, 256 }, deviceId);
     });
 }
 
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE(AdditionWithSimpleBroadcasting)
     // simple broadcasting
     tensorTester.OneTensorTest("addition wth simple broadcasting", 1e-8, [&tensorTester](DEVICEID_TYPE deviceId)
     {
-        return tensorTester.BroadcastingTest(TensorShape{ 3, 2 }, TensorShape({ 3, 1 }), deviceId);
+        return tensorTester.BroadcastingTest(TensorShape{ 3, 2 }, TensorShape{ 3, 1 }, deviceId);
     });
 }
 
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(BiasAddition)
     // typical bias for convolutional layer
     tensorTester.OneTensorTest("bias addition (broadcasting)", 1e-8, [&tensorTester](DEVICEID_TYPE deviceId)
     {
-        return tensorTester.BroadcastingTest(TensorShape{ 28, 28, 128, 32 }, TensorShape({ 1, 1, 128 }), deviceId);
+        return tensorTester.BroadcastingTest(TensorShape{ 28, 28, 128, 32 }, TensorShape{ 1, 1, 128 }, deviceId);
     });
 }
 
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(BiasAddition2)
     //         Something fishy going on. Dimension overflow?
     tensorTester.OneTensorTest("bias addition (broadcasting)", 1e-8, [&tensorTester](DEVICEID_TYPE deviceId)
     {
-        return tensorTester.BroadcastingTest(TensorShape{ 256, 256, 64, 32 }, TensorShape({ 1, 1, 64 }), deviceId);
+        return tensorTester.BroadcastingTest(TensorShape{ 256, 256, 64, 32 }, TensorShape{ 1, 1, 64 }, deviceId);
     });
 }
 
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(BiasGradient2)
     // typical bias gradient (reduction) for convolutional layer
     tensorTester.OneTensorTest("bias gradient (reduction)", 1e-1, [&tensorTester](DEVICEID_TYPE deviceId)
     {
-        return tensorTester.BiasGradientTest(TensorShape{ 256, 256, 64, 32 }, TensorShape({ 1, 1, 64 }), deviceId);
+        return tensorTester.BiasGradientTest(TensorShape{ 256, 256, 64, 32 }, TensorShape{ 1, 1, 64 }, deviceId);
     });
 }