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>
diff --git a/tests/InferenceTest.hpp b/tests/InferenceTest.hpp
index 91a65ea..3ebfdbc 100644
--- a/tests/InferenceTest.hpp
+++ b/tests/InferenceTest.hpp
@@ -91,7 +91,7 @@
virtual ~IInferenceTestCaseProvider() {}
virtual void AddCommandLineOptions(boost::program_options::options_description& options) {};
- virtual bool ProcessCommandLineOptions() { return true; };
+ virtual bool ProcessCommandLineOptions(const InferenceTestOptions &commonOptions) { return true; };
virtual std::unique_ptr<IInferenceTestCase> GetTestCase(unsigned int testCaseId) = 0;
virtual bool OnInferenceTestFinished() { return true; };
};
@@ -219,7 +219,7 @@
ClassifierTestCaseProvider(TConstructDatabaseCallable constructDatabase, TConstructModelCallable constructModel);
virtual void AddCommandLineOptions(boost::program_options::options_description& options) override;
- virtual bool ProcessCommandLineOptions() override;
+ virtual bool ProcessCommandLineOptions(const InferenceTestOptions &commonOptions) override;
virtual std::unique_ptr<IInferenceTestCase> GetTestCase(unsigned int testCaseId) override;
virtual bool OnInferenceTestFinished() override;
@@ -227,7 +227,8 @@
void ReadPredictions();
typename InferenceModel::CommandLineOptions m_ModelCommandLineOptions;
- std::function<std::unique_ptr<InferenceModel>(typename InferenceModel::CommandLineOptions)> m_ConstructModel;
+ std::function<std::unique_ptr<InferenceModel>(const InferenceTestOptions& commonOptions,
+ typename InferenceModel::CommandLineOptions)> m_ConstructModel;
std::unique_ptr<InferenceModel> m_Model;
std::string m_DataDir;