Commit ab4025f8 authored by Anatoly Baksheev's avatar Anatoly Baksheev

fixed for Kepler

parent ea3fe441
...@@ -320,7 +320,8 @@ namespace ...@@ -320,7 +320,8 @@ namespace
template <class T> void getCudaAttribute(T *attribute, CUdevice_attribute device_attribute, int device) template <class T> void getCudaAttribute(T *attribute, CUdevice_attribute device_attribute, int device)
{ {
*attribute = T(); *attribute = T();
CUresult error = CUDA_SUCCESS;// = cuDeviceGetAttribute( attribute, device_attribute, device ); why link erros under ubuntu?? //CUresult error = CUDA_SUCCESS;// = cuDeviceGetAttribute( attribute, device_attribute, device ); why link erros under ubuntu??
CUresult error = cuDeviceGetAttribute( attribute, device_attribute, device );
if( CUDA_SUCCESS == error ) if( CUDA_SUCCESS == error )
return; return;
...@@ -336,7 +337,7 @@ namespace ...@@ -336,7 +337,7 @@ namespace
int Cores; int Cores;
} SMtoCores; } SMtoCores;
SMtoCores gpuArchCoresPerSM[] = { { 0x10, 8 }, { 0x11, 8 }, { 0x12, 8 }, { 0x13, 8 }, { 0x20, 32 }, { 0x21, 48 }, { -1, -1 } }; SMtoCores gpuArchCoresPerSM[] = { { 0x10, 8 }, { 0x11, 8 }, { 0x12, 8 }, { 0x13, 8 }, { 0x20, 32 }, { 0x21, 48 }, {0x30, 192}, { -1, -1 } };
int index = 0; int index = 0;
while (gpuArchCoresPerSM[index].SM != -1) while (gpuArchCoresPerSM[index].SM != -1)
...@@ -760,7 +761,7 @@ namespace ...@@ -760,7 +761,7 @@ namespace
namespace cv { namespace gpu { namespace device namespace cv { namespace gpu { namespace device
{ {
void copyToWithMask_gpu(DevMem2Db src, DevMem2Db dst, int elemSize1, int cn, DevMem2Db mask, bool colorMask, cudaStream_t stream); void copyToWithMask_gpu(DevMem2Db src, DevMem2Db dst, size_t elemSize1, int cn, DevMem2Db mask, bool colorMask, cudaStream_t stream);
template <typename T> template <typename T>
void set_to_gpu(DevMem2Db mat, const T* scalar, int channels, cudaStream_t stream); void set_to_gpu(DevMem2Db mat, const T* scalar, int channels, cudaStream_t stream);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment