From c2a1eab661d46958c5eae6956ba72753d3240109 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Mon, 18 Mar 2019 12:46:44 +0900 Subject: [PATCH] Fix logging runtime format (#4767) Fix logging runtime format and check all runtimes Signed-off-by: Hyeongseok Oh --- runtimes/{pure_arm_compute => }/.FORMATCHECKED | 0 runtimes/logging/src/nnapi_logging.cc | 27 ++++++++------------------ runtimes/neurun/.FORMATCHECKED | 0 3 files changed, 8 insertions(+), 19 deletions(-) rename runtimes/{pure_arm_compute => }/.FORMATCHECKED (100%) delete mode 100644 runtimes/neurun/.FORMATCHECKED diff --git a/runtimes/pure_arm_compute/.FORMATCHECKED b/runtimes/.FORMATCHECKED similarity index 100% rename from runtimes/pure_arm_compute/.FORMATCHECKED rename to runtimes/.FORMATCHECKED diff --git a/runtimes/logging/src/nnapi_logging.cc b/runtimes/logging/src/nnapi_logging.cc index 7b96551..b2422e0 100644 --- a/runtimes/logging/src/nnapi_logging.cc +++ b/runtimes/logging/src/nnapi_logging.cc @@ -118,15 +118,9 @@ struct ANeuralNetworksEvent { }; -int ANeuralNetworksEvent_wait(ANeuralNetworksEvent *event) -{ - return ANEURALNETWORKS_NO_ERROR; -} +int ANeuralNetworksEvent_wait(ANeuralNetworksEvent *event) { return ANEURALNETWORKS_NO_ERROR; } -void ANeuralNetworksEvent_free(ANeuralNetworksEvent *event) -{ - delete event; -} +void ANeuralNetworksEvent_free(ANeuralNetworksEvent *event) { delete event; } // // Memory @@ -216,8 +210,7 @@ int ANeuralNetworksModel_setOperandValue(ANeuralNetworksModel *model, int32_t in return ANEURALNETWORKS_NO_ERROR; } -int ANeuralNetworksModel_setOperandValueFromMemory(ANeuralNetworksModel *model, - int32_t index, +int ANeuralNetworksModel_setOperandValueFromMemory(ANeuralNetworksModel *model, int32_t index, const ANeuralNetworksMemory *memory, size_t offset, size_t length) { @@ -257,8 +250,7 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model, const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs) { - std::cout << __FUNCTION__ << "(model: " << model - << ", type: " << type + std::cout << __FUNCTION__ << "(model: " << model << ", type: " << type << ", inputCount: " << inputCount << ", outputCount: " << outputCount << ")" << std::endl; @@ -274,11 +266,8 @@ int ANeuralNetworksModel_addOperationEx(ANeuralNetworksModel *model, return ANEURALNETWORKS_NO_ERROR; } - -int ANeuralNetworksModel_identifyInputsAndOutputs(ANeuralNetworksModel *model, - uint32_t inputCount, - const uint32_t *inputs, - uint32_t outputCount, +int ANeuralNetworksModel_identifyInputsAndOutputs(ANeuralNetworksModel *model, uint32_t inputCount, + const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs) { std::cout << __FUNCTION__ << "(model: " << model << ")" << std::endl; @@ -355,8 +344,8 @@ int ANeuralNetworksExecution_create(ANeuralNetworksCompilation *compilation, // ANeuralNetworksExecution_setInput and ANeuralNetworksExecution_setOutput specify HOST buffer for // input/output int ANeuralNetworksExecution_setInput(ANeuralNetworksExecution *execution, int32_t index, - const ANeuralNetworksOperandType *type, - const void *buffer, size_t length) + const ANeuralNetworksOperandType *type, const void *buffer, + size_t length) { std::cout << __FUNCTION__ << "(execution: " << execution << ", type: "; diff --git a/runtimes/neurun/.FORMATCHECKED b/runtimes/neurun/.FORMATCHECKED deleted file mode 100644 index e69de29..0000000 -- 2.7.4