From d63a38e9bfad4081ec8107e8d38e03c03f6548d2 Mon Sep 17 00:00:00 2001 From: ilya-lavrenov Date: Fri, 11 Oct 2013 15:15:57 +0400 Subject: [PATCH] disable SVM when AMD BLAS is not available --- modules/ocl/src/svm.cpp | 6 ++++++ modules/ocl/test/test_ml.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/ocl/src/svm.cpp b/modules/ocl/src/svm.cpp index 1cb341239e..ca81128ed7 100644 --- a/modules/ocl/src/svm.cpp +++ b/modules/ocl/src/svm.cpp @@ -686,6 +686,9 @@ 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; @@ -810,6 +813,9 @@ 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 52d40bb11c..8fbb088b4c 100644 --- a/modules/ocl/test/test_ml.cpp +++ b/modules/ocl/test/test_ml.cpp @@ -126,6 +126,8 @@ 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))); +#ifndef HAVE_CLAMDBLAS // TODO does not work non-blas version of SVM + ////////////////////////////////SVM///////////////////////////////////////////////// PARAM_TEST_CASE(SVM_OCL, int, int, int) @@ -306,4 +308,6 @@ INSTANTIATE_TEST_CASE_P(OCL_ML, SVM_OCL, testing::Combine( Values(2, 3, 4) )); +#endif // HAVE_CLAMDBLAS + #endif // HAVE_OPENCL