Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 11 Sep 2021 16:32:13 +0000 (16:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 11 Sep 2021 21:27:26 +0000 (21:27 +0000)
commitc3ac834526c66840835737f03ed1b4d8f711534e
tree2eebb4c7e6ebf352c0dd0b279ba5e28dc994b7d7
parentc7e0888982a4d95b17ed46c7f8c4f1b3c3d81a95
parentf605373a2bbb3685635197fbc1501db471e47ddb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
18 files changed:
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/include/opencv2/core/ocl.hpp
modules/core/src/matmul.dispatch.cpp
modules/core/src/ocl.cpp
modules/dnn/src/layers/batch_norm_layer.cpp
modules/dnn/src/layers/elementwise_layers.cpp
modules/dnn/src/layers/mvn_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/python/src2/hdr_parser.py
platforms/winpack_dldt/build_package.py