telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 1 | // |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 2 | // Copyright © 2019-2020,2023 Arm Ltd and Contributors. All rights reserved. |
David Beck | ecb56cd | 2018-09-05 12:52:57 +0100 | [diff] [blame] | 3 | // SPDX-License-Identifier: MIT |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 4 | // |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 5 | |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 6 | #include "SplitterTestImpl.hpp" |
| 7 | |
Colm Donelan | c42a987 | 2022-02-02 16:35:09 +0000 | [diff] [blame] | 8 | #include <armnnUtils/QuantizeHelper.hpp> |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 9 | #include <ResolveType.hpp> |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 10 | |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 11 | |
Sadik Armagan | a097d2a | 2021-11-24 15:47:28 +0000 | [diff] [blame] | 12 | #include <armnnTestUtils/TensorCopyUtils.hpp> |
Colm Donelan | 0c47974 | 2021-12-10 12:43:54 +0000 | [diff] [blame] | 13 | #include <armnnTestUtils/WorkloadTestUtils.hpp> |
Aron Virginas-Tar | c9cc804 | 2018-11-01 16:15:57 +0000 | [diff] [blame] | 14 | |
Colm Donelan | c42a987 | 2022-02-02 16:35:09 +0000 | [diff] [blame] | 15 | #include <armnnTestUtils/TensorHelpers.hpp> |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 16 | |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 17 | namespace |
| 18 | { |
| 19 | |
Nattapat Chaimanowong | 649dd95 | 2019-01-22 16:10:44 +0000 | [diff] [blame] | 20 | template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 21 | std::vector<LayerTestResult<T,3>> SplitterTestCommon( |
| 22 | armnn::IWorkloadFactory& workloadFactory, |
| 23 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 24 | const armnn::ITensorHandleFactory& tensorHandleFactory, |
Teresa Charlin | acb3ec5 | 2023-04-03 19:57:00 +0100 | [diff] [blame] | 25 | float qScale = 1.0f, |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 26 | int32_t qOffset = 0) |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 27 | { |
Jan Eilers | 8eb2560 | 2020-03-09 12:13:48 +0000 | [diff] [blame] | 28 | IgnoreUnused(memoryManager); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 29 | unsigned int inputWidth = 5; |
| 30 | unsigned int inputHeight = 6; |
| 31 | unsigned int inputChannels = 3; |
| 32 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 33 | // NOTE: Compute Library imposes a restriction that the x and y dimension (input height and width) |
| 34 | // cannot be split. |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 35 | // For the reasons for this, see first comment on https://jira.arm.com/browse/IVGCVSW-1239 |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 36 | // |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 37 | // This test has therefore been recast to split the channels, then split the resulting subtensor. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 38 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 39 | // To take channel 0 of original output |
| 40 | // and channel 0 and channel 1 of the split subtensor. |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 41 | unsigned int outputWidth1 = inputWidth; |
| 42 | unsigned int outputHeight1 = inputHeight; |
| 43 | unsigned int outputChannels1 = 1; |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 44 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 45 | // To take channel 1 and 2 of the original output. |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 46 | unsigned int outputWidth2 = inputWidth; |
| 47 | unsigned int outputHeight2 = inputHeight; |
| 48 | unsigned int outputChannels2 = 2; |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 49 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 50 | // Define the tensor descriptors. |
Ruomei Yan | 25339c3 | 2019-05-28 16:48:20 +0100 | [diff] [blame] | 51 | armnn::TensorInfo inputTensorInfo({ inputChannels, inputHeight, inputWidth }, ArmnnType, qScale, qOffset); |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 52 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 53 | // Outputs of the original split. |
Ruomei Yan | 25339c3 | 2019-05-28 16:48:20 +0100 | [diff] [blame] | 54 | armnn::TensorInfo outputTensorInfo1({ outputChannels1, outputHeight1, outputWidth1 }, ArmnnType, qScale, qOffset); |
| 55 | armnn::TensorInfo outputTensorInfo2({ outputChannels2, outputHeight2, outputWidth2 }, ArmnnType, qScale, qOffset); |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 56 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 57 | // Outputs of the subsequent subtensor split. |
Ruomei Yan | 25339c3 | 2019-05-28 16:48:20 +0100 | [diff] [blame] | 58 | armnn::TensorInfo outputTensorInfo3({ outputChannels1, outputHeight1, outputWidth1 }, ArmnnType, qScale, qOffset); |
| 59 | armnn::TensorInfo outputTensorInfo4({ outputChannels1, outputHeight1, outputWidth1 }, ArmnnType, qScale, qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 60 | |
| 61 | // Set quantization parameters if the requested type is a quantized type. |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 62 | // The quantization doesn't really matter as the splitter operator doesn't dequantize/quantize. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 63 | if(armnn::IsQuantizedType<T>()) |
| 64 | { |
| 65 | inputTensorInfo.SetQuantizationScale(qScale); |
| 66 | inputTensorInfo.SetQuantizationOffset(qOffset); |
| 67 | outputTensorInfo1.SetQuantizationScale(qScale); |
| 68 | outputTensorInfo1.SetQuantizationOffset(qOffset); |
| 69 | outputTensorInfo2.SetQuantizationScale(qScale); |
| 70 | outputTensorInfo2.SetQuantizationOffset(qOffset); |
| 71 | outputTensorInfo3.SetQuantizationScale(qScale); |
| 72 | outputTensorInfo3.SetQuantizationOffset(qOffset); |
| 73 | outputTensorInfo4.SetQuantizationScale(qScale); |
| 74 | outputTensorInfo4.SetQuantizationOffset(qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 75 | } |
| 76 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 77 | auto input = armnnUtils::QuantizedVector<T>( |
| 78 | { |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 79 | 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, |
| 80 | 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, |
| 81 | 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, |
| 82 | 16.0f, 17.0f, 18.0f, 19.0f, 20.0f, |
| 83 | 21.0f, 22.0f, 23.0f, 24.0f, 25.0f, |
| 84 | 26.0f, 27.0f, 28.0f, 29.0f, 30.0f, |
| 85 | |
| 86 | 31.0f, 32.0f, 33.0f, 34.0f, 35.0f, |
| 87 | 36.0f, 37.0f, 38.0f, 39.0f, 40.0f, |
| 88 | 41.0f, 42.0f, 43.0f, 44.0f, 45.0f, |
| 89 | 46.0f, 47.0f, 48.0f, 49.0f, 50.0f, |
| 90 | 51.0f, 52.0f, 53.0f, 54.0f, 55.0f, |
| 91 | 56.0f, 57.0f, 58.0f, 59.0f, 60.0f, |
| 92 | |
| 93 | 61.0f, 62.0f, 63.0f, 64.0f, 65.0f, |
| 94 | 66.0f, 67.0f, 68.0f, 69.0f, 70.0f, |
| 95 | 71.0f, 72.0f, 73.0f, 74.0f, 75.0f, |
| 96 | 76.0f, 77.0f, 78.0f, 79.0f, 80.0f, |
| 97 | 81.0f, 82.0f, 83.0f, 84.0f, 85.0f, |
| 98 | 86.0f, 87.0f, 88.0f, 89.0f, 90.0f, |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 99 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 100 | qScale, qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 101 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 102 | // Channel 0 of the original input. |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 103 | auto expectedData1 = armnnUtils::QuantizedVector<T>( |
| 104 | { |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 105 | 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, |
| 106 | 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, |
| 107 | 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, |
| 108 | 16.0f, 17.0f, 18.0f, 19.0f, 20.0f, |
| 109 | 21.0f, 22.0f, 23.0f, 24.0f, 25.0f, |
| 110 | 26.0f, 27.0f, 28.0f, 29.0f, 30.0f, |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 111 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 112 | qScale, qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 113 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 114 | // Channel 1 & 2 of the original input. |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 115 | auto expectedData2 = armnnUtils::QuantizedVector<T>( |
| 116 | { |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 117 | 31.0f, 32.0f, 33.0f, 34.0f, 35.0f, |
| 118 | 36.0f, 37.0f, 38.0f, 39.0f, 40.0f, |
| 119 | 41.0f, 42.0f, 43.0f, 44.0f, 45.0f, |
| 120 | 46.0f, 47.0f, 48.0f, 49.0f, 50.0f, |
| 121 | 51.0f, 52.0f, 53.0f, 54.0f, 55.0f, |
| 122 | 56.0f, 57.0f, 58.0f, 59.0f, 60.0f, |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 123 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 124 | 61.0f, 62.0f, 63.0f, 64.0f, 65.0f, |
| 125 | 66.0f, 67.0f, 68.0f, 69.0f, 70.0f, |
| 126 | 71.0f, 72.0f, 73.0f, 74.0f, 75.0f, |
| 127 | 76.0f, 77.0f, 78.0f, 79.0f, 80.0f, |
| 128 | 81.0f, 82.0f, 83.0f, 84.0f, 85.0f, |
| 129 | 86.0f, 87.0f, 88.0f, 89.0f, 90.0f, |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 130 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 131 | qScale, qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 132 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 133 | // Channel 0 of return 2 (i.e. channels 1 and 2 of the original input). |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 134 | auto expectedData3 = armnnUtils::QuantizedVector<T>( |
| 135 | { |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 136 | 31.0f, 32.0f, 33.0f, 34.0f, 35.0f, |
| 137 | 36.0f, 37.0f, 38.0f, 39.0f, 40.0f, |
| 138 | 41.0f, 42.0f, 43.0f, 44.0f, 45.0f, |
| 139 | 46.0f, 47.0f, 48.0f, 49.0f, 50.0f, |
| 140 | 51.0f, 52.0f, 53.0f, 54.0f, 55.0f, |
| 141 | 56.0f, 57.0f, 58.0f, 59.0f, 60.0f, |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 142 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 143 | qScale, qOffset); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 144 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 145 | // Channel 1 of return 2. |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 146 | auto expectedData4 = armnnUtils::QuantizedVector<T>( |
| 147 | { |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 148 | 61.0f, 62.0f, 63.0f, 64.0f, 65.0f, |
| 149 | 66.0f, 67.0f, 68.0f, 69.0f, 70.0f, |
| 150 | 71.0f, 72.0f, 73.0f, 74.0f, 75.0f, |
| 151 | 76.0f, 77.0f, 78.0f, 79.0f, 80.0f, |
| 152 | 81.0f, 82.0f, 83.0f, 84.0f, 85.0f, |
| 153 | 86.0f, 87.0f, 88.0f, 89.0f, 90.0f, |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 154 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 155 | qScale, qOffset); |
| 156 | |
| 157 | std::vector<T> actualData1(outputTensorInfo1.GetNumElements()); |
| 158 | std::vector<T> actualData2(outputTensorInfo2.GetNumElements()); |
| 159 | std::vector<T> actualData3(outputTensorInfo3.GetNumElements()); |
| 160 | std::vector<T> actualData4(outputTensorInfo4.GetNumElements()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 161 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 162 | // NOTE: as a corollary of the splitting of x and y restriction the x and y values of the view origins |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 163 | // have to be zero, the co-ordinates are as per the tensor info above channels, height/y, width/x |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 164 | // note that under the hood the compute engine reverses these i.e. its coordinate system is x, y, channels. |
| 165 | std::vector<unsigned int> wOrigin1 = {0, 0, 0}; //Extent of the window is defined by size of output[0]. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 166 | armnn::SplitterQueueDescriptor::ViewOrigin window1(wOrigin1); |
| 167 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 168 | std::vector<unsigned int> wOrigin2 = {1, 0, 0}; //Extent of the window is defined by size of output[1]. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 169 | armnn::SplitterQueueDescriptor::ViewOrigin window2(wOrigin2); |
| 170 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 171 | std::vector<unsigned int> wOrigin3 = {0, 0, 0}; //Extent of the window is defined by size of output[2]. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 172 | armnn::SplitterQueueDescriptor::ViewOrigin window3(wOrigin3); |
| 173 | |
telsoa01 | c577f2c | 2018-08-31 09:22:23 +0100 | [diff] [blame] | 174 | std::vector<unsigned int> wOrigin4 = {1, 0, 0}; //Extent of the window is defined by size of output[3]. |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 175 | armnn::SplitterQueueDescriptor::ViewOrigin window4(wOrigin4); |
| 176 | |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 177 | bool subTensorsSupported = tensorHandleFactory.SupportsSubTensors(); |
| 178 | std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 179 | |
| 180 | std::unique_ptr<armnn::ITensorHandle> outputHandle1 = |
| 181 | subTensorsSupported ? |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 182 | tensorHandleFactory.CreateSubTensorHandle(*inputHandle, outputTensorInfo1.GetShape(), wOrigin1.data()) : |
| 183 | tensorHandleFactory.CreateTensorHandle(outputTensorInfo1); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 184 | |
| 185 | std::unique_ptr<armnn::ITensorHandle> outputHandle2 = |
| 186 | subTensorsSupported ? |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 187 | tensorHandleFactory.CreateSubTensorHandle(*inputHandle, outputTensorInfo2.GetShape(), wOrigin2.data()) : |
| 188 | tensorHandleFactory.CreateTensorHandle(outputTensorInfo2); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 189 | |
| 190 | std::unique_ptr<armnn::ITensorHandle> outputHandle3 = |
| 191 | subTensorsSupported ? |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 192 | tensorHandleFactory.CreateSubTensorHandle(*outputHandle2, outputTensorInfo3.GetShape(), wOrigin3.data()) : |
| 193 | tensorHandleFactory.CreateTensorHandle(outputTensorInfo3); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 194 | |
| 195 | std::unique_ptr<armnn::ITensorHandle> outputHandle4 = |
| 196 | subTensorsSupported ? |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 197 | tensorHandleFactory.CreateSubTensorHandle(*outputHandle2, outputTensorInfo4.GetShape(), wOrigin4.data()) : |
| 198 | tensorHandleFactory.CreateTensorHandle(outputTensorInfo4); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 199 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 200 | // Do the first split |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 201 | armnn::SplitterQueueDescriptor data; |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 202 | data.m_Parameters = armnn::SplitterDescriptor(2, 3); |
| 203 | |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 204 | armnn::WorkloadInfo info; |
| 205 | AddInputToWorkload(data, info, inputTensorInfo, inputHandle.get()); |
| 206 | AddOutputToWorkload(data, info, outputTensorInfo1, outputHandle1.get()); |
| 207 | AddOutputToWorkload(data, info, outputTensorInfo2, outputHandle2.get()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 208 | |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 209 | data.m_Parameters.SetViewSize(0, 0, outputChannels1); |
| 210 | data.m_Parameters.SetViewSize(0, 1, outputHeight1); |
| 211 | data.m_Parameters.SetViewSize(0, 2, outputWidth1); |
| 212 | |
| 213 | data.m_Parameters.SetViewSize(1, 0, outputChannels2); |
| 214 | data.m_Parameters.SetViewSize(1, 1, outputHeight2); |
| 215 | data.m_Parameters.SetViewSize(1, 2, outputWidth2); |
| 216 | |
| 217 | data.m_Parameters.SetViewOriginCoord(0, 0, 0); |
| 218 | data.m_Parameters.SetViewOriginCoord(0, 1, 0); |
| 219 | data.m_Parameters.SetViewOriginCoord(0, 2, 0); |
| 220 | |
| 221 | data.m_Parameters.SetViewOriginCoord(1, 0, 1); |
| 222 | data.m_Parameters.SetViewOriginCoord(1, 1, 0); |
| 223 | data.m_Parameters.SetViewOriginCoord(1, 2, 0); |
| 224 | |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 225 | data.m_ViewOrigins.push_back(window1); |
| 226 | data.m_ViewOrigins.push_back(window2); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 227 | |
Teresa Charlin | 611c7fb | 2022-01-07 09:47:29 +0000 | [diff] [blame] | 228 | std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Splitter, |
| 229 | data, |
| 230 | info); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 231 | |
| 232 | inputHandle->Allocate(); |
| 233 | outputHandle1->Allocate(); |
| 234 | outputHandle2->Allocate(); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 235 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 236 | CopyDataToITensorHandle(inputHandle.get(), input.data()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 237 | |
| 238 | workload->Execute(); |
| 239 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 240 | CopyDataFromITensorHandle(actualData1.data(), outputHandle1.get()); |
| 241 | CopyDataFromITensorHandle(actualData2.data(), outputHandle2.get()); |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 242 | |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 243 | // Do the second split. |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 244 | armnn::SplitterQueueDescriptor data2; |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 245 | data2.m_Parameters = armnn::SplitterDescriptor(2, 3); |
| 246 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 247 | armnn::WorkloadInfo info2; |
| 248 | AddInputToWorkload(data2, info2, outputTensorInfo2, outputHandle2.get()); |
| 249 | AddOutputToWorkload(data2, info2, outputTensorInfo3, outputHandle3.get()); |
| 250 | AddOutputToWorkload(data2, info2, outputTensorInfo4, outputHandle4.get()); |
| 251 | |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 252 | data2.m_Parameters.SetViewSize(0, 0, outputChannels1); |
| 253 | data2.m_Parameters.SetViewSize(0, 1, outputHeight1); |
| 254 | data2.m_Parameters.SetViewSize(0, 2, outputWidth1); |
| 255 | |
| 256 | data2.m_Parameters.SetViewSize(1, 0, outputChannels2); |
| 257 | data2.m_Parameters.SetViewSize(1, 1, outputHeight2); |
| 258 | data2.m_Parameters.SetViewSize(1, 2, outputWidth1); |
| 259 | |
| 260 | data2.m_Parameters.SetViewOriginCoord(0, 0, 0); |
| 261 | data2.m_Parameters.SetViewOriginCoord(0, 1, 0); |
| 262 | data2.m_Parameters.SetViewOriginCoord(0, 2, 0); |
| 263 | |
| 264 | data2.m_Parameters.SetViewOriginCoord(1, 0, 1); |
| 265 | data2.m_Parameters.SetViewOriginCoord(1, 1, 0); |
| 266 | data2.m_Parameters.SetViewOriginCoord(1, 2, 0); |
| 267 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 268 | data2.m_ViewOrigins.push_back(window3); |
| 269 | data2.m_ViewOrigins.push_back(window4); |
| 270 | |
Teresa Charlin | 611c7fb | 2022-01-07 09:47:29 +0000 | [diff] [blame] | 271 | std::unique_ptr<armnn::IWorkload> workload2 = workloadFactory.CreateWorkload(armnn::LayerType::Splitter, |
| 272 | data2, |
| 273 | info2); |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 274 | |
| 275 | outputHandle3->Allocate(); |
| 276 | outputHandle4->Allocate(); |
| 277 | |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 278 | ExecuteWorkload(*workload2, memoryManager); |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 279 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 280 | CopyDataFromITensorHandle(actualData3.data(), outputHandle3.get()); |
| 281 | CopyDataFromITensorHandle(actualData4.data(), outputHandle4.get()); |
| 282 | |
| 283 | LayerTestResult<T,3> ret1(actualData1, expectedData1, outputHandle1->GetShape(), outputTensorInfo1.GetShape()); |
| 284 | LayerTestResult<T,3> ret2(actualData2, expectedData2, outputHandle2->GetShape(), outputTensorInfo2.GetShape()); |
| 285 | LayerTestResult<T,3> ret3(actualData3, expectedData3, outputHandle3->GetShape(), outputTensorInfo3.GetShape()); |
| 286 | LayerTestResult<T,3> ret4(actualData4, expectedData4, outputHandle4->GetShape(), outputTensorInfo4.GetShape()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 287 | |
surmeh01 | 3537c2c | 2018-05-18 16:31:43 +0100 | [diff] [blame] | 288 | std::vector<LayerTestResult<T,3>> ret = {ret1, ret2, ret3, ret4,}; |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 289 | |
| 290 | return ret; |
| 291 | } |
| 292 | |
Nattapat Chaimanowong | 649dd95 | 2019-01-22 16:10:44 +0000 | [diff] [blame] | 293 | template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 294 | LayerTestResult<T, 3> CopyViaSplitterTestImpl( |
| 295 | armnn::IWorkloadFactory& workloadFactory, |
| 296 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 297 | const armnn::ITensorHandleFactory& tensorHandleFactory, |
Aron Virginas-Tar | 5caf907 | 2018-11-14 18:35:18 +0000 | [diff] [blame] | 298 | float qScale, int32_t qOffset) |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 299 | { |
Jan Eilers | 8eb2560 | 2020-03-09 12:13:48 +0000 | [diff] [blame] | 300 | IgnoreUnused(memoryManager); |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 301 | |
Ruomei Yan | 25339c3 | 2019-05-28 16:48:20 +0100 | [diff] [blame] | 302 | const armnn::TensorInfo tensorInfo({ 3, 6, 5 }, ArmnnType, qScale, qOffset); |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 303 | auto input = armnnUtils::QuantizedVector<T>( |
| 304 | { |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 305 | 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, |
| 306 | 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, |
| 307 | 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, |
| 308 | 16.0f, 17.0f, 18.0f, 19.0f, 20.0f, |
| 309 | 21.0f, 22.0f, 23.0f, 24.0f, 25.0f, |
| 310 | 26.0f, 27.0f, 28.0f, 29.0f, 30.0f, |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 311 | |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 312 | 31.0f, 32.0f, 33.0f, 34.0f, 35.0f, |
| 313 | 36.0f, 37.0f, 38.0f, 39.0f, 40.0f, |
| 314 | 41.0f, 42.0f, 43.0f, 44.0f, 45.0f, |
| 315 | 46.0f, 47.0f, 48.0f, 49.0f, 50.0f, |
| 316 | 51.0f, 52.0f, 53.0f, 54.0f, 55.0f, |
| 317 | 56.0f, 57.0f, 58.0f, 59.0f, 60.0f, |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 318 | |
Aron Virginas-Tar | 48623a0 | 2019-10-22 10:00:28 +0100 | [diff] [blame] | 319 | 61.0f, 62.0f, 63.0f, 64.0f, 65.0f, |
| 320 | 66.0f, 67.0f, 68.0f, 69.0f, 70.0f, |
| 321 | 71.0f, 72.0f, 73.0f, 74.0f, 75.0f, |
| 322 | 76.0f, 77.0f, 78.0f, 79.0f, 80.0f, |
| 323 | 81.0f, 82.0f, 83.0f, 84.0f, 85.0f, |
| 324 | 86.0f, 87.0f, 88.0f, 89.0f, 90.0f, |
| 325 | }, |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 326 | qScale, qOffset); |
| 327 | |
| 328 | std::vector<T> actualOutput(tensorInfo.GetNumElements()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 329 | |
| 330 | std::vector<unsigned int> origin = { 0, 0, 0 }; |
| 331 | armnn::SplitterQueueDescriptor::ViewOrigin window(origin); |
| 332 | |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 333 | const bool subTensorsSupported = tensorHandleFactory.SupportsSubTensors(); |
| 334 | std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(tensorInfo); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 335 | |
| 336 | std::unique_ptr<armnn::ITensorHandle> outputHandle = |
| 337 | subTensorsSupported ? |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 338 | tensorHandleFactory.CreateSubTensorHandle(*inputHandle, tensorInfo.GetShape(), origin.data()) : |
| 339 | tensorHandleFactory.CreateTensorHandle(tensorInfo); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 340 | |
| 341 | armnn::SplitterQueueDescriptor data; |
| 342 | armnn::WorkloadInfo info; |
| 343 | AddInputToWorkload(data, info, tensorInfo, inputHandle.get()); |
| 344 | AddOutputToWorkload(data, info, tensorInfo, outputHandle.get()); |
| 345 | |
Mike Kelly | 4980e21 | 2023-08-04 13:35:41 +0100 | [diff] [blame^] | 346 | data.m_Parameters = armnn::SplitterDescriptor(1, 3); |
| 347 | data.m_Parameters.SetAxis(0); |
| 348 | |
| 349 | data.m_Parameters.SetViewSize(0, 0, 3); |
| 350 | data.m_Parameters.SetViewSize(0, 1, 6); |
| 351 | data.m_Parameters.SetViewSize(0, 2, 5); |
| 352 | |
| 353 | data.m_Parameters.SetViewOriginCoord(0, 0, 0); |
| 354 | data.m_Parameters.SetViewOriginCoord(0, 1, 0); |
| 355 | data.m_Parameters.SetViewOriginCoord(0, 2, 0); |
| 356 | |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 357 | data.m_ViewOrigins.push_back(window); |
| 358 | |
Teresa Charlin | 611c7fb | 2022-01-07 09:47:29 +0000 | [diff] [blame] | 359 | std::unique_ptr<armnn::IWorkload> workload = workloadFactory.CreateWorkload(armnn::LayerType::Splitter, |
| 360 | data, |
| 361 | info); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 362 | |
| 363 | inputHandle->Allocate(); |
| 364 | outputHandle->Allocate(); |
| 365 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 366 | CopyDataToITensorHandle(inputHandle.get(), input.data()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 367 | |
| 368 | workload->Execute(); |
| 369 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 370 | CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 371 | |
Sadik Armagan | 483c811 | 2021-06-01 09:24:52 +0100 | [diff] [blame] | 372 | return LayerTestResult<T, 3>(actualOutput, |
| 373 | input, |
| 374 | outputHandle->GetShape(), |
| 375 | tensorInfo.GetShape()); |
telsoa01 | 4fcda01 | 2018-03-09 14:13:49 +0000 | [diff] [blame] | 376 | } |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 377 | |
| 378 | } // anonymous namespace |
| 379 | |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 380 | std::vector<LayerTestResult<float,3>> SplitterFloat32Test( |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 381 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 382 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 383 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 384 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 385 | return SplitterTestCommon<armnn::DataType::Float32>(workloadFactory, memoryManager, tensorHandleFactory); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 386 | } |
| 387 | |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 388 | std::vector<LayerTestResult<armnn::Half,3>> SplitterFloat16Test( |
| 389 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 390 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 391 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 392 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 393 | return SplitterTestCommon<armnn::DataType::Float16>(workloadFactory, memoryManager, tensorHandleFactory); |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 394 | } |
| 395 | |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 396 | std::vector<LayerTestResult<uint8_t,3>> SplitterUint8Test( |
| 397 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 398 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 399 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 400 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 401 | return SplitterTestCommon<armnn::DataType::QAsymmU8>(workloadFactory, memoryManager, tensorHandleFactory, 1.0f, 0); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 402 | } |
| 403 | |
| 404 | std::vector<LayerTestResult<int16_t,3>> SplitterInt16Test( |
| 405 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 406 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 407 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 408 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 409 | return SplitterTestCommon<armnn::DataType::QSymmS16>(workloadFactory, memoryManager, tensorHandleFactory, 1.0f, 0); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 410 | } |
| 411 | |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 412 | LayerTestResult<float, 3> CopyViaSplitterFloat32Test( |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 413 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 414 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 415 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 416 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 417 | return CopyViaSplitterTestImpl<armnn::DataType::Float32>(workloadFactory, |
| 418 | memoryManager, |
| 419 | tensorHandleFactory, |
| 420 | 0.0f, |
| 421 | 0); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 422 | } |
| 423 | |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 424 | LayerTestResult<armnn::Half, 3> CopyViaSplitterFloat16Test( |
| 425 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 426 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 427 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 428 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 429 | return CopyViaSplitterTestImpl<armnn::DataType::Float16>(workloadFactory, |
| 430 | memoryManager, |
| 431 | tensorHandleFactory, |
| 432 | 0.0f, |
| 433 | 0); |
Matthew Jackson | 9bff144 | 2019-09-12 09:08:23 +0100 | [diff] [blame] | 434 | } |
| 435 | |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 436 | LayerTestResult<uint8_t, 3> CopyViaSplitterUint8Test( |
| 437 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 438 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 439 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 440 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 441 | return CopyViaSplitterTestImpl<armnn::DataType::QAsymmU8>(workloadFactory, |
| 442 | memoryManager, |
| 443 | tensorHandleFactory, |
| 444 | 1.0f, |
| 445 | 0); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 446 | } |
| 447 | |
| 448 | LayerTestResult<int16_t, 3> CopyViaSplitterInt16Test( |
| 449 | armnn::IWorkloadFactory& workloadFactory, |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 450 | const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, |
| 451 | const armnn::ITensorHandleFactory& tensorHandleFactory) |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 452 | { |
Sadik Armagan | 5e71984 | 2020-08-28 12:17:33 +0100 | [diff] [blame] | 453 | return CopyViaSplitterTestImpl<armnn::DataType::QSymmS16>(workloadFactory, |
| 454 | memoryManager, |
| 455 | tensorHandleFactory, |
| 456 | 1.0f, |
| 457 | 0); |
Aron Virginas-Tar | 00d306e | 2019-08-28 18:08:46 +0100 | [diff] [blame] | 458 | } |