From 7c4fc93651350e7aa50ac763cfcc8ffa76c74031 Mon Sep 17 00:00:00 2001 From: John Mcloughlin Date: Fri, 7 Apr 2023 16:21:49 +0100 Subject: IVGCVSW-7197 Android NN driver Opaque delegate changes !armnn:9369 Signed-off-by: John Mcloughlin Change-Id: Ia31ef139ea78da92e324fb9428ad3cbbdb220047 --- 1.2/ArmnnDriverImpl.cpp | 22 +++++++++++----------- 1.3/ArmnnDriverImpl.cpp | 22 +++++++++++----------- ArmnnDriverImpl.cpp | 10 +++++----- 3 files changed, 27 insertions(+), 27 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 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 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 errMessages; try @@ -553,9 +553,9 @@ Return 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 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 errMessages; try diff --git a/1.3/ArmnnDriverImpl.cpp b/1.3/ArmnnDriverImpl.cpp index c164dc08..ec176d59 100644 --- a/1.3/ArmnnDriverImpl.cpp +++ b/1.3/ArmnnDriverImpl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020, 2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -158,9 +158,9 @@ Return ArmnnDriverImpl::prepareArmnnModel_1_3( // 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(); @@ -205,8 +205,8 @@ Return ArmnnDriverImpl::prepareArmnnModel_1_3( { "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 errMessages; try @@ -569,9 +569,9 @@ Return ArmnnDriverImpl::prepareModelFromCache_1_3( // Optimize the network armnn::IOptimizedNetworkPtr optNet(nullptr, nullptr); - armnn::OptimizerOptions OptOptions; - OptOptions.m_ReduceFp32ToFp16 = options.GetFp16Enabled(); - OptOptions.m_ProfilingEnabled = options.IsGpuProfilingEnabled(); + armnn::OptimizerOptionsOpaque OptOptions; + OptOptions.SetReduceFp32ToFp16(options.GetFp16Enabled()); + OptOptions.SetProfilingEnabled(options.IsGpuProfilingEnabled()); armnn::BackendOptions gpuAcc("GpuAcc", { @@ -587,8 +587,8 @@ Return ArmnnDriverImpl::prepareModelFromCache_1_3( {"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 errMessages; try diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp index 927c6bdd..dd60cc7b 100644 --- a/ArmnnDriverImpl.cpp +++ b/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 // @@ -114,8 +114,8 @@ Return ArmnnDriverImpl::prepareModel( // Optimize the network armnn::IOptimizedNetworkPtr optNet(nullptr, nullptr); - armnn::OptimizerOptions OptOptions; - OptOptions.m_ReduceFp32ToFp16 = float32ToFloat16; + armnn::OptimizerOptionsOpaque OptOptions; + OptOptions.SetReduceFp32ToFp16(float32ToFloat16); armnn::BackendOptions gpuAcc("GpuAcc", { @@ -131,8 +131,8 @@ Return ArmnnDriverImpl::prepareModel( { "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 errMessages; try -- cgit v1.2.1