diff options
| author | Manuel Bottini <manuel.bottini@arm.com> | 2021-03-23 11:50:34 +0000 |
|---|---|---|
| committer | Manuel Bottini <manuel.bottini@arm.com> | 2021-04-06 11:28:16 +0000 |
| commit | ca62c6f53eb7244e6fed9f7e932608aa2496d9eb (patch) | |
| tree | e5c7630c40d9f009e9baef4e849c6c7cc6ca90a7 /tests/datasets/ScaleValidationDataset.h | |
| parent | 4ed7b39dbbe8ccc6267a9eacefca51717c3b3e10 (diff) | |
| download | ComputeLibrary-ca62c6f53eb7244e6fed9f7e932608aa2496d9eb.tar.gz | |
Mixed data-layout testing on high priority operators
Change data layouts after the configure in validation tests for:
- Scale
- Pooling
- FullyConnected
- DepthwiseConvolution
- DirectConvolution
- FFTConvolution
- WinogradConvolution
- GEMMConvolution (Indirect GEMM included)
Extending fixtures
Fixes for new mixed data layout tests
Resolves: COMPMID-4162
Change-Id: I2f2eb2075f7e24ab3872249d88cadb57b82c5dde
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5326
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/datasets/ScaleValidationDataset.h')
| -rw-r--r-- | tests/datasets/ScaleValidationDataset.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/datasets/ScaleValidationDataset.h b/tests/datasets/ScaleValidationDataset.h index 881be0fc26..c0073f93f5 100644 --- a/tests/datasets/ScaleValidationDataset.h +++ b/tests/datasets/ScaleValidationDataset.h @@ -145,12 +145,10 @@ framework::dataset::make("AlignCorners", { true })); * - 3D shapes with 0, 1 vector iterations * - 4D shapes with 0 vector iterations */ -#define SCALE_SHAPE_DATASET(element_per_iteration) \ - concat(concat(concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 1>()), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 2>()), \ - ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 0>()), \ - ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 1>()), \ +#define SCALE_SHAPE_DATASET(element_per_iteration) \ + concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ + ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 2>()), \ + ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 1>()), \ ScaleShapesBaseDataSet<3, 3, (element_per_iteration), 0>()) // To prevent long precommit time for OpenCL, shape set for OpenCL is separated into below two parts. @@ -166,11 +164,10 @@ framework::dataset::make("AlignCorners", { true })); * - 3D shapes with 0 vector iterations (1 vector iteration is covered by SCALE_PRECOMMIT_SHAPE_DATASET) * - 4D shapes with 0 vector iterations */ -#define SCALE_NIGHTLY_SHAPE_DATASET(element_per_iteration) \ - concat(concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 1>()), \ - ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 2>()), \ - ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 0>()), \ +#define SCALE_NIGHTLY_SHAPE_DATASET(element_per_iteration) \ + concat(concat(concat(ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 0>(), \ + ScaleShapesBaseDataSet<1, 1, (element_per_iteration), 1>()), \ + ScaleShapesBaseDataSet<3, 1, (element_per_iteration), 0>()), \ ScaleShapesBaseDataSet<3, 3, (element_per_iteration), 0>()) /** Generating dataset for non-quantized data tyeps with the given shapes */ |