From 829ad30a4f13bc0b9cb32bab5a4efeeeab541f76 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Fri, 13 Dec 2019 14:43:24 +0000 Subject: IVGCVSW-4270 Change .dot file name to start with netId * .dot file will start with the same number as the associated input and output tensor dump files Change-Id: Ic64539854c2b8c34a7034fa18a142b2dfe67df7d Signed-off-by: Jim Flynn IVGCVSW-4271 Add getSupportedOperations marker file * Also fix segfault in previous graph dump code Change-Id: I01915f47ae17d89ad3595430d073a17b1a1fda58 Signed-off-by: Jim Flynn --- 1.2/ArmnnDriver.hpp | 2 +- 1.2/ArmnnDriverImpl.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to '1.2') diff --git a/1.2/ArmnnDriver.hpp b/1.2/ArmnnDriver.hpp index 40116c8a..177cab63 100644 --- a/1.2/ArmnnDriver.hpp +++ b/1.2/ArmnnDriver.hpp @@ -119,7 +119,7 @@ public: Return getVersionString(getVersionString_cb cb) { - ALOGV("hal_1_2::ArmnnDriver::getSupportedOperations()"); + ALOGV("hal_1_2::ArmnnDriver::getVersionString()"); cb(ErrorStatus::NONE, "ArmNN"); return Void(); diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp index d369aa27..691156fa 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -161,8 +161,8 @@ Return ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime // Export the optimized network graph to a dot file if an output dump directory // has been specified in the drivers' arguments. - ExportNetworkGraphToDotFile(*optNet, options.GetRequestInputsAndOutputsDumpDir(), - model); + std::string dotGraphFileName = ExportNetworkGraphToDotFile(*optNet, + options.GetRequestInputsAndOutputsDumpDir()); // Load it into the runtime. armnn::NetworkId netId = 0; @@ -181,6 +181,12 @@ Return ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime return ErrorStatus::NONE; } + // Now that we have a networkId for the graph rename the dump file to use it + // so that we can associate the graph file and the input/output tensor dump files + RenameGraphDotFile(dotGraphFileName, + options.GetRequestInputsAndOutputsDumpDir(), + netId); + std::unique_ptr> preparedModel( new ArmnnPreparedModel_1_2( netId, -- cgit v1.2.1