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

renamed GpuFeature into FeatureSet and updated docs

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-02-15 13:56:59 +00:00
parent 04709a2793
commit 2f8af6335e
4 changed files with 28708 additions and 28709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@@ -64,7 +64,7 @@ namespace cv
CV_EXPORTS void setDevice(int device);
CV_EXPORTS int getDevice();
enum GpuFeature
enum FeatureSet
{
FEATURE_SET_COMPUTE_10 = 10,
FEATURE_SET_COMPUTE_11 = 11,
@@ -81,7 +81,7 @@ namespace cv
class CV_EXPORTS TargetArchs
{
public:
static bool builtWith(GpuFeature feature);
static bool builtWith(FeatureSet feature_set);
static bool has(int major, int minor);
static bool hasPtx(int major, int minor);
static bool hasBin(int major, int minor);
@@ -115,7 +115,7 @@ namespace cv
size_t totalMemory() const;
// Checks whether device supports the given feature
bool supports(GpuFeature feature) const;
bool supports(FeatureSet feature_set) const;
// Checks whether the GPU module can be run on the given device
bool isCompatible() const;

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

@@ -48,6 +48,9 @@ using namespace cv::gpu;
namespace
{
// Compares value to set using the given comparator. Returns true if
// there is at least one element x in the set satisfying to: x cmp value
// predicate.
template <typename Comparer>
bool compareToSet(const std::string& set_as_str, int value, Comparer cmp)
{
@@ -69,9 +72,9 @@ namespace
}
CV_EXPORTS bool cv::gpu::TargetArchs::builtWith(cv::gpu::GpuFeature feature)
CV_EXPORTS bool cv::gpu::TargetArchs::builtWith(cv::gpu::FeatureSet feature_set)
{
return ::compareToSet(CUDA_ARCH_FEATURES, feature, std::greater_equal<int>());
return ::compareToSet(CUDA_ARCH_FEATURES, feature_set, std::greater_equal<int>());
}
@@ -128,7 +131,7 @@ CV_EXPORTS void cv::gpu::setDevice(int) { throw_nogpu(); }
CV_EXPORTS int cv::gpu::getDevice() { throw_nogpu(); return 0; }
size_t cv::gpu::DeviceInfo::freeMemory() const { throw_nogpu(); return 0; }
size_t cv::gpu::DeviceInfo::totalMemory() const { throw_nogpu(); return 0; }
bool cv::gpu::DeviceInfo::supports(cv::gpu::GpuFeature) const { throw_nogpu(); return false; }
bool cv::gpu::DeviceInfo::supports(cv::gpu::FeatureSet) const { throw_nogpu(); return false; }
bool cv::gpu::DeviceInfo::isCompatible() const { throw_nogpu(); return false; }
void cv::gpu::DeviceInfo::query() { throw_nogpu(); }
void cv::gpu::DeviceInfo::queryMemory(size_t&, size_t&) const { throw_nogpu(); }
@@ -173,10 +176,10 @@ size_t cv::gpu::DeviceInfo::totalMemory() const
}
bool cv::gpu::DeviceInfo::supports(cv::gpu::GpuFeature feature) const
bool cv::gpu::DeviceInfo::supports(cv::gpu::FeatureSet feature_set) const
{
int version = majorVersion() * 10 + minorVersion();
return version >= feature;
return version >= feature_set;
}