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-18 10:03:43 +0000 |
| commit | d2697984e7d7989f5a8154c46a1bf37d98479415 (patch) | |
| tree | b66502b18ef6e0723b5021ab86be55ffea75c15a /1.2 | |
| parent | dbbcc3948190d874d80f1f095fcbda65d693519d (diff) | |
| download | android-nn-driver-d2697984e7d7989f5a8154c46a1bf37d98479415.tar.gz | |
IVGCVSW-4271 Add getSupportedOperations marker file
* Also fix segfault in previous graph dump code
* Cherry picked from 19.08 (https://jira.arm.com/browse/IVGCVSW-4297)
Change-Id: Id4f2e89f5126b7962b4439370e6dd3edcee96f51
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/ArmnnDriver.hpp | 2 | ||||
| -rw-r--r-- | 1.2/ArmnnDriverImpl.cpp | 10 |
2 files changed, 9 insertions, 3 deletions
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<void> 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 dfb77c36..136228fd 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -161,8 +161,8 @@ Return<ErrorStatus> 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<hal_1_2::HalPolicy::Model>(*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<ErrorStatus> 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<ArmnnPreparedModel_1_2<hal_1_2::HalPolicy>> preparedModel( new ArmnnPreparedModel_1_2<hal_1_2::HalPolicy>( netId, |