mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Macro to decide using ocl method or not.

Browse Source
This commit is contained in:
Baichuan Su 2013-11-11 11:46:07 +08:00 committed by Ilya Lavrenov
parent 00300baa53
commit 2cf16db683
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
samples/cpp/bagofwords_classification.cpp
View File

@ -5,6 +5,7 @@
#include "opencv2/nonfree/nonfree.hpp" #include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/ml/ml.hpp" #include "opencv2/ml/ml.hpp"
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
#define _OCL_SVM_ 0 //select whether using ocl::svm method or not, default is not
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
#endif #endif
@ -2377,7 +2378,7 @@ static void setSVMTrainAutoParams( CvParamGrid& c_grid, CvParamGrid& gamma_grid,
degree_grid.step = 0; degree_grid.step = 0;
} }
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_SVM_
static void trainSVMClassifier( cv::ocl::CvSVM_OCL& svm, const SVMTrainParamsExt& svmParamsExt, const string& objClassName, VocData& vocData, static void trainSVMClassifier( cv::ocl::CvSVM_OCL& svm, const SVMTrainParamsExt& svmParamsExt, const string& objClassName, VocData& vocData,
Ptr<BOWImgDescriptorExtractor>& bowExtractor, const Ptr<FeatureDetector>& fdetector, Ptr<BOWImgDescriptorExtractor>& bowExtractor, const Ptr<FeatureDetector>& fdetector,
const string& resPath ) const string& resPath )
@ -2458,7 +2459,7 @@ static void trainSVMClassifier( CvSVM& svm, const SVMTrainParamsExt& svmParamsEx
} }
} }
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_SVM_
static void computeConfidences( cv::ocl::CvSVM_OCL& svm, const string& objClassName, VocData& vocData, static void computeConfidences( cv::ocl::CvSVM_OCL& svm, const string& objClassName, VocData& vocData,
Ptr<BOWImgDescriptorExtractor>& bowExtractor, const Ptr<FeatureDetector>& fdetector, Ptr<BOWImgDescriptorExtractor>& bowExtractor, const Ptr<FeatureDetector>& fdetector,
const string& resPath ) const string& resPath )
@ -2605,7 +2606,7 @@ int main(int argc, char** argv)
for( size_t classIdx = 0; classIdx < objClasses.size(); ++classIdx ) for( size_t classIdx = 0; classIdx < objClasses.size(); ++classIdx )
{ {
// Train a classifier on train dataset // Train a classifier on train dataset
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_SVM_
cv::ocl::CvSVM_OCL svm; cv::ocl::CvSVM_OCL svm;
#else #else
CvSVM svm; CvSVM svm;

8
samples/cpp/points_classifier.cpp
View File

@ -3,6 +3,8 @@
#include "opencv2/ml/ml.hpp" #include "opencv2/ml/ml.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL
#define _OCL_KNN_ 0 // select whether using ocl::KNN method or not, default is not
#define _OCL_SVM_ 0 // select whether using ocl::svm method or not, default is not
#include "opencv2/ocl/ocl.hpp" #include "opencv2/ocl/ocl.hpp"
#endif #endif
@ -137,7 +139,7 @@ static void find_decision_boundary_KNN( int K )
prepare_train_data( trainSamples, trainClasses ); prepare_train_data( trainSamples, trainClasses );
// learn classifier // learn classifier
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_KNN_
cv::ocl::KNearestNeighbour knnClassifier; cv::ocl::KNearestNeighbour knnClassifier;
Mat temp, result; Mat temp, result;
knnClassifier.train(trainSamples, trainClasses, temp, false, K); knnClassifier.train(trainSamples, trainClasses, temp, false, K);
@ -153,7 +155,7 @@ static void find_decision_boundary_KNN( int K )
{ {
testSample.at<float>(0) = (float)x; testSample.at<float>(0) = (float)x;
testSample.at<float>(1) = (float)y; testSample.at<float>(1) = (float)y;
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_KNN_
testSample_ocl.upload(testSample); testSample_ocl.upload(testSample);
knnClassifier.find_nearest(testSample_ocl, K, reslut_ocl); knnClassifier.find_nearest(testSample_ocl, K, reslut_ocl);
@ -180,7 +182,7 @@ static void find_decision_boundary_SVM( CvSVMParams params )
prepare_train_data( trainSamples, trainClasses ); prepare_train_data( trainSamples, trainClasses );
// learn classifier // learn classifier
#ifdef HAVE_OPENCV_OCL #if defined HAVE_OPENCV_OCL && _OCL_SVM_
cv::ocl::CvSVM_OCL svmClassifier(trainSamples, trainClasses, Mat(), Mat(), params); cv::ocl::CvSVM_OCL svmClassifier(trainSamples, trainClasses, Mat(), Mat(), params);
#else #else
CvSVM svmClassifier( trainSamples, trainClasses, Mat(), Mat(), params ); CvSVM svmClassifier( trainSamples, trainClasses, Mat(), Mat(), params );