Address CR feedback

todda · May 31, 2016 · 1e01cbe · 1e01cbe
1 parent 5188260
commit 1e01cbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Source/CNTK/CNTK.cpp b/Source/CNTK/CNTK.cpp
@@ -473,12 +473,11 @@ int wmainWithBS(int argc, wchar_t* argv[]) // called from wmain which is a wrapp
 
     // parallel training
     shared_ptr<Microsoft::MSR::CNTK::MPIWrapper> mpi;
+    auto ensureMPIWrapperCleanup = MakeScopeExit(&MPIWrapper::DeleteInstance);
     bool paralleltrain = config(L"parallelTrain", false);
     if (paralleltrain)
         mpi = MPIWrapper::GetInstance(true /*create*/);
 
-    auto ensureMPIWrapperCleanup = MakeScopeExit(&MPIWrapper::DeleteInstance);
-
     g_shareNodeValueMatrices = config(L"shareNodeValueMatrices", false);
 
     TracingGPUMemoryAllocator::SetTraceLevel(config(L"traceGPUMemoryAllocations", 0));
@@ -572,12 +571,11 @@ int wmainOldCNTKConfig(int argc, wchar_t* argv[])
 
     // paralleltrain training
     shared_ptr<Microsoft::MSR::CNTK::MPIWrapper> mpi;
+    auto ensureMPIWrapperCleanup = MakeScopeExit(&MPIWrapper::DeleteInstance);
     bool paralleltrain = config(L"parallelTrain", "false");
     if (paralleltrain)
         mpi = MPIWrapper::GetInstance(true /*create*/);
 
-    auto ensureMPIWrapperCleanup = MakeScopeExit(&MPIWrapper::DeleteInstance);
-
     g_shareNodeValueMatrices = config(L"shareNodeValueMatrices", false);
 
     TracingGPUMemoryAllocator::SetTraceLevel(config(L"traceGPUMemoryAllocations", 0));

diff --git a/Source/Common/Include/MPIWrapper.h b/Source/Common/Include/MPIWrapper.h
@@ -157,11 +157,11 @@ class MPIWrapper : public std::enable_shared_from_this<MPIWrapper>
         fprintf(stderr, "~MPIWrapper\n");
         fflush(stderr);
         // TODO: Check for error code and throw if !std::uncaught_exception()
-	
-	// Do not finalize in event of an exception since calling MPI_Finalize without
-	// all pending communications being finished results in a hang
-	if (!std::uncaught_exception())
-	  MPI_Finalize();
+
+        // Do not finalize in event of an exception since calling MPI_Finalize without
+        // all pending communications being finished results in a hang
+        if (!std::uncaught_exception())
+            MPI_Finalize();
     }
 
 private: