COMPMID-417: Use a common create_tensor function
Change-Id: I6b0511484a5b433ebec3fd62d778e64dcb4f89b5
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79362
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
diff --git a/tests/benchmark/common/ActivationLayer.h b/tests/benchmark/common/ActivationLayer.h
index 7edfb6e..8e22281 100644
--- a/tests/benchmark/common/ActivationLayer.h
+++ b/tests/benchmark/common/ActivationLayer.h
@@ -57,8 +57,8 @@
shape.set(shape.num_dimensions(), batches);
// Create tensors
- src = create_tensor(shape, dt, 1, fixed_point_position);
- dst = create_tensor(shape, dt, 1, fixed_point_position);
+ src = create_tensor<TensorType>(shape, dt, 1, fixed_point_position);
+ dst = create_tensor<TensorType>(shape, dt, 1, fixed_point_position);
// Create and configure function
act_layer.configure(&src, &dst, act_obj.info);
diff --git a/tests/benchmark/common/ConvolutionLayer.h b/tests/benchmark/common/ConvolutionLayer.h
index 594c62c..a777a95 100644
--- a/tests/benchmark/common/ConvolutionLayer.h
+++ b/tests/benchmark/common/ConvolutionLayer.h
@@ -59,10 +59,10 @@
dst_shape.set(3 /* batch */, batches);
// Create tensors
- src = create_tensor(src_shape, dt, 1, fixed_point_position);
- weights = create_tensor(conv_obj.weights_shape, dt, 1, fixed_point_position);
- bias = create_tensor(conv_obj.bias_shape, dt, 1, fixed_point_position);
- dst = create_tensor(dst_shape, dt, 1, fixed_point_position);
+ src = create_tensor<TensorType>(src_shape, dt, 1, fixed_point_position);
+ weights = create_tensor<TensorType>(conv_obj.weights_shape, dt, 1, fixed_point_position);
+ bias = create_tensor<TensorType>(conv_obj.bias_shape, dt, 1, fixed_point_position);
+ dst = create_tensor<TensorType>(dst_shape, dt, 1, fixed_point_position);
// Create and configure function
conv_layer = std::unique_ptr<Function>(new Function());
diff --git a/tests/benchmark/common/FullyConnectedLayer.h b/tests/benchmark/common/FullyConnectedLayer.h
index 88adf83..eeef1de 100644
--- a/tests/benchmark/common/FullyConnectedLayer.h
+++ b/tests/benchmark/common/FullyConnectedLayer.h
@@ -60,10 +60,10 @@
dst_shape.set(dst_shape.num_dimensions(), batches);
// Create tensors
- src = create_tensor(src_shape, dt, 1, fixed_point_position);
- weights = create_tensor(fc_obj.weights_shape, dt, 1, fixed_point_position);
- bias = create_tensor(fc_obj.bias_shape, dt, 1, fixed_point_position);
- dst = create_tensor(dst_shape, dt, 1, fixed_point_position);
+ src = create_tensor<TensorType>(src_shape, dt, 1, fixed_point_position);
+ weights = create_tensor<TensorType>(fc_obj.weights_shape, dt, 1, fixed_point_position);
+ bias = create_tensor<TensorType>(fc_obj.bias_shape, dt, 1, fixed_point_position);
+ dst = create_tensor<TensorType>(dst_shape, dt, 1, fixed_point_position);
// Create and configure function
fc_layer = std::unique_ptr<Function>(new Function());
diff --git a/tests/benchmark/common/NormalizationLayer.h b/tests/benchmark/common/NormalizationLayer.h
index 4593fb7..580dca6 100644
--- a/tests/benchmark/common/NormalizationLayer.h
+++ b/tests/benchmark/common/NormalizationLayer.h
@@ -58,8 +58,8 @@
shape.set(shape.num_dimensions(), batches);
// Create tensors
- src = create_tensor(shape, dt, 1, fixed_point_position);
- dst = create_tensor(shape, dt, 1, fixed_point_position);
+ src = create_tensor<TensorType>(shape, dt, 1, fixed_point_position);
+ dst = create_tensor<TensorType>(shape, dt, 1, fixed_point_position);
// Create and configure function
norm_layer = std::unique_ptr<Function>(new Function());
diff --git a/tests/benchmark/common/PoolingLayer.h b/tests/benchmark/common/PoolingLayer.h
index 5bb332f..96ff905 100644
--- a/tests/benchmark/common/PoolingLayer.h
+++ b/tests/benchmark/common/PoolingLayer.h
@@ -59,8 +59,8 @@
dst_shape.set(dst_shape.num_dimensions(), batches);
// Create tensors
- src = create_tensor(src_shape, dt, 1, fixed_point_position);
- dst = create_tensor(dst_shape, dt, 1, fixed_point_position);
+ src = create_tensor<TensorType>(src_shape, dt, 1, fixed_point_position);
+ dst = create_tensor<TensorType>(dst_shape, dt, 1, fixed_point_position);
// Create and configure function
pool_layer.configure(&src, &dst, pool_obj.info);