diff options
Diffstat (limited to 'tests/validation/CL')
-rw-r--r-- | tests/validation/CL/ActivationLayer.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/BitwiseAnd.cpp | 19 | ||||
-rw-r--r-- | tests/validation/CL/Box3x3.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/validation/CL/DepthConvert.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/FillBorder.cpp | 3 | ||||
-rw-r--r-- | tests/validation/CL/Gaussian3x3.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/Gaussian5x5.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/IntegralImage.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/NonLinearFilter.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/PoolingLayer.cpp | 7 | ||||
-rw-r--r-- | tests/validation/CL/Sobel3x3.cpp | 13 | ||||
-rw-r--r-- | tests/validation/CL/Sobel5x5.cpp | 13 | ||||
-rw-r--r-- | tests/validation/CL/SoftmaxLayer.cpp | 9 | ||||
-rw-r--r-- | tests/validation/CL/Threshold.cpp | 9 |
15 files changed, 62 insertions, 75 deletions
diff --git a/tests/validation/CL/ActivationLayer.cpp b/tests/validation/CL/ActivationLayer.cpp index 793ab30942..5d266e60d2 100644 --- a/tests/validation/CL/ActivationLayer.cpp +++ b/tests/validation/CL/ActivationLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -87,8 +86,8 @@ float activation_layer_tolerance(ActivationLayerInfo::ActivationFunction activat CLTensor compute_activation_layer(bool in_place, const TensorShape &shape, DataType dt, ActivationLayerInfo act_info, int fixed_point_position = 0) { // Create tensors - CLTensor src = create_tensor(shape, dt, 1, fixed_point_position); - CLTensor dst = create_tensor(shape, dt, 1, fixed_point_position); + CLTensor src = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); + CLTensor dst = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); // Create and configure function CLActivationLayer act_layer; @@ -155,8 +154,8 @@ BOOST_DATA_TEST_CASE(Configuration, boost::unit_test::data::make({ false, true } const int fixed_point_position = (arm_compute::is_data_type_fixed_point(dt)) ? 3 : 0; // Create tensors - CLTensor src = create_tensor(shape, dt, 1, fixed_point_position); - CLTensor dst = create_tensor(shape, dt, 1, fixed_point_position); + CLTensor src = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); + CLTensor dst = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/BitwiseAnd.cpp b/tests/validation/CL/BitwiseAnd.cpp index 8b40affe60..c818fc5d98 100644 --- a/tests/validation/CL/BitwiseAnd.cpp +++ b/tests/validation/CL/BitwiseAnd.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -60,9 +59,9 @@ namespace CLTensor compute_bitwise_and(const TensorShape &shape) { // Create tensors - CLTensor src1 = create_tensor(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLBitwiseAnd band; @@ -96,9 +95,9 @@ CLTensor compute_bitwise_and(const TensorShape &shape) CLTensor compute_bitwise_and_subtensor(const TensorShape &shape) { // Create tensors - CLTensor src1 = create_tensor(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create SubTensors int coord_z = shape.z() / 2; @@ -147,9 +146,9 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, SmallShapes() + LargeShapes(), shape) { // Create tensors - CLTensor src1 = create_tensor(shape, DataType::U8); - CLTensor src2 = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src1 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor src2 = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src1.info()->is_resizable()); BOOST_TEST(src2.info()->is_resizable()); diff --git a/tests/validation/CL/Box3x3.cpp b/tests/validation/CL/Box3x3.cpp index 9c3db9f2fe..96a0d09ea3 100644 --- a/tests/validation/CL/Box3x3.cpp +++ b/tests/validation/CL/Box3x3.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -65,8 +64,8 @@ constexpr BorderSize border_size(filter_size / 2); /** Border size of the kern CLTensor compute_box3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLBox3x3 box3x3; @@ -97,8 +96,8 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderModes(), shape, border_mode) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/CMakeLists.txt b/tests/validation/CL/CMakeLists.txt index d46cca7ac4..93547b1879 100644 --- a/tests/validation/CL/CMakeLists.txt +++ b/tests/validation/CL/CMakeLists.txt @@ -25,7 +25,6 @@ include_directories(${CMAKE_SOURCE_DIR}/../include) set(arm_compute_test_validation_OPENCL_SOURCE_FILES ${CMAKE_SOURCE_DIR}/CL/CLAccessor.h - ${CMAKE_SOURCE_DIR}/CL/Helper.h ${CMAKE_CURRENT_SOURCE_DIR}/CLFixture.h ${CMAKE_CURRENT_SOURCE_DIR}/CLFixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/BitwiseAnd.cpp diff --git a/tests/validation/CL/DepthConvert.cpp b/tests/validation/CL/DepthConvert.cpp index 0bca453cf2..87fe3814f7 100644 --- a/tests/validation/CL/DepthConvert.cpp +++ b/tests/validation/CL/DepthConvert.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -63,8 +62,8 @@ namespace CLTensor compute_depth_convert(const TensorShape &shape, DataType dt_in, DataType dt_out, ConvertPolicy policy, uint32_t shift) { // Create tensors - CLTensor src = create_tensor(shape, dt_in); - CLTensor dst = create_tensor(shape, dt_out); + CLTensor src = create_tensor<CLTensor>(shape, dt_in); + CLTensor dst = create_tensor<CLTensor>(shape, dt_out); // Create and configure function CLDepthConvert depth_convert; @@ -97,8 +96,8 @@ CLTensor compute_depth_convert(const TensorShape &shape, DataType dt_in, DataTyp void compute_configure_validate(const TensorShape &shape, DataType dt_in, DataType dt_out, ConvertPolicy policy, uint32_t shift) { // Create tensors - CLTensor src = create_tensor(shape, dt_in); - CLTensor dst = create_tensor(shape, dt_out); + CLTensor src = create_tensor<CLTensor>(shape, dt_in); + CLTensor dst = create_tensor<CLTensor>(shape, dt_out); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/FillBorder.cpp b/tests/validation/CL/FillBorder.cpp index 42b9064982..f6930eed9a 100644 --- a/tests/validation/CL/FillBorder.cpp +++ b/tests/validation/CL/FillBorder.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "TensorLibrary.h" #include "TypePrinter.h" @@ -58,7 +57,7 @@ BOOST_DATA_TEST_CASE(FillBorder, BorderModes() * boost::unit_test::data::make({ BorderSize border_size{ 5 }; // Create tensors - CLTensor src = create_tensor(TensorShape{ 10U, 10U, 2U }, DataType::U8); + CLTensor src = create_tensor<CLTensor>(TensorShape{ 10U, 10U, 2U }, DataType::U8); src.info()->extend_padding(padding); diff --git a/tests/validation/CL/Gaussian3x3.cpp b/tests/validation/CL/Gaussian3x3.cpp index 2a526e8417..bf4684d068 100644 --- a/tests/validation/CL/Gaussian3x3.cpp +++ b/tests/validation/CL/Gaussian3x3.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -65,8 +64,8 @@ constexpr BorderSize border_size(filter_size / 2); /** Border size of the kern CLTensor compute_gaussian3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLGaussian3x3 gaussian3x3; @@ -97,8 +96,8 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderModes(), shape, border_mode) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/Gaussian5x5.cpp b/tests/validation/CL/Gaussian5x5.cpp index b6a692ce04..827dadd6a6 100644 --- a/tests/validation/CL/Gaussian5x5.cpp +++ b/tests/validation/CL/Gaussian5x5.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -65,8 +64,8 @@ constexpr BorderSize border_size(filter_size / 2); /** Border size of the kern CLTensor compute_gaussian5x5(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLGaussian5x5 gaussian5x5; @@ -97,8 +96,8 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderModes(), shape, border_mode) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/IntegralImage.cpp b/tests/validation/CL/IntegralImage.cpp index 9ace8bd2e8..e46568e164 100644 --- a/tests/validation/CL/IntegralImage.cpp +++ b/tests/validation/CL/IntegralImage.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -60,8 +59,8 @@ namespace CLTensor compute_integral_image(const TensorShape &shape) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U32); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U32); // Create integral image configure function CLIntegralImage integral_image; @@ -92,8 +91,8 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, SmallShapes() + LargeShapes(), shape) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U32); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U32); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/NonLinearFilter.cpp b/tests/validation/CL/NonLinearFilter.cpp index 4a487d6ed4..414a30812d 100644 --- a/tests/validation/CL/NonLinearFilter.cpp +++ b/tests/validation/CL/NonLinearFilter.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -69,8 +68,8 @@ CLTensor compute_non_linear_filter(const TensorShape &shape, NonLinearFilterFunc uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLNonLinearFilter filter; @@ -113,8 +112,8 @@ BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) const auto half_mask_size = static_cast<int>(mask_size / 2); // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/PoolingLayer.cpp b/tests/validation/CL/PoolingLayer.cpp index dabc21eaa8..5876e8bf23 100644 --- a/tests/validation/CL/PoolingLayer.cpp +++ b/tests/validation/CL/PoolingLayer.cpp @@ -22,9 +22,10 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "TypePrinter.h" #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" +#include "tests/Globals.h" +#include "tests/Utils.h" #include "tests/dataset/PoolingLayerDataset.h" #include "validation/Datasets.h" #include "validation/Reference.h" @@ -52,8 +53,8 @@ const float tolerance_f = 1e-05; /**< Tolerance value for comparing reference's CLTensor compute_pooling_layer(const TensorShape &shape_in, const TensorShape &shape_out, DataType dt, PoolingLayerInfo pool_info) { // Create tensors - CLTensor src = create_tensor(shape_in, dt); - CLTensor dst = create_tensor(shape_out, dt); + CLTensor src = create_tensor<CLTensor>(shape_in, dt); + CLTensor dst = create_tensor<CLTensor>(shape_out, dt); // Create and configure function CLPoolingLayer pool; diff --git a/tests/validation/CL/Sobel3x3.cpp b/tests/validation/CL/Sobel3x3.cpp index fbd7185a48..59c21e7758 100644 --- a/tests/validation/CL/Sobel3x3.cpp +++ b/tests/validation/CL/Sobel3x3.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -67,9 +66,9 @@ constexpr BorderSize border_size(filter_size / 2); /** Border size of the kern std::pair<CLTensor, CLTensor> compute_sobel_3x3(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst_x = create_tensor(shape, DataType::S16); - CLTensor dst_y = create_tensor(shape, DataType::S16); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst_x = create_tensor<CLTensor>(shape, DataType::S16); + CLTensor dst_y = create_tensor<CLTensor>(shape, DataType::S16); src.info()->set_format(Format::U8); dst_x.info()->set_format(Format::S16); @@ -106,9 +105,9 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderModes(), shape, border_mode) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst_x = create_tensor(shape, DataType::S16); - CLTensor dst_y = create_tensor(shape, DataType::S16); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst_x = create_tensor<CLTensor>(shape, DataType::S16); + CLTensor dst_y = create_tensor<CLTensor>(shape, DataType::S16); src.info()->set_format(Format::U8); dst_x.info()->set_format(Format::S16); diff --git a/tests/validation/CL/Sobel5x5.cpp b/tests/validation/CL/Sobel5x5.cpp index 263e57e43f..8beb795969 100644 --- a/tests/validation/CL/Sobel5x5.cpp +++ b/tests/validation/CL/Sobel5x5.cpp @@ -23,7 +23,6 @@ */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -67,9 +66,9 @@ constexpr BorderSize border_size(filter_size / 2); /** Border size of the kern std::pair<CLTensor, CLTensor> compute_sobel_5x5(const TensorShape &shape, BorderMode border_mode, uint8_t constant_border_value) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst_x = create_tensor(shape, DataType::S16); - CLTensor dst_y = create_tensor(shape, DataType::S16); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst_x = create_tensor<CLTensor>(shape, DataType::S16); + CLTensor dst_y = create_tensor<CLTensor>(shape, DataType::S16); src.info()->set_format(Format::U8); dst_x.info()->set_format(Format::S16); @@ -106,9 +105,9 @@ BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::l BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderModes(), shape, border_mode) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst_x = create_tensor(shape, DataType::S16); - CLTensor dst_y = create_tensor(shape, DataType::S16); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst_x = create_tensor<CLTensor>(shape, DataType::S16); + CLTensor dst_y = create_tensor<CLTensor>(shape, DataType::S16); src.info()->set_format(Format::U8); dst_x.info()->set_format(Format::S16); diff --git a/tests/validation/CL/SoftmaxLayer.cpp b/tests/validation/CL/SoftmaxLayer.cpp index aa80e506ed..3f8f465504 100644 --- a/tests/validation/CL/SoftmaxLayer.cpp +++ b/tests/validation/CL/SoftmaxLayer.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -66,8 +65,8 @@ const float tolerance_fixed_point = 2.f; CLTensor compute_softmax_layer(const TensorShape &shape, DataType dt, int fixed_point_position = 0) { // Create tensors - CLTensor src = create_tensor(shape, dt, 1, fixed_point_position); - CLTensor dst = create_tensor(shape, dt, 1, fixed_point_position); + CLTensor src = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); + CLTensor dst = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); // Create and configure function CLSoftmaxLayer smx_layer; @@ -111,8 +110,8 @@ BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * CNNDataTyp int fixed_point_position = (arm_compute::is_data_type_fixed_point(dt)) ? 3 : 0; // Create tensors - CLTensor src = create_tensor(shape, dt, 1, fixed_point_position); - CLTensor dst = create_tensor(shape, dt, 1, fixed_point_position); + CLTensor src = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); + CLTensor dst = create_tensor<CLTensor>(shape, dt, 1, fixed_point_position); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); diff --git a/tests/validation/CL/Threshold.cpp b/tests/validation/CL/Threshold.cpp index ff7b8f0694..4f9e420656 100644 --- a/tests/validation/CL/Threshold.cpp +++ b/tests/validation/CL/Threshold.cpp @@ -22,7 +22,6 @@ * SOFTWARE. */ #include "CL/CLAccessor.h" -#include "CL/Helper.h" #include "Globals.h" #include "PaddingCalculator.h" #include "TensorLibrary.h" @@ -65,8 +64,8 @@ namespace CLTensor compute_threshold(const TensorShape &shape, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); // Create and configure function CLThreshold thrsh; @@ -99,8 +98,8 @@ BOOST_DATA_TEST_CASE(Configuration, shape, threshold_conf) { // Create tensors - CLTensor src = create_tensor(shape, DataType::U8); - CLTensor dst = create_tensor(shape, DataType::U8); + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + CLTensor dst = create_tensor<CLTensor>(shape, DataType::U8); BOOST_TEST(src.info()->is_resizable()); BOOST_TEST(dst.info()->is_resizable()); |