Optimize CL and Neon depthwise convolution tests
Resolves: COMPMID-6465
Change-Id: I5bbf4596dd5e34e806dc51de9be14df9b6fa320a
Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10452
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
diff --git a/tests/validation/CL/DepthwiseConvolutionLayerNative.cpp b/tests/validation/CL/DepthwiseConvolutionLayerNative.cpp
index 45047ca..012018c 100644
--- a/tests/validation/CL/DepthwiseConvolutionLayerNative.cpp
+++ b/tests/validation/CL/DepthwiseConvolutionLayerNative.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2022 Arm Limited.
+ * Copyright (c) 2019-2023 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -42,6 +42,7 @@
{
namespace validation
{
+using framework::dataset::make;
using namespace arm_compute::misc::shape_calculator;
// Create function for CLDepthwiseConvolutionLayerNativeKernel
@@ -62,76 +63,89 @@
constexpr float abs_tolerance_f16(0.03f);
/** Width values to test - Precommit */
-const auto width_values_precommit = framework::dataset::make("width", { 1U, 33U } );
+const auto width_values_precommit = make("width", { 1U, 33U } );
/** Width values to test - Nightly */
-const auto width_values_nightly = framework::dataset::make("width", { 53U, 47U } );
+const auto width_values_nightly = make("width", { 53U, 47U } );
/** Height values to test - Precommit */
-const auto height_values_precommit = framework::dataset::make("height", { 19U } );
+const auto height_values_precommit = make("height", { 19U } );
/** Height values to test - Nightly */
-const auto height_values_nightly = framework::dataset::make("height", { 39U, 43U } );
+const auto height_values_nightly = make("height", { 39U, 43U } );
/** Channel values to test - Precommit */
-const auto channel_values_precommit = framework::dataset::make("channels", { 15U });
+const auto channel_values_precommit = make("channels", { 15U });
/** Channel values to test - Nightly */
-const auto channel_values_nightly = framework::dataset::make("channels", { 33U, 19U });
+const auto channel_values_nightly = make("channels", { 33U, 19U });
/** Channel values to test with cl_image support - Precommit */
-const auto channel_values_export_to_cl_image_precommit = framework::dataset::make("channels", { 16U });
+const auto channel_values_export_to_cl_image_precommit = make("channels", { 16U });
/** Channel values to test with cl_image support - Nightly */
-const auto channel_values_export_to_cl_image_nightly = framework::dataset::make("channels", { 32U });
+const auto channel_values_export_to_cl_image_nightly = make("channels", { 32U });
/** Batch values to test - Precommit */
-const auto batch_values_precommit = framework::dataset::make("batch", { 1U, 2U });
+const auto batch_values_precommit = make("batch", { 1U, 2U });
/** Batch values to test - Nightly */
-const auto batch_values_nightly = framework::dataset::make("batch", { 1U, 3U });
+const auto batch_values_nightly = make("batch", { 3U });
/** Kernel size values to test - Precommit */
-const auto kernel_sz_values_precommit = framework::dataset::make("kernel_size", { Size2D(1U, 1U), Size2D(1U, 3U), Size2D(5U, 5U) });
+const auto kernel_sz_values_precommit = make("kernel_size", { Size2D(1U, 1U), Size2D(1U, 3U), Size2D(5U, 5U) });
/** Kernel size values to test - Nightly */
-const auto kernel_sz_values_nightly = framework::dataset::make("kernel_size", { Size2D(3U, 5U), Size2D(5U, 1U), Size2D(1U, 7U), Size2D(9U, 7U) });
+const auto kernel_sz_values_nightly = make("kernel_size", { Size2D(3U, 5U), Size2D(5U, 1U), Size2D(1U, 7U), Size2D(9U, 7U) });
/** Depth multiplier values to test - All */
-const auto depth_multiplier_values = framework::dataset::make("depth_multiplier", {3U});
+const auto depth_multiplier_values = make("depth_multiplier", {3U});
/** Dilation values to test - All */
-const auto dilation_values = framework::dataset::make("dilation", { Size2D(1U, 1U), Size2D(3U, 3U) });
+const auto dilation_values = make("dilation", { Size2D(1U, 1U), Size2D(3U, 3U) });
/** Stride values to test - All */
-const auto stride_values = framework::dataset::make("stride", { Size2D(1U, 1U), Size2D(3U, 2U) });
+const auto stride_values = make("stride", { Size2D(1U, 1U), Size2D(3U, 2U) });
-/** Padding values to test - All */
-const auto padding_valid_values = framework::dataset::make("padding_valid", { true, false });
+/** Padding values to test - Precommit */
+const auto padding_valid_values = make("padding_valid", { true, false });
-/** Data type values to test - All */
-const auto data_type_values = framework::dataset::make("data_type", { DataType::F32, DataType::F16 });
+/** Padding values to test - Nightly */
+const auto padding_valid_values_nightly = make("padding_valid", { false });
/** Data layout values to test - All */
-const auto data_layout_values = framework::dataset::make("data_layout", { DataLayout::NHWC });
+const auto data_layout_values = make("data_layout", { DataLayout::NHWC });
/** N0 values to test - Precommit */
-const auto n0_values_precommit = framework::dataset::make("N0", {2, 4});
+const auto n0_values_precommit = make("N0", {2, 4});
/** N0 values to test - Nightly */
-const auto n0_values_nightly = framework::dataset::make("N0", {3, 8});
+const auto n0_values_nightly = make("N0", {3, 8});
/** N0 values to test with cl_image support - Precommit */
-const auto n0_values_export_to_cl_image_precommit = framework::dataset::make("N0", {4});
+const auto n0_values_export_to_cl_image_precommit = make("N0", {4});
/** N0 values to test with cl_image support - Nightly */
-const auto n0_values_export_to_cl_image_nightly = framework::dataset::make("N0", {8});
+const auto n0_values_export_to_cl_image_nightly = make("N0", {8});
-/** Activation values to test */
-const auto act_values = framework::dataset::make("Activation",
+/** Activation values to test in precommit */
+const auto act_values = make("Activation", { ActivationLayerInfo() });
+
+const auto activations_rest = make("Activation",
{
- ActivationLayerInfo(),
- ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU, 6.0f, 0.5f),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f, 0.5f),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU, 0.8f, -0.5f),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LEAKY_RELU, 0.1f),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::SOFT_RELU),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::ELU),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::ABS),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LOGISTIC),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::TANH),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::SQUARE),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::HARD_SWISH),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::LINEAR, 2.f, 1.f),
+ ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::GELU)
});
} // namespace
@@ -147,15 +161,15 @@
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ make("DataType", DataType::F32)),
data_layout_values),
act_values),
n0_values_precommit),
- framework::dataset::make("ExportToCLImage", false)))
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
@@ -168,15 +182,36 @@
channel_values_nightly),
batch_values_nightly),
kernel_sz_values_nightly),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F32)),
data_layout_values),
- act_values),
+ make("Activation", { ActivationLayerInfo() })),
n0_values_nightly),
- framework::dataset::make("ExportToCLImage", false)))
+ make("ExportToCLImage", false)))
+{
+ // Validate output
+ validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
+}
+
+FIXTURE_DATA_TEST_CASE_NEW(RunActivations, CLDepthwiseConvolutionLayerNativeFixture<float>, framework::DatasetMode::ALL,
+ combine(
+ make("width", { 33U } ),
+ height_values_precommit,
+ channel_values_precommit,
+ make("batch", { 2U } ),
+ make("kernel_size", { Size2D(5U, 5U) }),
+ make("depth_multiplier", 1),
+ make("dilation", Size2D(3U, 3U)),
+ make("stride", Size2D(3U, 2U)),
+ padding_valid_values_nightly,
+ make("DataType", DataType::F32),
+ data_layout_values,
+ activations_rest,
+ n0_values_precommit,
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
@@ -190,15 +225,15 @@
channel_values_export_to_cl_image_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ make("DataType", DataType::F32)),
data_layout_values),
act_values),
n0_values_export_to_cl_image_precommit),
- framework::dataset::make("ExportToCLImage", true)))
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)
@@ -220,15 +255,15 @@
channel_values_export_to_cl_image_nightly),
batch_values_nightly),
kernel_sz_values_nightly),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F32)),
data_layout_values),
- act_values),
+ make("Activation", { ActivationLayerInfo() })),
n0_values_export_to_cl_image_nightly),
- framework::dataset::make("ExportToCLImage", true)))
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)
@@ -254,36 +289,56 @@
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("DataType", DataType::F16)),
data_layout_values),
act_values),
n0_values_precommit),
- framework::dataset::make("ExportToCLImage", false)))
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f16);
}
-
FIXTURE_DATA_TEST_CASE_NEW(RunLarge, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::NIGHTLY,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- width_values_nightly,
- height_values_nightly),
- channel_values_nightly),
+ make("width", { 47U } ),
+ make("height", { 39U } )),
+ make("channels", { 19U } )),
batch_values_nightly),
- kernel_sz_values_nightly),
- framework::dataset::make("depth_multiplier", 1)),
- dilation_values),
- stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("kernel_size", { Size2D(5U, 5U) })),
+ make("depth_multiplier", 1)),
+ make("dilation", { Size2D(3U, 3U) })),
+ make("stride", { Size2D(3U, 2U) })),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F16)),
data_layout_values),
- act_values),
+ make("Activation", { ActivationLayerInfo() })),
n0_values_nightly),
- framework::dataset::make("ExportToCLImage", false)))
+ make("ExportToCLImage", false)))
+{
+ // Validate output
+ validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
+}
+
+FIXTURE_DATA_TEST_CASE_NEW(RunActivations, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::ALL,
+ combine(
+ make("width", { 33U } ),
+ height_values_precommit,
+ channel_values_precommit,
+ make("batch", { 2U } ),
+ make("kernel_size", { Size2D(5U, 5U) }),
+ make("depth_multiplier", 4),
+ make("dilation", Size2D(3U, 3U)),
+ make("stride", Size2D(3U, 2U)),
+ padding_valid_values_nightly,
+ make("DataType", DataType::F16),
+ data_layout_values,
+ activations_rest,
+ n0_values_precommit,
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
@@ -297,15 +352,15 @@
channel_values_export_to_cl_image_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 1)),
+ make("depth_multiplier", 1)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("DataType", DataType::F16)),
data_layout_values),
act_values),
n0_values_export_to_cl_image_precommit),
- framework::dataset::make("ExportToCLImage", true)))
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)
@@ -319,23 +374,22 @@
framework::ARM_COMPUTE_PRINT_INFO();
}
}
-
FIXTURE_DATA_TEST_CASE_NEW(RunLarge, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::NIGHTLY,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- width_values_nightly,
- height_values_nightly),
+ make("width", { 47U } ),
+ make("height", { 39U } )),
channel_values_export_to_cl_image_nightly),
batch_values_nightly),
- kernel_sz_values_nightly),
- framework::dataset::make("depth_multiplier", 1)),
- dilation_values),
- stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("kernel_size", { Size2D(5U, 5U) })),
+ make("depth_multiplier", 1)),
+ make("dilation", { Size2D(3U, 3U) })),
+ make("stride", { Size2D(3U, 2U) })),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F16)),
data_layout_values),
- act_values),
+ make("Activation", { ActivationLayerInfo() })),
n0_values_export_to_cl_image_nightly),
- framework::dataset::make("ExportToCLImage", true)))
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)
@@ -349,16 +403,16 @@
framework::ARM_COMPUTE_PRINT_INFO();
}
}
-
TEST_SUITE_END() // ExportWeightsToCLImage
TEST_SUITE_END() // FP16
TEST_SUITE_END() // Float
+
TEST_SUITE(DepthMultiplier)
TEST_SUITE(Float)
TEST_SUITE(FP32)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<float>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
@@ -367,11 +421,11 @@
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ make("DataType", DataType::F32)),
data_layout_values),
act_values),
- framework::dataset::make("N0", 1)),
- framework::dataset::make("ExportToCLImage", false)))
+ make("N0", 1)),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
@@ -379,7 +433,7 @@
FIXTURE_DATA_TEST_CASE_NEW(RunLarge, CLDepthwiseConvolutionLayerNativeFixture<float>, framework::DatasetMode::NIGHTLY,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 53U } ),
+ make("width", { 53U } ),
height_values_nightly),
channel_values_nightly),
batch_values_nightly),
@@ -387,12 +441,12 @@
depth_multiplier_values),
dilation_values),
stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F32)),
data_layout_values),
- act_values),
- framework::dataset::make("N0", 1)),
- framework::dataset::make("ExportToCLImage", false)))
+ make("Activation", { ActivationLayerInfo() })),
+ make("N0", 1)),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
@@ -401,20 +455,20 @@
TEST_SUITE(DepthMultiplierMultipleOfOutputChannels)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<float>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 2)),
+ make("depth_multiplier", 2)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ make("DataType", DataType::F32)),
data_layout_values),
act_values),
- framework::dataset::make("N0", {2})),
- framework::dataset::make("ExportToCLImage", false)))
+ make("N0", {2})),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f32, 0.f, abs_tolerance_f32);
@@ -423,20 +477,20 @@
TEST_SUITE(ExportWeightsToCLImage)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<float>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 4)),
+ make("depth_multiplier", 4)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F32)),
+ make("DataType", DataType::F32)),
data_layout_values),
act_values),
- framework::dataset::make("N0", {4})),
- framework::dataset::make("ExportToCLImage", true)))
+ make("N0", {4})),
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)
@@ -457,7 +511,7 @@
TEST_SUITE(FP16)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
@@ -466,11 +520,11 @@
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("DataType", DataType::F16)),
data_layout_values),
act_values),
- framework::dataset::make("N0", 1)),
- framework::dataset::make("ExportToCLImage", false)))
+ make("N0", 1)),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f16);
@@ -478,7 +532,7 @@
FIXTURE_DATA_TEST_CASE_NEW(RunLarge, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::NIGHTLY,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 53U } ),
+ make("width", { 53U } ),
height_values_nightly),
channel_values_nightly),
batch_values_nightly),
@@ -486,12 +540,12 @@
depth_multiplier_values),
dilation_values),
stride_values),
- padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ padding_valid_values_nightly),
+ make("DataType", DataType::F16)),
data_layout_values),
- act_values),
- framework::dataset::make("N0", 1)),
- framework::dataset::make("ExportToCLImage", false)))
+ make("Activation", { ActivationLayerInfo() })),
+ make("N0", 1)),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
@@ -500,20 +554,20 @@
TEST_SUITE(DepthMultiplierMultipleOfOutputChannels)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 2)),
+ make("depth_multiplier", 2)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("DataType", DataType::F16)),
data_layout_values),
act_values),
- framework::dataset::make("N0", {2})),
- framework::dataset::make("ExportToCLImage", false)))
+ make("N0", {2})),
+ make("ExportToCLImage", false)))
{
// Validate output
validate(CLAccessor(_target), _reference, rel_tolerance_f16, 0.f, abs_tolerance_f16);
@@ -522,20 +576,20 @@
TEST_SUITE(ExportWeightsToCLImage)
FIXTURE_DATA_TEST_CASE_NEW(RunSmall, CLDepthwiseConvolutionLayerNativeFixture<half>, framework::DatasetMode::ALL,
combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(combine(
- framework::dataset::make("width", { 33U } ),
+ make("width", { 33U } ),
height_values_precommit),
channel_values_precommit),
batch_values_precommit),
kernel_sz_values_precommit),
- framework::dataset::make("depth_multiplier", 4)),
+ make("depth_multiplier", 4)),
dilation_values),
stride_values),
padding_valid_values),
- framework::dataset::make("DataType", DataType::F16)),
+ make("DataType", DataType::F16)),
data_layout_values),
act_values),
- framework::dataset::make("N0", {4})),
- framework::dataset::make("ExportToCLImage", true)))
+ make("N0", {4})),
+ make("ExportToCLImage", true)))
{
// Validate output
if(_validate_output)