Remove the block multiplier code, as it isn't used right now.

Closes microsoft#1805.
prime9 · Aug 7, 2017 · 11e593d · 11e593d
1 parent 61c8202
commit 11e593d
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 3,966 deletions.
diff --git a/Makefile b/Makefile
@@ -370,7 +370,6 @@ COMMON_SRC =\
 
 MATH_SRC =\
 	$(SOURCEDIR)/Math/BatchNormalizationEngine.cpp \
-	$(SOURCEDIR)/Math/BlockHandlerSSE.cpp \
 	$(SOURCEDIR)/Math/CUDAPageLockedMemAllocator.cpp \
 	$(SOURCEDIR)/Math/CPUMatrixFloat.cpp \
 	$(SOURCEDIR)/Math/CPUMatrixDouble.cpp \
@@ -386,12 +385,6 @@ MATH_SRC =\
 	$(SOURCEDIR)/Math/TensorView.cpp \
 	$(SOURCEDIR)/Math/NcclComm.cpp \
 
-ifdef SUPPORT_AVX2
-MATH_SRC +=\
-	$(SOURCEDIR)/Math/BlockHandlerAVX.cpp \
-
-endif
-
 ifdef CUDA_PATH
 MATH_SRC +=\
 	$(SOURCEDIR)/Math/CuDnnBatchNormalization.cu \
@@ -1243,7 +1236,6 @@ $(UNITTEST_NETWORK): $(UNITTEST_NETWORK_OBJ) | $(READER_LIBS) $(CNTKTEXTFORMATRE
 
 UNITTEST_MATH_SRC = \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/BatchNormalizationEngineTests.cpp \
-	$(SOURCEDIR)/../Tests/UnitTests/MathTests/BlockMultiplierTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/constants.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/ConvolutionEngineTests.cpp \
 	$(SOURCEDIR)/../Tests/UnitTests/MathTests/CPUMatrixTests.cpp \

diff --git a/Source/Math/BlockHandlerAVX.cpp b/Source/Math/BlockHandlerAVX.cpp
diff --git a/Source/Math/BlockHandlerAVX.h b/Source/Math/BlockHandlerAVX.h
diff --git a/Source/Math/BlockHandlerSSE.cpp b/Source/Math/BlockHandlerSSE.cpp
diff --git a/Source/Math/BlockHandlerSSE.h b/Source/Math/BlockHandlerSSE.h