generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fixed SetTo tests for GPU (a problem in test code)

Browse Source 
- minor refactoring
This commit is contained in:
Anatoly Baksheev
2011-07-08 16:08:58 +00:00
parent 0b1575c485
commit e1dd41d1e2
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/gpu/test/test_main.cpp
View File

@@ -46,50 +46,49 @@
void print_info() void print_info()
{ {
printf("\n");
#if defined _WIN32 #if defined _WIN32
# if defined _WIN64 # if defined _WIN64
puts("OS: Windows 64\n"); puts("OS: Windows 64");
# else # else
puts("OS: Windows 32\n"); puts("OS: Windows 32");
# endif # endif
#elif defined linux #elif defined linux
# if defined _LP64 # if defined _LP64
puts("OS: Linux 64\n"); puts("OS: Linux 64");
# else # else
puts("OS: Linux 32\n"); puts("OS: Linux 32");
# endif # endif
#elif defined __APPLE__ #elif defined __APPLE__
# if defined _LP64 # if defined _LP64
puts("OS: Apple 64\n"); puts("OS: Apple 64");
# else # else
puts("OS: Apple 32\n"); puts("OS: Apple 32");
# endif # endif
#endif #endif
printf("CUDA version: %d\n\n", CUDART_VERSION);
int deviceCount = cv::gpu::getCudaEnabledDeviceCount(); int deviceCount = cv::gpu::getCudaEnabledDeviceCount();
printf("CUDA version: %d\n", CUDART_VERSION);
printf("Found %d CUDA devices\n\n", deviceCount); printf("CUDA device count: %d\n\n", deviceCount);
for (int i = 0; i < deviceCount; ++i) for (int i = 0; i < deviceCount; ++i)
{ {
cv::gpu::DeviceInfo info(i); cv::gpu::DeviceInfo info(i);
printf("Device %d:\n", i); printf("Device %d:\n", i);
printf("\tName: %s\n", info.name().c_str()); printf(" Name: %s\n", info.name().c_str());
printf("\tCompute capability version: %d.%d\n", info.majorVersion(), info.minorVersion()); printf(" Compute capability version: %d.%d\n", info.majorVersion(), info.minorVersion());
printf("\tTotal memory: %d Mb\n", static_cast<int>(static_cast<int>(info.totalMemory() / 1024.0) / 1024.0)); printf(" Total memory: %d Mb\n", static_cast<int>(static_cast<int>(info.totalMemory() / 1024.0) / 1024.0));
printf("\tFree memory: %d Mb\n", static_cast<int>(static_cast<int>(info.freeMemory() / 1024.0) / 1024.0)); printf(" Free memory: %d Mb\n", static_cast<int>(static_cast<int>(info.freeMemory() / 1024.0) / 1024.0));
if (info.isCompatible()) if (info.isCompatible())
puts("\tThis device is compatible with current GPU module build\n"); puts(" This device is compatible with current GPU module build\n");
else else
puts("\tThis device is NOT compatible with current GPU module build\n"); puts(" This device is NOT compatible with current GPU module build\n");
} }
puts("GPU module was compiled for next GPU archs:"); puts("GPU module was compiled for the following GPU archs:");
printf("\tBIN:%s\n", CUDA_ARCH_BIN); printf(" BIN: %s\n", CUDA_ARCH_BIN);
printf("\tPTX:%s\n\n", CUDA_ARCH_PTX); printf(" PTX: %s\n\n", CUDA_ARCH_PTX);
} }
enum OutputLevel enum OutputLevel

6
modules/gpu/test/test_matop.cpp
View File

@@ -337,9 +337,11 @@ TEST_P(SetTo, Masked)
static cv::Scalar s = cv::Scalar(1, 2, 3, 4); static cv::Scalar s = cv::Scalar(1, 2, 3, 4);
cv::Mat mat;
cv::RNG& rng = cvtest::TS::ptr()->get_rng(); cv::RNG& rng = cvtest::TS::ptr()->get_rng();
cv::Mat mask = cvtest::randomMat(rng, mat.size(), CV_8UC1, 0.0, 1.5, false); cv::Mat mask = cvtest::randomMat(rng, mat_gold.size(), CV_8UC1, 0.0, 1.5, false);
cv::Mat mat;
ASSERT_NO_THROW( ASSERT_NO_THROW(
cv::gpu::GpuMat dev_mat(mat_gold); cv::gpu::GpuMat dev_mat(mat_gold);