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

…ga/removeCopyCtorFromMatrix

Source/Common/BestGpu.cpp

@@ -306,6 +306,7 @@ BestGpu::~BestGpu()
 
     if (m_nvmlData)
     {
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         nvmlShutdown();
     }
 }

Source/Common/CrossProcessMutex.h

@@ -58,6 +58,7 @@ class CrossProcessMutex
     void Release()
     {
         assert(m_handle != NULL);
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         ::ReleaseMutex(m_handle);
         ::CloseHandle(m_handle);
         m_handle = NULL;
@@ -180,6 +181,7 @@ class CrossProcessMutex
         m_lock.l_type = F_UNLCK;
         // Now removing the lock and closing the file descriptor
         // waiting processes will be notified
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         fcntl(m_fd, F_SETLKW, &m_lock);
         close(m_fd);
         m_fd = -1;

Source/Common/File.cpp

@@ -163,13 +163,20 @@ bool File::IsTextBased()
 
 // File Destructor
 // closes the file
-// Note: this does not check for errors. Use Flush() before closing a file you are writing.
+// Note: this does not check for errors when the File corresponds to pipe stream. In this case, use Flush() before closing a file you are writing.
 File::~File(void)
 {
     if (m_pcloseNeeded)
+    {
+        // TODO: Check for error code and throw if !std::uncaught_exception()     
         _pclose(m_file);
+    }
     else if (m_file != stdin && m_file != stdout && m_file != stderr)
-        fclose(m_file); // (since destructors may not throw, we ignore the return code here)
+    {
+        int rc = fclose(m_file);
+        if ((rc != 0) && !std::uncaught_exception())
+            RuntimeError("File: failed to close file at %S", m_filename.c_str());
+    }
 }
 
 void File::Flush()

Source/Common/Include/Basics.h

@@ -641,6 +641,7 @@ class Plugin
     }
     ~Plugin()
     {
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         if (handle != NULL)
             dlclose(handle);
     }

Source/Common/Include/MPIWrapper.h

@@ -151,6 +151,7 @@ class MPIWrapper
     {
         fprintf(stderr, "~MPIWrapper\n");
         fflush(stderr);
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         MPI_Finalize();
     }
 

Source/Common/Include/fileutil.h

@@ -694,19 +694,16 @@ class auto_file_ptr
     FILE* f;
     FILE* operator=(auto_file_ptr&); // can't ref-count: no assignment
     auto_file_ptr(auto_file_ptr&);
-    // implicit close (destructor, assignment): we ignore error
     void close() throw()
     {
-        if (f)
-            try
-            {
-                if (f != stdin && f != stdout && f != stderr)
-                    ::fclose(f);
-            }
-            catch (...)
-            {
-            }
-        f = NULL;
+        if (f && f != stdin && f != stdout && f != stderr)
+        {
+            int rc = ::fclose(f);
+            if ((rc != 0) && !std::uncaught_exception())
+                RuntimeError("auto_file_ptr: failed to close file");
+
+            f = NULL;
+        }
     }
 #pragma warning(push)
 #pragma warning(disable : 4996)

Source/Common/fileutil.cpp

@@ -1697,6 +1697,7 @@ class auto_find_handle
     }
     ~auto_find_handle()
     {
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         if (h != INVALID_HANDLE_VALUE)
             ::FindClose(h);
     }

Source/Math/CuDnnConvolutionEngine.cu

@@ -40,6 +40,7 @@ bool CuDnnConvolutionEngineFactory<ElemType>::IsSupported(DEVICEID_TYPE deviceId
 
 CudaTimer::~CudaTimer()
 {
+    // TODO: Should not throw if std::uncaught_exception()
     if (m_start != nullptr)
         CUDA_CALL(cudaEventDestroy(reinterpret_cast<cudaEvent_t>(m_start)));
     if (m_stop != nullptr)
@@ -99,6 +100,7 @@ public:
     {
         if (m_tensor != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroyTensorDescriptor(m_tensor);
             m_tensor = nullptr;
         }
@@ -137,6 +139,7 @@ public:
     {
         if (m_filter != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroyFilterDescriptor(m_filter);
             m_filter = nullptr;
         }
@@ -169,6 +172,7 @@ public:
     {
         if (m_conv != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroyConvolutionDescriptor(m_conv);
             m_conv = nullptr;
         }
@@ -204,6 +208,7 @@ public:
     {
         if (m_pool != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroyPoolingDescriptor(m_pool);
             m_pool = nullptr;
         }
@@ -283,6 +288,7 @@ public:
     {
         if (m_cudnn != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroy(m_cudnn);
             m_cudnn = nullptr;
         }
@@ -535,6 +541,7 @@ public:
     {
         if (m_cudnn != nullptr)
         {
+            // TODO: Check for error code and throw if !std::uncaught_exception()
             cudnnDestroy(m_cudnn);
             m_cudnn = nullptr;
         }

Source/Math/GPUDataTransferer.cpp

@@ -98,6 +98,7 @@ template <class ElemType>
 GPUDataTransferer<ElemType>::~GPUDataTransferer()
 {
     // BUGBUG: we don't destroy our streams (they are static variables); we need a static destructor, I am too lazy now
+    // TODO: Check for error code and throw if !std::uncaught_exception()
     cudaEventDestroy(m_assignCompleteEvent);
     cudaEventDestroy(m_fetchCompleteEvent);
 }

Source/Math/MatrixQuantizerGPU.cu

@@ -216,6 +216,7 @@ MatrixQuantizerGPU<ElemType>::~MatrixQuantizerGPU()
     }
 
     // BUGBUG: we don't destroy our streams (they are static variables); we need a static destructor, I am too lazy now
+    // TODO: Check for error code and throw if !std::uncaught_exception()
     cudaEventDestroy(m_assignCompleteEvent);
     cudaEventDestroy(m_fetchCompleteEvent);
     cudaEventDestroy(m_quantizeCompleteEvent);
@@ -355,8 +356,8 @@ GPUMatrixComputeStreamEvent::GPUMatrixComputeStreamEvent(int deviceId)
 
 GPUMatrixComputeStreamEvent::~GPUMatrixComputeStreamEvent()
 {
+    // TODO: Check for error code and throw if !std::uncaught_exception()
     cudaEventDestroy(m_mainGPUComputeStreamCUDAEvent) || "cudaEventDestroy failed";
-    ;
 }
 
 void GPUMatrixComputeStreamEvent::SynchronizeEvent()

Source/Readers/BinaryReader/BinaryFile.cpp

@@ -91,6 +91,7 @@ BinaryFile::~BinaryFile()
         // the view
         iter = ReleaseView(iter, true);
     }
+    // TODO: Check for error code and throw if !std::uncaught_exception()
     CloseHandle(m_hndMapped);
 
     // if we are writing the file, truncate to actual size

Source/Readers/BinaryReader/BinaryReader.cpp

@@ -181,6 +181,7 @@ BinaryReader<ElemType>::~BinaryReader()
 
     for (size_t i = 0; i < m_fStream.size(); i++)
     {
+        // TODO: Check for error code and throw if !std::uncaught_exception()
         fclose(m_fStream[i]);
     }
 }