diff options
| author | Richard Burton <richard.burton@arm.com> | 2022-02-14 11:55:35 +0000 |
|---|---|---|
| committer | Richard <richard.burton@arm.com> | 2022-02-14 15:02:26 +0000 |
| commit | ed35a6fea4a1604db81c56fc71f7756822fcf212 (patch) | |
| tree | f04b7d41ded8b4824978c2feaf120a3b6e1be2fb /tests/use_case | |
| parent | e2da7ee5e9732ec0d1962b7d74737b8ef5463a9e (diff) | |
| download | ml-embedded-evaluation-kit-ed35a6fea4a1604db81c56fc71f7756822fcf212.tar.gz | |
MLECO-2874: Move NMS out of the OD use_case
* Add ImageUtils
* Move image related code from UseCaseCommonUtils to ImageUtils
* Move NMS related code to ImageUtils
* Delete test specific ImageUtils and use new ImageUtils
Signed-off-by: Richard Burton <richard.burton@arm.com>
Change-Id: Icbf5dd9c6a941b0126ecdf69a0c9d9969f22729f
Diffstat (limited to 'tests/use_case')
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/use_case/img_class/InferenceTestMobilenetV2.cc b/tests/use_case/img_class/InferenceTestMobilenetV2.cc index 294215f..7e7508b 100644 --- a/tests/use_case/img_class/InferenceTestMobilenetV2.cc +++ b/tests/use_case/img_class/InferenceTestMobilenetV2.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. All rights reserved. + * Copyright (c) 2021-2022 Arm Limited. All rights reserved. * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,7 +34,7 @@ bool RunInference(arm::app::Model& model, const int8_t imageData[]) memcpy(inputTensor->data.data, imageData, copySz); if(model.IsDataSigned()){ - convertImgIoInt8(inputTensor->data.data, copySz); + arm::app::image::ConvertImgToInt8(inputTensor->data.data, copySz); } return model.RunInference(); diff --git a/tests/use_case/object_detection/InferenceTestYoloFastest.cc b/tests/use_case/object_detection/InferenceTestYoloFastest.cc index d9cabbd..b3bd408 100644 --- a/tests/use_case/object_detection/InferenceTestYoloFastest.cc +++ b/tests/use_case/object_detection/InferenceTestYoloFastest.cc @@ -66,10 +66,10 @@ bool RunInference(arm::app::Model& model, const uint8_t imageData[]) const size_t copySz = inputTensor->bytes < IMAGE_DATA_SIZE ? inputTensor->bytes : IMAGE_DATA_SIZE; - image::RgbToGrayscale(imageData,inputTensor->data.uint8,copySz); + arm::app::image::RgbToGrayscale(imageData,inputTensor->data.uint8,copySz); if(model.IsDataSigned()){ - convertImgIoInt8(inputTensor->data.data, copySz); + arm::app::image::ConvertImgToInt8(inputTensor->data.data, copySz); } return model.RunInference(); diff --git a/tests/use_case/vww/InferenceVisualWakeWordModelTests.cc b/tests/use_case/vww/InferenceVisualWakeWordModelTests.cc index 04dce0d..194099f 100644 --- a/tests/use_case/vww/InferenceVisualWakeWordModelTests.cc +++ b/tests/use_case/vww/InferenceVisualWakeWordModelTests.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. All rights reserved. + * Copyright (c) 2021-2022 Arm Limited. All rights reserved. * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,7 +34,7 @@ bool RunInference(arm::app::Model& model, const int8_t* imageData) memcpy(inputTensor->data.data, imageData, copySz); if(model.IsDataSigned()){ - convertImgIoInt8(inputTensor->data.data, copySz); + arm::app::image::ConvertImgToInt8(inputTensor->data.data, copySz); } return model.RunInference(); |