diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2019-04-09 13:10:46 +0100 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-04-15 15:29:37 +0000 |
commit | 3e68b97946bfee3c89ec2d4363a22550a10b2e55 (patch) | |
tree | d7d9be27aff46a18ac9442092d908223f435dcd7 /tests/YoloInferenceTest.hpp | |
parent | 200e38039cf2cef21ae9ba6f86fab6fd524e5077 (diff) | |
download | armnn-3e68b97946bfee3c89ec2d4363a22550a10b2e55.tar.gz |
IVGCVSW-2928 Fix issue with GPU profiling
Correctly enable GPU profiling when test profiling is enabled.
Remove extra copy of the profiling-enabled flag from InferenceModel::Params
and correctly pass around the copy that is in InferenceTestOptions.
!referencetests:180329
Change-Id: I0daa1bab2e7068fc479bf417a553183b1d922166
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Diffstat (limited to 'tests/YoloInferenceTest.hpp')
-rw-r--r-- | tests/YoloInferenceTest.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/YoloInferenceTest.hpp b/tests/YoloInferenceTest.hpp index 922bcb8582..eb6b22767b 100644 --- a/tests/YoloInferenceTest.hpp +++ b/tests/YoloInferenceTest.hpp @@ -194,14 +194,14 @@ public: Model::AddCommandLineOptions(options, m_ModelCommandLineOptions); } - virtual bool ProcessCommandLineOptions() override + virtual bool ProcessCommandLineOptions(const InferenceTestOptions &commonOptions) override { if (!ValidateDirectory(m_DataDir)) { return false; } - m_Model = m_ConstructModel(m_ModelCommandLineOptions); + m_Model = m_ConstructModel(commonOptions, m_ModelCommandLineOptions); if (!m_Model) { return false; @@ -229,7 +229,8 @@ public: private: typename Model::CommandLineOptions m_ModelCommandLineOptions; - std::function<std::unique_ptr<Model>(typename Model::CommandLineOptions)> m_ConstructModel; + std::function<std::unique_ptr<Model>(const InferenceTestOptions&, + typename Model::CommandLineOptions)> m_ConstructModel; std::unique_ptr<Model> m_Model; std::string m_DataDir; |