IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IE] Improve Network topological sort in case of disconnected graph

Browse Source 
Signed-off-by: Alexander Peskov <alexander.peskov@intel.com>
This commit is contained in:
Alexander Peskov 2020-10-29 01:37:20 +03:00
parent ec1561a234
commit 05651b18af
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
inference-engine/src/legacy_api/include/legacy/graph_tools.hpp
View File

@ -371,19 +371,42 @@ inline CNNLayerSet CNNNetGetAllInputLayers(const ICNNNetwork& network) {
InputsDataMap inputs;
network.getInputsInfo(inputs);
OutputsDataMap outputs;
network.getOutputsInfo(outputs);
std::vector<DataPtr> entryDataSet;
entryDataSet.reserve(inputs.size() + outputs.size());
for (const auto &kvp : inputs)
entryDataSet.push_back(kvp.second->getInputData());
for (const auto &kvp : outputs)
entryDataSet.push_back(kvp.second);
CNNLayerSet inputLayers;
std::unordered_set<CNNLayer*> allLayers;
if (inputs.empty()) return inputLayers;
if (entryDataSet.empty()) return inputLayers;
for (const auto& input : inputs) {
auto& secondLayers = getInputTo(input.second->getInputData());
// define any layer connected to provided Data object (consumer or creator)
auto findConnectedLayer = [] (const DataPtr& data) -> CNNLayerPtr {
auto consumerLayers = getInputTo(data);
if (!consumerLayers.empty())
return consumerLayers.begin()->second;
if (secondLayers.empty()) continue;
auto creator = getCreatorLayer(data).lock();
if (creator != nullptr)
return creator;
return nullptr;
};
for (const auto& data : entryDataSet) {
auto entryLayer = findConnectedLayer(data);
if (entryLayer == nullptr) continue;
details::UnorderedDFS(
allLayers, secondLayers.begin()->second,
[&](CNNLayerPtr layer) {
allLayers, entryLayer,
[&inputLayers](const CNNLayerPtr& layer) {
if (layer->insData.empty()) {
inputLayers.insert(layer);
}