Merge branch 'master' of https://github.com/Microsoft/CNTK into amita…

…ga/htkmlfreaderMemoryOptimizations
moizali2005 · Feb 9, 2016 · 57fd382 · 57fd382
2 parents 5a67cf2 + 5945c39
commit 57fd382
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Source/Common/fileutil.cpp b/Source/Common/fileutil.cpp
@@ -407,20 +407,12 @@ void fprintfOrDie(FILE* f, const char* fmt, ...)
 #pragma warning(pop)
 
 // ----------------------------------------------------------------------------
-// fflushOrDie(): like fflush() but terminate with err msg in case of error
+// fsyncOrDie(): like fsync() but terminate with err msg in case of error
 // ----------------------------------------------------------------------------
 
-void fflushOrDie(FILE* f)
+void fsyncOrDie(FILE* f)
 {
-    int rc = fflush(f);
-
-    if (rc != 0)
-    {
-        RuntimeError("error flushing to file: %s", strerror(errno));
-    }
-
     int fd = fileno(f);
-
     if (fd == -1)
     {
         RuntimeError("unable to convert file handle to file descriptor: %s", strerror(errno));
@@ -433,15 +425,27 @@ void fflushOrDie(FILE* f)
         RuntimeError("error syncing to file: %d", (int) ::GetLastError());
     }
 #else
-    rc = fsync(fd);
-
+    int rc = fsync(fd);
     if (rc != 0)
     {
         RuntimeError("error syncing to file: %s", strerror(errno));
     }
 #endif
 }
 
+// ----------------------------------------------------------------------------
+// fflushOrDie(): like fflush() but terminate with err msg in case of error
+// ----------------------------------------------------------------------------
+
+void fflushOrDie(FILE* f)
+{
+    int rc = fflush(f);
+    if (rc != 0)
+    {
+        RuntimeError("error flushing to file: %s", strerror(errno));
+    }
+}
+
 // ----------------------------------------------------------------------------
 // filesize(): determine size of the file in bytes (with open file)
 // ----------------------------------------------------------------------------

diff --git a/Source/SGDLib/SGD.cpp b/Source/SGDLib/SGD.cpp
@@ -628,8 +628,8 @@ void SGD<ElemType>::TrainOrAdaptModel(int startEpoch, ComputationNetworkPtr net,
         // persist model and check-point info
         if ((g_mpi == nullptr) || g_mpi->IsMainNode())
         {
-            net->Save(GetModelNameForEpoch(i));
             SaveCheckPointInfo(i, totalSamplesSeen, learnRatePerSample, smoothedGradients, prevCriterion, chosenMinibatchSize);
+            net->Save(GetModelNameForEpoch(i));
             if (!m_keepCheckPointFiles)
             {
                 // delete previous checkpoint file to save space