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

fixed parsing GPU archs in BIN(PTX) format

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-01-27 08:26:10 +00:00
parent d70d2edc9f
commit 13a6d0b92a
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/src/initialization.cpp
View File

@@ -164,33 +164,33 @@ namespace
CV_EXPORTS bool cv::gpu::hasPtxVersion(int major, int minor)
{
return ::compare(OPENCV_ARCH_PTX, major * 10 + minor, std::equal_to<int>());
return ::compare(CUDA_ARCH_PTX, major * 10 + minor, std::equal_to<int>());
}
CV_EXPORTS bool cv::gpu::hasLessOrEqualPtxVersion(int major, int minor)
{
return ::compare(OPENCV_ARCH_PTX, major * 10 + minor,
return ::compare(CUDA_ARCH_PTX, major * 10 + minor,
std::less_equal<int>());
}
CV_EXPORTS bool cv::gpu::hasGreaterOrEqualPtxVersion(int major, int minor)
{
return ::compare(OPENCV_ARCH_PTX, major * 10 + minor,
return ::compare(CUDA_ARCH_PTX, major * 10 + minor,
std::greater_equal<int>());
}
CV_EXPORTS bool cv::gpu::hasCubinVersion(int major, int minor)
{
return ::compare(OPENCV_ARCH_GPU, major * 10 + minor, std::equal_to<int>());
return ::compare(CUDA_ARCH_BIN, major * 10 + minor, std::equal_to<int>());
}
CV_EXPORTS bool cv::gpu::hasGreaterOrEqualCubinVersion(int major, int minor)
{
return ::compare(OPENCV_ARCH_GPU, major * 10 + minor,
return ::compare(CUDA_ARCH_BIN, major * 10 + minor,
std::greater_equal<int>());
}

2
modules/gpu/src/precomp.hpp
View File

@@ -85,7 +85,7 @@
#error "Insufficient NPP version, please update it."
#endif
#if defined(OPENCV_ARCH_GPU_OR_PTX_10)
#if defined(CUDA_ARCH_BIN_OR_PTX_10)
#error "OpenCV GPU module doesn't support NVIDIA compute capability 1.0"
#endif