COMPMID-415: Use templates for data arguments
Change-Id: I815d705e7cf42022f7a203935dcaaa333a2801fe
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80311
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
diff --git a/tests/fixtures_new/ActivationLayerFixture.h b/tests/fixtures_new/ActivationLayerFixture.h
index bb03fa2..5066810 100644
--- a/tests/fixtures_new/ActivationLayerFixture.h
+++ b/tests/fixtures_new/ActivationLayerFixture.h
@@ -39,6 +39,7 @@
class ActivationLayerFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape shape, ActivationLayerInfo info, DataType data_type, int batches)
{
// Set batched in source and destination shapes
diff --git a/tests/fixtures_new/AlexNetFixture.h b/tests/fixtures_new/AlexNetFixture.h
index fcac1b2..0ebdae0 100644
--- a/tests/fixtures_new/AlexNetFixture.h
+++ b/tests/fixtures_new/AlexNetFixture.h
@@ -47,6 +47,7 @@
class AlexNetFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(DataType data_type, int batches)
{
constexpr bool weights_transposed = true;
diff --git a/tests/fixtures_new/ConvolutionLayerFixture.h b/tests/fixtures_new/ConvolutionLayerFixture.h
index 6542610..f41cd1d 100644
--- a/tests/fixtures_new/ConvolutionLayerFixture.h
+++ b/tests/fixtures_new/ConvolutionLayerFixture.h
@@ -39,6 +39,7 @@
class ConvolutionLayerFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape src_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape dst_shape, PadStrideInfo info, DataType data_type, int batches)
{
// Set batched in source and destination shapes
diff --git a/tests/fixtures_new/FullyConnectedLayerFixture.h b/tests/fixtures_new/FullyConnectedLayerFixture.h
index 9bf18a9..82ecb39 100644
--- a/tests/fixtures_new/FullyConnectedLayerFixture.h
+++ b/tests/fixtures_new/FullyConnectedLayerFixture.h
@@ -39,6 +39,7 @@
class FullyConnectedLayerFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape src_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape dst_shape, DataType data_type, int batches)
{
// Set batched in source and destination shapes
diff --git a/tests/fixtures_new/GEMMFixture.h b/tests/fixtures_new/GEMMFixture.h
index cd35778..b23661f3e 100644
--- a/tests/fixtures_new/GEMMFixture.h
+++ b/tests/fixtures_new/GEMMFixture.h
@@ -39,6 +39,7 @@
class GEMMFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape shape_a, TensorShape shape_b, TensorShape shape_c, TensorShape shape_dst, float alpha, float beta, DataType data_type)
{
constexpr int fixed_point_position = 4;
diff --git a/tests/fixtures_new/LeNet5Fixture.h b/tests/fixtures_new/LeNet5Fixture.h
index 3f36628..d9173af 100644
--- a/tests/fixtures_new/LeNet5Fixture.h
+++ b/tests/fixtures_new/LeNet5Fixture.h
@@ -43,6 +43,7 @@
class LeNet5Fixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(int batches)
{
network.init(batches);
diff --git a/tests/fixtures_new/NormalizationLayerFixture.h b/tests/fixtures_new/NormalizationLayerFixture.h
index 63d2d42..999eed6 100644
--- a/tests/fixtures_new/NormalizationLayerFixture.h
+++ b/tests/fixtures_new/NormalizationLayerFixture.h
@@ -39,6 +39,7 @@
class NormalizationLayerFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape shape, NormalizationLayerInfo info, DataType data_type, int batches)
{
// Set batched in source and destination shapes
diff --git a/tests/fixtures_new/PoolingLayerFixture.h b/tests/fixtures_new/PoolingLayerFixture.h
index a09b421..fc9c90a 100644
--- a/tests/fixtures_new/PoolingLayerFixture.h
+++ b/tests/fixtures_new/PoolingLayerFixture.h
@@ -39,6 +39,7 @@
class PoolingLayerFixture : public framework::Fixture
{
public:
+ template <typename...>
void setup(TensorShape src_shape, TensorShape dst_shape, PoolingLayerInfo info, DataType data_type, int batches)
{
// Set batched in source and destination shapes