projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnn(ocl4dnn): support log softmax in ocl4dnn
[platform/upstream/opencv.git]
/
modules
/
dnn
/
src
/
ocl4dnn
/
src
/
ocl4dnn_softmax.cpp
diff --git
a/modules/dnn/src/ocl4dnn/src/ocl4dnn_softmax.cpp
b/modules/dnn/src/ocl4dnn/src/ocl4dnn_softmax.cpp
index
e4802d2
..
9ac5ddc
100644
(file)
--- a/
modules/dnn/src/ocl4dnn/src/ocl4dnn_softmax.cpp
+++ b/
modules/dnn/src/ocl4dnn/src/ocl4dnn_softmax.cpp
@@
-52,6
+52,7
@@
OCL4DNNSoftmax<Dtype>::OCL4DNNSoftmax(OCL4DNNSoftmaxConfig config)
{
softmax_axis_ = config.axis;
channels_ = config.channels;
{
softmax_axis_ = config.axis;
channels_ = config.channels;
+ log_softmax_ = config.logsoftmax;
inner_num_ = 1;
outer_num_ = 1;
inner_num_ = 1;
outer_num_ = 1;
@@
-90,6
+91,7
@@
bool OCL4DNNSoftmax<Dtype>::Forward(const UMat& bottom, UMat& top)
String kname;
ocl::Kernel oclk_softmax_forward_kernel;
String kname;
ocl::Kernel oclk_softmax_forward_kernel;
+ if (log_softmax_) opts += " -DLOG_SOFTMAX ";
if (use_slm_)
kname = CL_KERNEL_SELECT("softmax_forward_slm");
else
if (use_slm_)
kname = CL_KERNEL_SELECT("softmax_forward_slm");
else