Merge pull request #10959 from alalek:cmake_ocl4dnn
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Mar 2018 10:26:14 +0000 (10:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Mar 2018 10:26:14 +0000 (10:26 +0000)
commit514f4193dbdd3b51ad4d16581670d9148fda544f
treef97773c7ceb893f97ad610389ba982b79fe74ab3
parent49dd0305f2b9c69704905e2d67bcbca9c63b0c7d
parenta9ebc61f2a8b4500e22d96fa8577bf3ad192004d
Merge pull request #10959 from alalek:cmake_ocl4dnn
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/ocl4dnn/include/common.hpp
modules/dnn/src/ocl4dnn/include/math_functions.hpp
modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp