Merge pull request #3215 from nouiz/cnmem

theano/sandbox/cuda/cnmem.cpp

@@ -381,6 +381,8 @@ public:
         mStream = stream; 
 #ifdef CUDA_API_PER_THREAD_DEFAULT_STREAM
         mIsStreamBlocking = false;
+#elif CUDART_VERSION < 5050
+        mIsStreamBlocking = true;
 #else
         unsigned flags = 0;
         CNMEM_CHECK_CUDA(cudaStreamGetFlags(mStream, &flags));

theano/sandbox/cuda/cnmem.h

@@ -253,7 +253,7 @@ cnmemStatus_t CNMEM_API cnmemPrintMemoryState(FILE *file, cudaStream_t stream);
 /**
  * \brief Converts a cnmemStatus_t value to a string.
  */
-const char* CNMEM_API cnmemGetErrorString(cnmemStatus_t status);
+const char CNMEM_API * cnmemGetErrorString(cnmemStatus_t status);
 
 /* ********************************************************************************************* */