diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/DebugCallbackTest.cpp | 4 | ||||
-rw-r--r-- | src/armnn/test/EndToEndTest.cpp | 4 | ||||
-rw-r--r-- | src/armnn/test/FlowControl.cpp | 4 | ||||
-rw-r--r-- | src/armnn/test/RuntimeTests.cpp | 26 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/armnn/test/DebugCallbackTest.cpp b/src/armnn/test/DebugCallbackTest.cpp index 600447c53a..e5e79304be 100644 --- a/src/armnn/test/DebugCallbackTest.cpp +++ b/src/armnn/test/DebugCallbackTest.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -47,7 +47,7 @@ TEST_CASE("RuntimeRegisterDebugCallback") IRuntimePtr runtime(IRuntime::Create(options)); // Optimize the network with debug option - OptimizerOptions optimizerOptions(false, true); + OptimizerOptionsOpaque optimizerOptions(false, true); std::vector<BackendId> backends = { "CpuRef" }; IOptimizedNetworkPtr optNet = Optimize(*net, backends, runtime->GetDeviceSpec(), optimizerOptions); diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp index 8a64a4b75f..17e46667ef 100644 --- a/src/armnn/test/EndToEndTest.cpp +++ b/src/armnn/test/EndToEndTest.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -46,7 +46,7 @@ TEST_CASE("ErrorOnLoadNetwork") try { - Optimize(*net, backends, runtime->GetDeviceSpec(), OptimizerOptions(), errMessages); + Optimize(*net, backends, runtime->GetDeviceSpec(), OptimizerOptionsOpaque(), errMessages); FAIL("Should have thrown an exception."); } catch (const InvalidArgumentException&) diff --git a/src/armnn/test/FlowControl.cpp b/src/armnn/test/FlowControl.cpp index cdd86c06e4..563968a415 100644 --- a/src/armnn/test/FlowControl.cpp +++ b/src/armnn/test/FlowControl.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017, 2023 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // @@ -55,7 +55,7 @@ TEST_CASE("ErrorOnLoadNetwork") try { - Optimize(*net, backends, runtime->GetDeviceSpec(), OptimizerOptions(), errMessages); + Optimize(*net, backends, runtime->GetDeviceSpec(), OptimizerOptionsOpaque(), errMessages); FAIL("Should have thrown an exception."); } catch (const InvalidArgumentException&) diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index 427352aaac..67684448bb 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -543,7 +543,7 @@ TEST_CASE("IVGCVSW_1929_QuantizedSoftmaxIssue") armnn::IOptimizedNetworkPtr optNet = Optimize(*net, backends, runtime->GetDeviceSpec(), - OptimizerOptions(), + OptimizerOptionsOpaque(), errMessages); FAIL("An exception should have been thrown"); } @@ -1327,10 +1327,10 @@ TEST_CASE("RuntimeOptimizeImportOff_LoadNetworkImportOn") std::vector<armnn::BackendId> backends = {armnn::Compute::CpuRef}; - OptimizerOptions optimizedOptions; + OptimizerOptionsOpaque optimizedOptions; // Hard set import and export to off. - optimizedOptions.m_ImportEnabled = false; - optimizedOptions.m_ExportEnabled = false; + optimizedOptions.SetImportEnabled(false); + optimizedOptions.SetExportEnabled(false); IOptimizedNetworkPtr optNet = Optimize(*testNetwork, backends, runtime->GetDeviceSpec(), optimizedOptions); CHECK(optNet); @@ -1372,10 +1372,10 @@ TEST_CASE("RuntimeOptimizeExportOff_LoadNetworkExportOn") std::vector<armnn::BackendId> backends = {armnn::Compute::CpuRef}; - OptimizerOptions optimizedOptions; + OptimizerOptionsOpaque optimizedOptions; // Hard set import and export to off. - optimizedOptions.m_ImportEnabled = false; - optimizedOptions.m_ExportEnabled = false; + optimizedOptions.SetImportEnabled(false); + optimizedOptions.SetExportEnabled(false); IOptimizedNetworkPtr optNet = Optimize(*testNetwork, backends, runtime->GetDeviceSpec(), optimizedOptions); CHECK(optNet); @@ -1417,10 +1417,10 @@ TEST_CASE("RuntimeOptimizeImportOn_LoadNetworkImportOff") std::vector<armnn::BackendId> backends = {armnn::Compute::CpuRef}; - OptimizerOptions optimizedOptions; + OptimizerOptionsOpaque optimizedOptions; // Hard set import and export to off. - optimizedOptions.m_ImportEnabled = true; - optimizedOptions.m_ExportEnabled = false; + optimizedOptions.SetImportEnabled(true); + optimizedOptions.SetExportEnabled(false); IOptimizedNetworkPtr optNet = Optimize(*testNetwork, backends, runtime->GetDeviceSpec(), optimizedOptions); CHECK(optNet); @@ -1462,10 +1462,10 @@ TEST_CASE("RuntimeOptimizeExportOn_LoadNetworkExportOff") std::vector<armnn::BackendId> backends = {armnn::Compute::CpuRef}; - OptimizerOptions optimizedOptions; + OptimizerOptionsOpaque optimizedOptions; // Hard set import and export to off. - optimizedOptions.m_ImportEnabled = false; - optimizedOptions.m_ExportEnabled = true; + optimizedOptions.SetImportEnabled(false); + optimizedOptions.SetExportEnabled(true); IOptimizedNetworkPtr optNet = Optimize(*testNetwork, backends, runtime->GetDeviceSpec(), optimizedOptions); CHECK(optNet); |