diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp index c1bf494328..4909214a3f 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp @@ -29,13 +29,14 @@ #include #include #include +#include #include -#include #include #include #include #include +#include #include "1.0/Utils.h" #include "1.2/Callbacks.h" @@ -333,9 +334,9 @@ void EvaluatePreparedModel(const sp& preparedModel, const TestMo void EvaluatePreparedModel(const sp& preparedModel, const TestModel& testModel, bool testDynamicOutputShape) { - std::initializer_list outputTypesList; - std::initializer_list measureTimingList; - std::initializer_list executorList; + std::vector outputTypesList; + std::vector measureTimingList; + std::vector executorList; if (testDynamicOutputShape) { outputTypesList = {OutputType::UNSPECIFIED, OutputType::INSUFFICIENT}; diff --git a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp index 3e947f5163..f61240efa6 100644 --- a/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp @@ -34,13 +34,14 @@ #include #include #include +#include #include -#include #include #include #include #include +#include #include "1.0/Utils.h" #include "1.2/Callbacks.h" @@ -368,9 +369,9 @@ void EvaluatePreparedModel(const sp& preparedModel, const TestMo void EvaluatePreparedModel(const sp& preparedModel, const TestModel& testModel, TestKind testKind) { - std::initializer_list outputTypesList; - std::initializer_list measureTimingList; - std::initializer_list executorList; + std::vector outputTypesList; + std::vector measureTimingList; + std::vector executorList; switch (testKind) { case TestKind::GENERAL: { @@ -403,11 +404,9 @@ void EvaluatePreparedCoupledModels(const sp& preparedModel, const TestModel& testModel, const sp& preparedCoupledModel, const TestModel& coupledModel) { - std::initializer_list outputTypesList = {OutputType::FULLY_SPECIFIED}; - std::initializer_list measureTimingList = {MeasureTiming::NO, - MeasureTiming::YES}; - std::initializer_list executorList = {Executor::ASYNC, Executor::SYNC, - Executor::BURST}; + const std::vector outputTypesList = {OutputType::FULLY_SPECIFIED}; + const std::vector measureTimingList = {MeasureTiming::NO, MeasureTiming::YES}; + const std::vector executorList = {Executor::ASYNC, Executor::SYNC, Executor::BURST}; for (const OutputType outputType : outputTypesList) { for (const MeasureTiming measureTiming : measureTimingList) {