提交 58944771 authored 作者: Julien Demouth's avatar Julien Demouth 提交者: Frederic

Integrate the latest version of CNMEM

This version comes with two fixes. 1/ Fix a warning due to the visibility attribute needed by Theano. We changed const char* CNMEM_API to const char CNMEM_API* in the declaration of cnmemGetErrorString to have the attribute between char and star. It fixes the warning. 2/ Fix a compilation issue with CUDA 5.0 due to the missing cudaStreamGetFlags function. It is #defined out when the Runtime is less than 5.5 (5050 version).
上级 2dfec943
...@@ -381,6 +381,8 @@ public: ...@@ -381,6 +381,8 @@ public:
mStream = stream; mStream = stream;
#ifdef CUDA_API_PER_THREAD_DEFAULT_STREAM #ifdef CUDA_API_PER_THREAD_DEFAULT_STREAM
mIsStreamBlocking = false; mIsStreamBlocking = false;
#elif CUDART_VERSION < 5050
mIsStreamBlocking = true;
#else #else
unsigned flags = 0; unsigned flags = 0;
CNMEM_CHECK_CUDA(cudaStreamGetFlags(mStream, &flags)); CNMEM_CHECK_CUDA(cudaStreamGetFlags(mStream, &flags));
......
...@@ -253,7 +253,7 @@ cnmemStatus_t CNMEM_API cnmemPrintMemoryState(FILE *file, cudaStream_t stream); ...@@ -253,7 +253,7 @@ cnmemStatus_t CNMEM_API cnmemPrintMemoryState(FILE *file, cudaStream_t stream);
/** /**
* \brief Converts a cnmemStatus_t value to a string. * \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);
/* ********************************************************************************************* */ /* ********************************************************************************************* */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论