From ab4025f8de94b0aafd139ee4f4ddbd5ceb72d16a Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Thu, 3 May 2012 10:23:23 +0000 Subject: [PATCH] fixed for Kepler --- modules/core/src/gpumat.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp index cb58f193ea..bf128fbcd1 100644 --- a/modules/core/src/gpumat.cpp +++ b/modules/core/src/gpumat.cpp @@ -320,7 +320,8 @@ namespace template void getCudaAttribute(T *attribute, CUdevice_attribute device_attribute, int device) { *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 ) return; @@ -336,7 +337,7 @@ namespace int Cores; } 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; while (gpuArchCoresPerSM[index].SM != -1) @@ -760,7 +761,7 @@ namespace 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 void set_to_gpu(DevMem2Db mat, const T* scalar, int channels, cudaStream_t stream); -- GitLab