mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dnn(ocl): fix build options for Apple OpenCL

Browse Source
This commit is contained in:
Alexander Alekhin 2018-01-28 01:54:25 +00:00
parent f1c52e426b
commit 2876670de3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/dnn/src/layers/mvn_layer.cpp
View File

@ -132,7 +132,7 @@ public:
int number = (s[1] % 8 == 0) ? 8 : ((s[1] % 4 == 0) ? 4 : 1); int number = (s[1] % 8 == 0) ? 8 : ((s[1] % 4 == 0) ? 4 : 1);
size_t global[] = { (size_t)s[0], (size_t)(s[1] / number) }; size_t global[] = { (size_t)s[0], (size_t)(s[1] / number) };
String buildopt = format("-DNUM=%d ", number); String buildopt = format("-DNUM=%d", number);
if (normVariance) if (normVariance)
{ {
String kname = format("calc_mean%d", number); String kname = format("calc_mean%d", number);
@ -156,9 +156,9 @@ public:
} }
String kname = format("mvn%d", number); String kname = format("mvn%d", number);
buildopt += format("%s %s %s ", (normVariance) ? "-DNORM_VARIANCE" : "", buildopt += format("%s%s%s", (normVariance) ? " -DNORM_VARIANCE" : "",
(fuse_batch_norm) ? "-DFUSE_BATCH_NORM" : "", (fuse_batch_norm) ? " -DFUSE_BATCH_NORM" : "",
(fuse_relu) ? "-DFUSE_RELU" : ""); (fuse_relu) ? " -DFUSE_RELU" : "");
ocl::Kernel kernel1(kname.c_str(), ocl::dnn::mvn_oclsrc, buildopt); ocl::Kernel kernel1(kname.c_str(), ocl::dnn::mvn_oclsrc, buildopt);
if (kernel1.empty()) if (kernel1.empty())
return false; return false;