From 6bc4e9617f4c7679f612e967bceeb8177c3ffb68 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Thu, 3 Dec 2020 12:52:28 +0000 Subject: Fix invalid usage of dataset::make * To create a dataset with an enumerated list of items, the list needs to be enclosed with braces, otherwise it calls into the other make overloads where the items start denoting the range markers. * Remove dead code. Resolves COMPMID-4045 Signed-off-by: SiCong Li Change-Id: Id27ebbd0e8c9ec683839684f7ebcdd2378cf64b4 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4651 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/GEMM.cpp | 5 +---- tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp | 2 +- tests/validation/NEON/GEMMLowp.cpp | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'tests/validation') diff --git a/tests/validation/CL/GEMM.cpp b/tests/validation/CL/GEMM.cpp index 392eeb1510..838920c29d 100644 --- a/tests/validation/CL/GEMM.cpp +++ b/tests/validation/CL/GEMM.cpp @@ -49,8 +49,7 @@ RelativeTolerance tolerance_f32(0.001f); /**< Tolerance value for compari constexpr float abs_tolerance_f32( 0.0001f); /**< Absolute tolerance value for comparing reference's output against implementation's output for floating point data types in case using relative tolerance fails because of small values */ RelativeTolerance tolerance_f16(half(0.2)); /**< Tolerance value for comparing reference's output against implementation's output for floating point data types */ -constexpr float tolerance_num = 0.02f; /**< Tolerance number */ -const auto data_interleave = framework::dataset::make("M", 8, 14) * framework::dataset::make("N", 7, 14); +constexpr float tolerance_num = 0.02f; /**< Tolerance number */ /** CNN data types */ const auto CNNDataTypes = framework::dataset::make("DataType", @@ -60,8 +59,6 @@ const auto CNNDataTypes = framework::dataset::make("DataType", }); } // namespace -const auto data_transpose = framework::dataset::make("M", 8, 14) * framework::dataset::make("N", 7, 14); - TEST_SUITE(CL) TEST_SUITE(GEMM) diff --git a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp index 1cfeac59af..4a574d8f1d 100644 --- a/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp +++ b/tests/validation/CL/GEMMLowpMatrixMultiplyNative.cpp @@ -81,7 +81,7 @@ const auto n0_values_precommit = framework::dataset::make("N0", { 4 }); const auto k0_values_precommit = framework::dataset::make("K0", { 16 }); /** M0 values to test - Nightly */ -const auto m0_values_nightly = framework::dataset::make("M0", 1, 2, 7); +const auto m0_values_nightly = framework::dataset::make("M0", {1, 2, 7}); /** N0 values to test - Nightly */ const auto n0_values_nightly = framework::dataset::make("N0", { 1, 2, 3, 4, 8 }); diff --git a/tests/validation/NEON/GEMMLowp.cpp b/tests/validation/NEON/GEMMLowp.cpp index 04282c2c3c..178e7c9388 100644 --- a/tests/validation/NEON/GEMMLowp.cpp +++ b/tests/validation/NEON/GEMMLowp.cpp @@ -46,11 +46,6 @@ namespace test { namespace validation { -namespace -{ -const auto data_matrix_multiply = framework::dataset::make("M", 12, 20) * framework::dataset::make("N", 12, 20) * framework::dataset::make("K", 16); -} // namespace - TEST_SUITE(NEON) TEST_SUITE(GEMMLowp) TEST_SUITE(MatrixMultiplyCore) -- cgit v1.2.1