diff options
Diffstat (limited to 'source/use_case/img_class/src')
| -rw-r--r-- | source/use_case/img_class/src/ImgClassProcessing.cc | 65 | ||||
| -rw-r--r-- | source/use_case/img_class/src/MainLoop.cc | 24 | ||||
| -rw-r--r-- | source/use_case/img_class/src/MobileNetModel.cc | 56 |
3 files changed, 22 insertions, 123 deletions
diff --git a/source/use_case/img_class/src/ImgClassProcessing.cc b/source/use_case/img_class/src/ImgClassProcessing.cc deleted file mode 100644 index adf9794..0000000 --- a/source/use_case/img_class/src/ImgClassProcessing.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. All rights reserved. - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "ImgClassProcessing.hpp" -#include "ImageUtils.hpp" -#include "log_macros.h" - -namespace arm { -namespace app { - - ImgClassPreProcess::ImgClassPreProcess(TfLiteTensor* inputTensor, bool convertToInt8) - :m_inputTensor{inputTensor}, - m_convertToInt8{convertToInt8} - {} - - bool ImgClassPreProcess::DoPreProcess(const void* data, size_t inputSize) - { - if (data == nullptr) { - printf_err("Data pointer is null"); - return false; - } - - auto input = static_cast<const uint8_t*>(data); - - std::memcpy(this->m_inputTensor->data.data, input, inputSize); - debug("Input tensor populated \n"); - - if (this->m_convertToInt8) { - image::ConvertImgToInt8(this->m_inputTensor->data.data, this->m_inputTensor->bytes); - } - - return true; - } - - ImgClassPostProcess::ImgClassPostProcess(TfLiteTensor* outputTensor, Classifier& classifier, - const std::vector<std::string>& labels, - std::vector<ClassificationResult>& results) - :m_outputTensor{outputTensor}, - m_imgClassifier{classifier}, - m_labels{labels}, - m_results{results} - {} - - bool ImgClassPostProcess::DoPostProcess() - { - return this->m_imgClassifier.GetClassificationResults( - this->m_outputTensor, this->m_results, - this->m_labels, 5, false); - } - -} /* namespace app */ -} /* namespace arm */
\ No newline at end of file diff --git a/source/use_case/img_class/src/MainLoop.cc b/source/use_case/img_class/src/MainLoop.cc index d9fb925..de3779f 100644 --- a/source/use_case/img_class/src/MainLoop.cc +++ b/source/use_case/img_class/src/MainLoop.cc @@ -21,7 +21,16 @@ #include "MobileNetModel.hpp" /* Model class for running inference. */ #include "UseCaseHandler.hpp" /* Handlers for different user options. */ #include "UseCaseCommonUtils.hpp" /* Utils functions. */ -#include "log_macros.h" +#include "BufAttributes.hpp" /* Buffer attributes to be applied */ + +namespace arm { + namespace app { + static uint8_t tensorArena[ACTIVATION_BUF_SZ] ACTIVATION_BUF_ATTRIBUTE; + } /* namespace app */ +} /* namespace arm */ + +extern uint8_t* GetModelPointer(); +extern size_t GetModelLen(); using ImgClassClassifier = arm::app::Classifier; @@ -30,11 +39,22 @@ void main_loop() arm::app::MobileNetModel model; /* Model wrapper object. */ /* Load the model. */ - if (!model.Init()) { + if (!model.Init(arm::app::tensorArena, + sizeof(arm::app::tensorArena), + GetModelPointer(), + GetModelLen())) { printf_err("Failed to initialise model\n"); return; } +#if !defined(ARM_NPU) + /* If it is not a NPU build check if the model contains a NPU operator */ + if (model.ContainsEthosUOperator()) { + printf_err("No driver support for Ethos-U operator found in the model.\n"); + return; + } +#endif /* ARM_NPU */ + /* Instantiate application context. */ arm::app::ApplicationContext caseContext; diff --git a/source/use_case/img_class/src/MobileNetModel.cc b/source/use_case/img_class/src/MobileNetModel.cc deleted file mode 100644 index 2e48f3b..0000000 --- a/source/use_case/img_class/src/MobileNetModel.cc +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2021 Arm Limited. All rights reserved. - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "MobileNetModel.hpp" -#include "log_macros.h" - -const tflite::MicroOpResolver& arm::app::MobileNetModel::GetOpResolver() -{ - return this->m_opResolver; -} - -bool arm::app::MobileNetModel::EnlistOperations() -{ - this->m_opResolver.AddDepthwiseConv2D(); - this->m_opResolver.AddConv2D(); - this->m_opResolver.AddAveragePool2D(); - this->m_opResolver.AddAdd(); - this->m_opResolver.AddReshape(); - this->m_opResolver.AddSoftmax(); - -#if defined(ARM_NPU) - if (kTfLiteOk == this->m_opResolver.AddEthosU()) { - info("Added %s support to op resolver\n", - tflite::GetString_ETHOSU()); - } else { - printf_err("Failed to add Arm NPU support to op resolver."); - return false; - } -#endif /* ARM_NPU */ - return true; -} - -extern uint8_t* GetModelPointer(); -const uint8_t* arm::app::MobileNetModel::ModelPointer() -{ - return GetModelPointer(); -} - -extern size_t GetModelLen(); -size_t arm::app::MobileNetModel::ModelSize() -{ - return GetModelLen(); -}
\ No newline at end of file |