fixes for gpu module:
- fixed printCudaDeviceInfo for new CC - fixed some compilation errors and warnings - removed unset command from CMake script - removed unused std imports
This commit is contained in:
@@ -45,8 +45,6 @@
|
||||
#include <vector>
|
||||
#include "NCV.hpp"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
//==============================================================================
|
||||
//
|
||||
@@ -55,16 +53,16 @@ using namespace std;
|
||||
//==============================================================================
|
||||
|
||||
|
||||
static void stdDebugOutput(const string &msg)
|
||||
static void stdDebugOutput(const std::string &msg)
|
||||
{
|
||||
cout << msg;
|
||||
std::cout << msg;
|
||||
}
|
||||
|
||||
|
||||
static NCVDebugOutputHandler *debugOutputHandler = stdDebugOutput;
|
||||
|
||||
|
||||
void ncvDebugOutput(const string &msg)
|
||||
void ncvDebugOutput(const std::string &msg)
|
||||
{
|
||||
debugOutputHandler(msg);
|
||||
}
|
||||
|
@@ -288,7 +288,7 @@ NCV_EXPORTS void ncvSetDebugOutputHandler(NCVDebugOutputHandler* func);
|
||||
do \
|
||||
{ \
|
||||
cudaError_t res = cudacall; \
|
||||
ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << res, errCode); \
|
||||
ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << (int)res, errCode); \
|
||||
} while (0)
|
||||
|
||||
|
||||
@@ -296,7 +296,7 @@ NCV_EXPORTS void ncvSetDebugOutputHandler(NCVDebugOutputHandler* func);
|
||||
do \
|
||||
{ \
|
||||
cudaError_t res = cudaGetLastError(); \
|
||||
ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << res, errCode); \
|
||||
ncvAssertPrintReturn(cudaSuccess==res, "cudaError_t=" << (int)res, errCode); \
|
||||
} while (0)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user