From 9a63508f5029938ec7bc8051d2a939216360c415 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 5 Nov 2013 15:13:30 +0400 Subject: [PATCH] Revert "disable SVM when AMD BLAS is not available" This reverts commit d63a38e9bfad4081ec8107e8d38e03c03f6548d2. Conflicts: modules/ocl/test/test_ml.cpp --- modules/ocl/src/svm.cpp | 6 ------ modules/ocl/test/test_ml.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/modules/ocl/src/svm.cpp b/modules/ocl/src/svm.cpp index a71047c58a..40b3d981d3 100644 --- a/modules/ocl/src/svm.cpp +++ b/modules/ocl/src/svm.cpp @@ -686,9 +686,6 @@ float CvSVM_OCL::predict(const CvMat* samples, CV_OUT CvMat* results) const } #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; if (params.kernel_type == CvSVM::POLY) degree1 = params.degree; @@ -813,9 +810,6 @@ bool CvSVMSolver_ocl::solve_generic( CvSVMSolutionInfo& si ) } #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; if(params->kernel_type == CvSVM::POLY) degree1 = params->degree; diff --git a/modules/ocl/test/test_ml.cpp b/modules/ocl/test/test_ml.cpp index a064070890..00f9fa9410 100644 --- a/modules/ocl/test/test_ml.cpp +++ b/modules/ocl/test/test_ml.cpp @@ -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)), Values(4, 3), Values(false, true))); -#ifdef HAVE_CLAMDBLAS // TODO does not work non-blas version of SVM - ////////////////////////////////SVM///////////////////////////////////////////////// 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) )); -#endif // HAVE_CLAMDBLAS - #endif // HAVE_OPENCL