IVGCVSW-2503 Refactor RefElementwiseWorkload around Equal and Greater
* Remove Equal and Greater from RefElementwiseWorkload
* Create RefComparisonWorkload and add Equal and Greater
* Update ElementwiseFunction for different input/output types
* Update TfParser to create Equal/Greater with Boolean output
* Update relevant tests to check for Boolean comparison
Change-Id: I299b7f2121769c960ac0c6139764a5f3c89c9c32
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
index 15a3937..7d2b091 100644
--- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
@@ -102,10 +102,10 @@
);
}
-template<typename T>
+template<typename TInput, typename TOutput>
void EndToEndLayerTestImpl(INetworkPtr network,
- const std::map<int, std::vector<T>>& inputTensorData,
- const std::map<int, std::vector<T>>& expectedOutputData,
+ const std::map<int, std::vector<TInput>>& inputTensorData,
+ const std::map<int, std::vector<TOutput>>& expectedOutputData,
std::vector<BackendId> backends)
{
// Create runtime in which test will run
@@ -128,10 +128,10 @@
}
OutputTensors outputTensors;
outputTensors.reserve(expectedOutputData.size());
- std::map<int, std::vector<T>> outputStorage;
+ std::map<int, std::vector<TOutput>> outputStorage;
for (auto&& it : expectedOutputData)
{
- std::vector<T> out(it.second.size());
+ std::vector<TOutput> out(it.second.size());
outputStorage.emplace(it.first, out);
outputTensors.push_back({it.first,
Tensor(runtime->GetOutputTensorInfo(netId, it.first),
@@ -144,7 +144,7 @@
// Checks the results.
for (auto&& it : expectedOutputData)
{
- std::vector<T> out = outputStorage.at(it.first);
+ std::vector<TOutput> out = outputStorage.at(it.first);
BOOST_TEST(it.second == out);
}
}