Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 14 Jan 2020 14:04:22 +0000 (17:04 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 14 Jan 2020 14:04:22 +0000 (17:04 +0300)
commit4cb9faf6c9c012d603217bc09313d325bb9fb04a
treeea808beb2a09f80176a9d0864d60d812a3685c89
parent55f2370f36367e7f253f1a896c16ab9c6bcef949
parenta67228cd7341ab0739a8c10e2d551236cd73724b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
21 files changed:
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/concat_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/test/test_backends.cpp
modules/dnn/test/test_caffe_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_halide_layers.cpp
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/dnn/test/test_torch_importer.cpp
modules/python/src2/cv2.cpp
modules/python/src2/gen2.py
samples/python/digits_video.py