Merge pull request #10143 from pengli:ocl4dnn
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 23 Nov 2017 18:47:14 +0000 (18:47 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 23 Nov 2017 18:47:14 +0000 (18:47 +0000)
commitf071a48ec76f2e1d19583c75b9421f3239c56fa9
treeb7c49c1c6a00eee540d9bd447d9c4cdc08b1e6f8
parenta1479cc2c18cd9c8211d96c7c360f323c0113edf
parent636d6368ee254708dd0f1ec00b84c2173862d8fd
Merge pull request #10143 from pengli:ocl4dnn
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/opencl/conv_layer_spatial.cl