From 5304784b6ccd9ce9dd08eee6e46d903067f9fdc6 Mon Sep 17 00:00:00 2001
From: Frank Seide <fseide@microsoft.com>
Date: Mon, 29 Feb 2016 21:27:49 -0800
Subject: [PATCH] fixed NoGPU build re do_sync; updated
 ExperimentalHTKMLFReader w.r.t. file naming

---
 Makefile                                                  | 4 ++--
 Source/Math/NoGPU.cpp                                     | 8 --------
 .../ExperimentalHTKMLFReader.vcxproj                      | 4 ++--
 .../ExperimentalHTKMLFReader.vcxproj.filters              | 4 ++--
 .../{DataReader.cpp => Exports.cpp}                       | 0
 5 files changed, 6 insertions(+), 14 deletions(-)
 rename Source/Readers/ExperimentalHTKMLFReader/{DataReader.cpp => Exports.cpp} (100%)

diff --git a/Makefile b/Makefile
index d3439fac9af1..975689301433 100644
--- a/Makefile
+++ b/Makefile
@@ -327,10 +327,10 @@ $(LIBDIR)/HTKMLFReader.so: $(HTKMLFREADER_OBJ) | $(CNTKMATH_LIB)
 ########################################
 
 EXPERIMENTALHTKMLFREADER_SRC =\
-	$(SOURCEDIR)/Readers/HTKMLFReader/DataWriter.cpp \
+	$(SOURCEDIR)/Readers/HTKMLFReader/DataWriterLocal.cpp \
 	$(SOURCEDIR)/Readers/HTKMLFReader/HTKMLFWriter.cpp \
 	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/ConfigHelper.cpp \
-	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/DataReader.cpp \
+	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/Exports.cpp \
 	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/HTKDataDeserializer.cpp \
 	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/HTKMLFReader.cpp \
 	$(SOURCEDIR)/Readers/ExperimentalHTKMLFReader/MLFDataDeserializer.cpp \
diff --git a/Source/Math/NoGPU.cpp b/Source/Math/NoGPU.cpp
index 7e11bdbc671e..41e793884a81 100644
--- a/Source/Math/NoGPU.cpp
+++ b/Source/Math/NoGPU.cpp
@@ -214,14 +214,6 @@ ElemType GPUSparseMatrix<ElemType>::Adagrad(GPUMatrix<ElemType>& c, const bool n
 //template<class ElemType>
 //void GPUSparseMatrix<ElemType>::FSAdagrad(CPUMatrix<ElemType>& gradients, CPUMatrix<ElemType>&, ElemType, ElemType, ElemType, ElemType) { }
 
-#ifdef NO_SYNC
-template <class ElemType>
-bool GPUSparseMatrix<ElemType>::do_sync = false;
-#else
-template <class ElemType>
-bool GPUSparseMatrix<ElemType>::do_sync = true;
-#endif
-
 template <class ElemType>
 void GPUSparseMatrix<ElemType>::MultiplyAndWeightedAdd(ElemType alpha, const GPUSparseMatrix<ElemType>& a, const bool transposeA,
                                                        const GPUMatrix<ElemType>& b, const bool transposeD, ElemType beta, GPUMatrix<ElemType>& c)
diff --git a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj
index 3505c96a697a..f8a8ebfd2ce5 100644
--- a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj
+++ b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj
@@ -109,7 +109,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ConfigHelper.cpp" />
-    <ClCompile Include="DataReader.cpp" />
+    <ClCompile Include="Exports.cpp" />
     <ClCompile Include="dllmain.cpp">
       <CompileAsManaged>false</CompileAsManaged>
       <PrecompiledHeader />
@@ -130,4 +130,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj.filters b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj.filters
index 53053f08725c..b3fa676b31c2 100644
--- a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj.filters
+++ b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj.filters
@@ -3,7 +3,6 @@
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="stdafx.cpp" />
-    <ClCompile Include="DataReader.cpp" />
     <ClCompile Include="..\..\Common\TimerUtility.cpp">
       <Filter>Common</Filter>
     </ClCompile>
@@ -23,6 +22,7 @@
     <ClCompile Include="..\..\Common\ExceptionWithCallStack.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="Exports.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
@@ -61,4 +61,4 @@
       <UniqueIdentifier>{812d1247-04eb-4693-a0d2-5399a94e6235}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Readers/ExperimentalHTKMLFReader/DataReader.cpp b/Source/Readers/ExperimentalHTKMLFReader/Exports.cpp
similarity index 100%
rename from Source/Readers/ExperimentalHTKMLFReader/DataReader.cpp
rename to Source/Readers/ExperimentalHTKMLFReader/Exports.cpp