COMPMID-415: Rename TensorLibrary to AssetsLibrary

Change-Id: I0da73ae4b76a6778d3601ea5230dc5e17968deaf
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80936
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

37 files changed, 37 insertions, 37 deletions

diff --git a/tests/validation/NEON/AbsoluteDifference.cpp b/tests/validation/NEON/AbsoluteDifference.cpp
index e083b8d409..3ac9c99159 100644
--- a/tests/validation/NEON/AbsoluteDifference.cpp
+++ b/tests/validation/NEON/AbsoluteDifference.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Accumulate.cpp b/tests/validation/NEON/Accumulate.cpp
index 249b08dc8e..2d2d9c22a1 100644
--- a/tests/validation/NEON/Accumulate.cpp
+++ b/tests/validation/NEON/Accumulate.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/AccumulateSquared.cpp b/tests/validation/NEON/AccumulateSquared.cpp
index 770ed8f9c3..19b930fb25 100644
--- a/tests/validation/NEON/AccumulateSquared.cpp
+++ b/tests/validation/NEON/AccumulateSquared.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/AccumulateWeighted.cpp b/tests/validation/NEON/AccumulateWeighted.cpp
index 2d7f12aeb3..4dfa2b8fc7 100644
--- a/tests/validation/NEON/AccumulateWeighted.cpp
+++ b/tests/validation/NEON/AccumulateWeighted.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp
index b8827a5324..5ddb9e05be 100644
--- a/tests/validation/NEON/ActivationLayer.cpp
+++ b/tests/validation/NEON/ActivationLayer.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp
index 6feb15ad34..c98df7a8df 100644
--- a/tests/validation/NEON/ArithmeticAddition.cpp
+++ b/tests/validation/NEON/ArithmeticAddition.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/ArithmeticSubtraction.cpp b/tests/validation/NEON/ArithmeticSubtraction.cpp
index 23a320a84d..cc6dbcdbf8 100644
--- a/tests/validation/NEON/ArithmeticSubtraction.cpp
+++ b/tests/validation/NEON/ArithmeticSubtraction.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/BitwiseAnd.cpp b/tests/validation/NEON/BitwiseAnd.cpp
index 130c94bcbb..9ef6fc18a2 100644
--- a/tests/validation/NEON/BitwiseAnd.cpp
+++ b/tests/validation/NEON/BitwiseAnd.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/BitwiseNot.cpp b/tests/validation/NEON/BitwiseNot.cpp
index 3897101165..f04a789e22 100644
--- a/tests/validation/NEON/BitwiseNot.cpp
+++ b/tests/validation/NEON/BitwiseNot.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/BitwiseOr.cpp b/tests/validation/NEON/BitwiseOr.cpp
index 78e81dd94c..6b97de5112 100644
--- a/tests/validation/NEON/BitwiseOr.cpp
+++ b/tests/validation/NEON/BitwiseOr.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/BitwiseXor.cpp b/tests/validation/NEON/BitwiseXor.cpp
index 41825a5dcb..cb2eed1d69 100644
--- a/tests/validation/NEON/BitwiseXor.cpp
+++ b/tests/validation/NEON/BitwiseXor.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Box3x3.cpp b/tests/validation/NEON/Box3x3.cpp
index 00326c36fc..32fbbd8f2a 100644
--- a/tests/validation/NEON/Box3x3.cpp
+++ b/tests/validation/NEON/Box3x3.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/ConvolutionLayerDirect.cpp b/tests/validation/NEON/ConvolutionLayerDirect.cpp
index aeac73c1d6..7b0f711eee 100644
--- a/tests/validation/NEON/ConvolutionLayerDirect.cpp
+++ b/tests/validation/NEON/ConvolutionLayerDirect.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/DepthConcatenateLayer.cpp b/tests/validation/NEON/DepthConcatenateLayer.cpp
index 6ab5885868..40c2ada210 100644
--- a/tests/validation/NEON/DepthConcatenateLayer.cpp
+++ b/tests/validation/NEON/DepthConcatenateLayer.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/DepthConvert.cpp b/tests/validation/NEON/DepthConvert.cpp
index 8a30c746e9..9588d18cf3 100644
--- a/tests/validation/NEON/DepthConvert.cpp
+++ b/tests/validation/NEON/DepthConvert.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/FillBorder.cpp b/tests/validation/NEON/FillBorder.cpp
index 3ce4c6ffc9..797098e133 100644
--- a/tests/validation/NEON/FillBorder.cpp
+++ b/tests/validation/NEON/FillBorder.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
index f882508756..fe38a99d95 100644
--- a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
index 8f01721bc6..8955099d81 100644
--- a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
index dd51421072..1d16ed5dd0 100644
--- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
index 0af86debcb..69805a0859 100644
--- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
index f81f35967e..0b5bc3a7cc 100644
--- a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
index 4a4738e105..685d0f1230 100644
--- a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
index 4c531e085a..9b62d3a8cf 100644
--- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
index b42f13ae47..527ce722ea 100644
--- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/GEMM.cpp b/tests/validation/NEON/GEMM.cpp
index 0b608902a3..b7b6bf46f6 100644
--- a/tests/validation/NEON/GEMM.cpp
+++ b/tests/validation/NEON/GEMM.cpp
@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "dataset/GEMMDataset.h"
diff --git a/tests/validation/NEON/Gaussian3x3.cpp b/tests/validation/NEON/Gaussian3x3.cpp
index b303d5a6d4..b17d572761 100644
--- a/tests/validation/NEON/Gaussian3x3.cpp
+++ b/tests/validation/NEON/Gaussian3x3.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Gaussian5x5.cpp b/tests/validation/NEON/Gaussian5x5.cpp
index e094ee57b9..7a2a52b10f 100644
--- a/tests/validation/NEON/Gaussian5x5.cpp
+++ b/tests/validation/NEON/Gaussian5x5.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/IntegralImage.cpp b/tests/validation/NEON/IntegralImage.cpp
index ad6ba4b618..f03d37b77d 100644
--- a/tests/validation/NEON/IntegralImage.cpp
+++ b/tests/validation/NEON/IntegralImage.cpp
@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/MeanStdDev.cpp b/tests/validation/NEON/MeanStdDev.cpp
index cb92988e31..c42ca46cb7 100644
--- a/tests/validation/NEON/MeanStdDev.cpp
+++ b/tests/validation/NEON/MeanStdDev.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/MinMaxLocation.cpp b/tests/validation/NEON/MinMaxLocation.cpp
index bbb4589d30..11e96e3ff9 100644
--- a/tests/validation/NEON/MinMaxLocation.cpp
+++ b/tests/validation/NEON/MinMaxLocation.cpp
@@ -22,11 +22,11 @@
  * SOFTWARE.
  */
 
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/Helper.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/NonLinearFilter.cpp b/tests/validation/NEON/NonLinearFilter.cpp
index eb2e80712a..4666cdf31b 100644
--- a/tests/validation/NEON/NonLinearFilter.cpp
+++ b/tests/validation/NEON/NonLinearFilter.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/PixelWiseMultiplication.cpp b/tests/validation/NEON/PixelWiseMultiplication.cpp
index 4bc4d6ca06..5cff90c112 100644
--- a/tests/validation/NEON/PixelWiseMultiplication.cpp
+++ b/tests/validation/NEON/PixelWiseMultiplication.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Sobel3x3.cpp b/tests/validation/NEON/Sobel3x3.cpp
index ded9e737f3..d7f3fec452 100644
--- a/tests/validation/NEON/Sobel3x3.cpp
+++ b/tests/validation/NEON/Sobel3x3.cpp
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Sobel5x5.cpp b/tests/validation/NEON/Sobel5x5.cpp
index d0d252f214..e3ef8316cf 100644
--- a/tests/validation/NEON/Sobel5x5.cpp
+++ b/tests/validation/NEON/Sobel5x5.cpp
@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/SoftmaxLayer.cpp b/tests/validation/NEON/SoftmaxLayer.cpp
index 9ac81af278..020efc0419 100644
--- a/tests/validation/NEON/SoftmaxLayer.cpp
+++ b/tests/validation/NEON/SoftmaxLayer.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/TableLookup.cpp b/tests/validation/NEON/TableLookup.cpp
index f8f56a6fab..862e13a8b6 100644
--- a/tests/validation/NEON/TableLookup.cpp
+++ b/tests/validation/NEON/TableLookup.cpp
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/Helper.h"
 #include "NEON/NEAccessor.h"
 #include "NEON/NELutAccessor.h"
 #include "PaddingCalculator.h"
 #include "RawLutAccessor.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "validation/Datasets.h"
diff --git a/tests/validation/NEON/Threshold.cpp b/tests/validation/NEON/Threshold.cpp
index 0ae495a4e3..e5305eec6e 100644
--- a/tests/validation/NEON/Threshold.cpp
+++ b/tests/validation/NEON/Threshold.cpp
@@ -21,10 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include "AssetsLibrary.h"
 #include "Globals.h"
 #include "NEON/NEAccessor.h"
 #include "PaddingCalculator.h"
-#include "TensorLibrary.h"
 #include "TypePrinter.h"
 #include "Utils.h"
 #include "dataset/ThresholdDataset.h"