potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9829 from pengli:ocl4dnn

Browse Source
This commit is contained in:
Alexander Alekhin
2017-10-12 11:26:20 +00:00
parent f1fe873375 937b8e4277
commit df5b2224d7
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/layers/softmax_layer.cpp
+2 -1
View File
@@ -100,6 +100,7 @@ public:
config.in_shape = shape(*inputs[0]);
config.axis = axisRaw;
config.channels = inputs[0]->size[axisRaw];
config.logsoftmax = logSoftMax;
softmaxOp = Ptr<OCL4DNNSoftmax<float> >(new OCL4DNNSoftmax<float>(config));
}
@@ -108,7 +109,7 @@ public:
srcMat = inputs[0]->getUMat(ACCESS_READ);
dstMat = outputs[0].getUMat(ACCESS_WRITE);
if (!logSoftMax && softmaxOp->Forward(srcMat, dstMat))
if (softmaxOp->Forward(srcMat, dstMat))
return true;
const Mat &src = *inputs[0];