Merge pull request #16088 from alalek:dnn_eltwise_layer_different_src_channels
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 11 Dec 2019 17:16:58 +0000 (20:16 +0300)
committerGitHub <noreply@github.com>
Wed, 11 Dec 2019 17:16:58 +0000 (20:16 +0300)
commit5ee7abbe3c279a1b4f260b641fd2aeac322819cb
treef656a1c211906b0d66be38a1a44d8deaee825ff8
parentf2cce5fd8c3a37083658e4eb4146e80e25793861
Merge pull request #16088 from alalek:dnn_eltwise_layer_different_src_channels

dnn(eltwise): fix handling of different number of channels

* dnn(test): reproducer for Eltwise layer issue from PR16063

* dnn(eltwise): rework support for inputs with different channels

* dnn(eltwise): get rid of finalize(), variableChannels

* dnn(eltwise): update input sorting by number of channels

- do not swap inputs if number of channels are same after truncation

* dnn(test): skip "shortcut" with batch size 2 on MYRIAD targets
modules/dnn/CMakeLists.txt
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/src/darknet/darknet_io.cpp
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_layers.cpp
modules/ts/src/ts_func.cpp