diff options
| author | John Mcloughlin <john.mcloughlin@arm.com> | 2023-04-07 16:21:49 +0100 |
|---|---|---|
| committer | John Mcloughlin <john.mcloughlin@arm.com> | 2023-04-07 21:47:23 +0100 |
| commit | 7c4fc93651350e7aa50ac763cfcc8ffa76c74031 (patch) | |
| tree | dcf97ab6f0c3ace1dbed2d6c9f9610f200ca7ece /1.2 | |
| parent | ee5872d95455351458ad4373176360200594daa1 (diff) | |
| download | android-nn-driver-7c4fc93651350e7aa50ac763cfcc8ffa76c74031.tar.gz | |
IVGCVSW-7197 Android NN driver Opaque delegate changes
!armnn:9369
Signed-off-by: John Mcloughlin <john.mcloughlin@arm.com>
Change-Id: Ia31ef139ea78da92e324fb9428ad3cbbdb220047
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/ArmnnDriverImpl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp index 563c88e0..f0a426fa 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -146,9 +146,9 @@ Return<V1_0::ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2( // Optimize the network armnn::IOptimizedNetworkPtr optNet(nullptr, nullptr); - armnn::OptimizerOptions OptOptions; - OptOptions.m_ReduceFp32ToFp16 = float32ToFloat16; - OptOptions.m_ProfilingEnabled = options.IsGpuProfilingEnabled(); + armnn::OptimizerOptionsOpaque OptOptions; + OptOptions.SetReduceFp32ToFp16(float32ToFloat16); + OptOptions.SetProfilingEnabled(options.IsGpuProfilingEnabled()); int cachedFd = -1; bool saveCachedNetwork = options.SaveCachedNetwork(); @@ -192,8 +192,8 @@ Return<V1_0::ErrorStatus> ArmnnDriverImpl::prepareArmnnModel_1_2( { "FastMathEnabled", options.IsFastMathEnabled() }, { "NumberOfThreads", options.GetNumberOfThreads() } }); - OptOptions.m_ModelOptions.push_back(gpuAcc); - OptOptions.m_ModelOptions.push_back(cpuAcc); + OptOptions.AddModelOption(gpuAcc); + OptOptions.AddModelOption(cpuAcc); std::vector<std::string> errMessages; try @@ -553,9 +553,9 @@ Return<V1_0::ErrorStatus> ArmnnDriverImpl::prepareModelFromCache( // Optimize the network armnn::IOptimizedNetworkPtr optNet(nullptr, nullptr); - armnn::OptimizerOptions OptOptions; - OptOptions.m_ReduceFp32ToFp16 = float32ToFloat16; - OptOptions.m_ProfilingEnabled = options.IsGpuProfilingEnabled(); + armnn::OptimizerOptionsOpaque OptOptions; + OptOptions.SetReduceFp32ToFp16(float32ToFloat16); + OptOptions.SetProfilingEnabled(options.IsGpuProfilingEnabled()); armnn::BackendOptions gpuAcc("GpuAcc", { @@ -571,8 +571,8 @@ Return<V1_0::ErrorStatus> ArmnnDriverImpl::prepareModelFromCache( {"FastMathEnabled", options.IsFastMathEnabled()}, {"NumberOfThreads", options.GetNumberOfThreads()} }); - OptOptions.m_ModelOptions.push_back(gpuAcc); - OptOptions.m_ModelOptions.push_back(cpuAcc); + OptOptions.AddModelOption(gpuAcc); + OptOptions.AddModelOption(cpuAcc); std::vector<std::string> errMessages; try |