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

Revert "disable SVM when AMD BLAS is not available"

Browse Source 
This reverts commit d63a38e9bf.

Conflicts:
	modules/ocl/test/test_ml.cpp
This commit is contained in:
Alexander Alekhin 2013-11-05 15:13:30 +04:00
parent dd942df08b
commit 9a63508f50
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ocl/src/svm.cpp
View File

@ -686,9 +686,6 @@ float CvSVM_OCL::predict(const CvMat* samples, CV_OUT CvMat* results) const
} }
#else #else
// TODO fix it
CV_Error(CV_StsNotImplemented, "This part of code contains mistakes. Install AMD BLAS in order to get a correct result or use CPU version of SVM");
double degree1 = 0.0; double degree1 = 0.0;
if (params.kernel_type == CvSVM::POLY) if (params.kernel_type == CvSVM::POLY)
degree1 = params.degree; degree1 = params.degree;
@ -813,9 +810,6 @@ bool CvSVMSolver_ocl::solve_generic( CvSVMSolutionInfo& si )
} }
#else #else
// TODO fix it
CV_Error(CV_StsNotImplemented, "This part of code contains mistakes. Install AMD BLAS in order to get a correct result or use CPU version of SVM");
double degree1 = 0.0; double degree1 = 0.0;
if(params->kernel_type == CvSVM::POLY) if(params->kernel_type == CvSVM::POLY)
degree1 = params->degree; degree1 = params->degree;

4
modules/ocl/test/test_ml.cpp
View File

@ -126,8 +126,6 @@ OCL_TEST_P(KNN, Accuracy)
INSTANTIATE_TEST_CASE_P(OCL_ML, KNN, Combine(Values(6, 5), Values(Size(200, 400), Size(300, 600)), INSTANTIATE_TEST_CASE_P(OCL_ML, KNN, Combine(Values(6, 5), Values(Size(200, 400), Size(300, 600)),
Values(4, 3), Values(false, true))); Values(4, 3), Values(false, true)));
#ifdef HAVE_CLAMDBLAS // TODO does not work non-blas version of SVM
////////////////////////////////SVM///////////////////////////////////////////////// ////////////////////////////////SVM/////////////////////////////////////////////////
PARAM_TEST_CASE(SVM_OCL, int, int, int) PARAM_TEST_CASE(SVM_OCL, int, int, int)
@ -308,6 +306,4 @@ INSTANTIATE_TEST_CASE_P(OCL_ML, SVM_OCL, testing::Combine(
Values(2, 3, 4) Values(2, 3, 4)
)); ));
#endif // HAVE_CLAMDBLAS
#endif // HAVE_OPENCL #endif // HAVE_OPENCL