diff options
| -rw-r--r-- | src/core/AccessWindowStatic.cpp | 4 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp | 2 | ||||
| -rw-r--r-- | tests/validation/NEON/ConvolutionLayer.cpp | 18 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/core/AccessWindowStatic.cpp b/src/core/AccessWindowStatic.cpp index 8b6419c485..8a7f37ac9b 100644 --- a/src/core/AccessWindowStatic.cpp +++ b/src/core/AccessWindowStatic.cpp @@ -194,8 +194,8 @@ bool AccessWindowStatic::update_padding_if_needed(const Window &window) const PaddingSize padding; padding.left = std::max(0, -_start_x); padding.right = std::max<int>(0, _end_x - shape[0]); - padding.top = shape.num_dimensions() == 1 ? 0 : std::max(0, -_start_y); - padding.bottom = shape.num_dimensions() == 1 ? 0 : std::max<int>(0, _end_y - shape[1]); + padding.top = std::max(0, -_start_y); + padding.bottom = std::max<int>(0, _end_y - shape[1]); // Update strides in tensor info return _info->extend_padding(padding); diff --git a/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp b/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp index b872bab928..d015ec3e41 100644 --- a/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp +++ b/src/core/NEON/kernels/NEGEMMMatrixMultiplyKernel.cpp @@ -1513,7 +1513,7 @@ void NEGEMMMatrixMultiplyKernel::configure(const ITensor *input0, const ITensor update_window_and_padding(win, AccessWindowRectangle(input0->info(), 0, 0, 4, 1, 1.f, 0.25f), - AccessWindowTranspose(input1->info(), 0, 0, 4, 1, 0.f, 0.25f), + AccessWindowStatic(input1->info(), 0, 0, input1->info()->tensor_shape().x(), ceil_to_multiple(input1->info()->tensor_shape().y(), 4)), output_access); output_access.set_valid_region(win, ValidRegion(Coordinates(0, 0), output->info()->tensor_shape())); diff --git a/tests/validation/NEON/ConvolutionLayer.cpp b/tests/validation/NEON/ConvolutionLayer.cpp index 584f34e11e..5880a7eda2 100644 --- a/tests/validation/NEON/ConvolutionLayer.cpp +++ b/tests/validation/NEON/ConvolutionLayer.cpp @@ -148,20 +148,18 @@ using NEConvolutionLayerFixedPointFixture = ConvolutionValidationFixedPointFixtu TEST_SUITE(Quantized) TEST_SUITE(QS8) // We test for fixed point precision [4,6] -//FIXME: COMPMID-532 -DISABLED_FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionLayerFixedPointFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallConvolutionLayerDataset(), - framework::dataset::make("ReshapeWeights", { true, false })), - framework::dataset::make("DataType", DataType::QS8)), - framework::dataset::make("FractionalBits", 4, 7))) +FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionLayerFixedPointFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallConvolutionLayerDataset(), + framework::dataset::make("ReshapeWeights", { true, false })), + framework::dataset::make("DataType", DataType::QS8)), + framework::dataset::make("FractionalBits", 4, 7))) { // Validate output validate(Accessor(_target), _reference, tolerance_q); } -//FIXME: COMPMID-532 -DISABLED_FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionLayerFixedPointFixture<int8_t>, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeConvolutionLayerDataset(), - framework::dataset::make("ReshapeWeights", { true, false })), - framework::dataset::make("DataType", DataType::QS8)), - framework::dataset::make("FractionalBits", 4, 7))) +FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionLayerFixedPointFixture<int8_t>, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeConvolutionLayerDataset(), + framework::dataset::make("ReshapeWeights", { true, false })), + framework::dataset::make("DataType", DataType::QS8)), + framework::dataset::make("FractionalBits", 4, 7))) { // Validate output validate(Accessor(_target), _reference, tolerance_q); |