diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-12-16 11:50:29 +0000 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2019-12-16 16:58:07 +0000 |
| commit | 14557e71d55e8d26d8c7f3e3912979b54e6e86ba (patch) | |
| tree | ce3fd2f12fce2f662f401be46ea5f958165c95cf /1.2/ArmnnDriverImpl.cpp | |
| parent | 4d3a24bc3a4900db8a647881b0b3a7a6bf387751 (diff) | |
| download | android-nn-driver-14557e71d55e8d26d8c7f3e3912979b54e6e86ba.tar.gz | |
IVGCVSW-4271 Add getSupportedOperations marker file
* Also fix segfault in previous graph dump code
Change-Id: I01915f47ae17d89ad3595430d073a17b1a1fda58
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to '1.2/ArmnnDriverImpl.cpp')
| -rw-r--r-- | 1.2/ArmnnDriverImpl.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp index 951be815..93a8b8c4 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -148,6 +148,11 @@ Return<ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime return ErrorStatus::NONE; } + // Export the optimized network graph to a dot file if an output dump directory + // has been specified in the drivers' arguments. + std::string dotGraphFileName = ExportNetworkGraphToDotFile(*optNet, + options.GetRequestInputsAndOutputsDumpDir()); + // Load it into the runtime. armnn::NetworkId netId = 0; try @@ -165,11 +170,11 @@ Return<ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2(const armnn::IRuntime return ErrorStatus::NONE; } - // 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(), - netId); + // 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<ArmnnPreparedModel_1_2<hal_1_2::HalPolicy>> preparedModel( new ArmnnPreparedModel_1_2<hal_1_2::HalPolicy>( |