Skip to content

O
opencv
Commit be9767e0 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Merge pull request #9919 from alalek:ocl_fix_macosx_invalid_options

parents ab5e09e4 734ea77c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/src/matmul.cpp
View file @ be9767e0
...@@ -845,11 +845,11 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha, ...@@ -845,11 +845,11 @@ static bool ocl_gemm( InputArray matA, InputArray matB, double alpha,
int vectorWidths[] = { 4, 4, 2, 2, 1, 4, cn, -1 }; int vectorWidths[] = { 4, 4, 2, 2, 1, 4, cn, -1 };
int kercn = ocl::checkOptimalVectorWidth(vectorWidths, B, D); int kercn = ocl::checkOptimalVectorWidth(vectorWidths, B, D);
opts += format(" -D T=%s -D T1=%s -D WT=%s -D cn=%d -D kercn=%d -D LOCAL_SIZE=%d %s %s %s", opts += format(" -D T=%s -D T1=%s -D WT=%s -D cn=%d -D kercn=%d -D LOCAL_SIZE=%d%s%s%s",
ocl::typeToStr(type), ocl::typeToStr(depth), ocl::typeToStr(CV_MAKETYPE(depth, kercn)), ocl::typeToStr(type), ocl::typeToStr(depth), ocl::typeToStr(CV_MAKETYPE(depth, kercn)),
cn, kercn, block_size, cn, kercn, block_size,
(sizeA.width % block_size !=0) ? "-D NO_MULT" : "", (sizeA.width % block_size !=0) ? " -D NO_MULT" : "",
haveC ? "-D HAVE_C" : "", haveC ? " -D HAVE_C" : "",
doubleSupport ? " -D DOUBLE_SUPPORT" : ""); doubleSupport ? " -D DOUBLE_SUPPORT" : "");
ocl::Kernel k("gemm", cv::ocl::core::gemm_oclsrc, opts); ocl::Kernel k("gemm", cv::ocl::core::gemm_oclsrc, opts);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment