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

fix extra spaces in build option

Browse Source 
Signed-off-by: Li Peng <peng.li@intel.com>
This commit is contained in:
Li Peng 2018-02-01 02:09:13 +08:00
parent 54c81cbde4
commit 83b16ab7b7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/src/layers/batch_norm_layer.cpp
View File

@ -144,7 +144,7 @@ public:
UMat src = inputs[ii].reshape(1, s.size(), &s[0]);
UMat dst = outputs[ii].reshape(1, s.size(), &s[0]);
int number = (s[1] % 8 == 0) ? 8 : ((s[1] % 4 == 0) ? 4 : 1);
String buildopt = format("-DNUM=%d ", number);
String buildopt = format("-DNUM=%d", number);
String kname = format("batch_norm%d", number);
ocl::Kernel kernel(kname.c_str(), ocl::dnn::batchnorm_oclsrc, buildopt);
if (kernel.empty())

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);
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)
{
String kname = format("calc_mean%d", number);
@ -156,9 +156,9 @@ public:
}
String kname = format("mvn%d", number);
buildopt += format("%s %s %s ", (normVariance) ? "-DNORM_VARIANCE" : "",
(fuse_batch_norm) ? "-DFUSE_BATCH_NORM" : "",
(fuse_relu) ? "-DFUSE_RELU" : "");
buildopt += format("%s%s%s", (normVariance) ? " -DNORM_VARIANCE" : "",
(fuse_batch_norm) ? " -DFUSE_BATCH_NORM" : "",
(fuse_relu) ? " -DFUSE_RELU" : "");
ocl::Kernel kernel1(kname.c_str(), ocl::dnn::mvn_oclsrc, buildopt);
if (kernel1.empty())
return false;