From 3c5a4c34df48ae3c4a7d111eff05622ae8314291 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Thu, 10 May 2018 08:58:02 +0900 Subject: [PATCH] [tflite_run] Introduce TensorDumper/Loader (#1139) Just copy of OutputTensorDumper/Loader and changed only class name. These classes will dump/load input tensors as well as output tensors which will eventually replace OutputTensorDumper/Loader. Signed-off-by: Hanjoung Lee --- tools/tflite_run/CMakeLists.txt | 2 + tools/tflite_run/src/output_tensor_dumper.h | 6 +-- tools/tflite_run/src/tensor_dumper.cc | 28 ++++++++++++++ tools/tflite_run/src/tensor_dumper.h | 26 +++++++++++++ tools/tflite_run/src/tensor_loader.cc | 60 +++++++++++++++++++++++++++++ tools/tflite_run/src/tensor_loader.h | 35 +++++++++++++++++ 6 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 tools/tflite_run/src/tensor_dumper.cc create mode 100644 tools/tflite_run/src/tensor_dumper.h create mode 100644 tools/tflite_run/src/tensor_loader.cc create mode 100644 tools/tflite_run/src/tensor_loader.h diff --git a/tools/tflite_run/CMakeLists.txt b/tools/tflite_run/CMakeLists.txt index 64d3eba..6603811 100644 --- a/tools/tflite_run/CMakeLists.txt +++ b/tools/tflite_run/CMakeLists.txt @@ -4,6 +4,8 @@ list(APPEND TFLITE_RUN_SRCS "src/bin_image.cc") list(APPEND TFLITE_RUN_SRCS "src/args.cc") list(APPEND TFLITE_RUN_SRCS "src/output_tensor_dumper.cc") list(APPEND TFLITE_RUN_SRCS "src/output_tensor_loader.cc") +list(APPEND TFLITE_RUN_SRCS "src/tensor_dumper.cc") +list(APPEND TFLITE_RUN_SRCS "src/tensor_loader.cc") add_executable(tflite_run ${TFLITE_RUN_SRCS}) target_include_directories(tflite_run PRIVATE src) diff --git a/tools/tflite_run/src/output_tensor_dumper.h b/tools/tflite_run/src/output_tensor_dumper.h index 2dad15d..4fc6f92 100644 --- a/tools/tflite_run/src/output_tensor_dumper.h +++ b/tools/tflite_run/src/output_tensor_dumper.h @@ -1,5 +1,5 @@ -#ifndef __TFLITE_RUN_TENSOR_DUMPER_H__ -#define __TFLITE_RUN_TENSOR_DUMPER_H__ +#ifndef __TFLITE_RUN_OUTPUT_TENSOR_DUMPER_H__ +#define __TFLITE_RUN_OUTPUT_TENSOR_DUMPER_H__ #include @@ -23,4 +23,4 @@ private: } // end of namespace TFLiteRun -#endif // __TFLITE_RUN_TENSOR_DUMPER_H__ +#endif // __TFLITE_RUN_OUTPUT_TENSOR_DUMPER_H__ diff --git a/tools/tflite_run/src/tensor_dumper.cc b/tools/tflite_run/src/tensor_dumper.cc new file mode 100644 index 0000000..2765e26 --- /dev/null +++ b/tools/tflite_run/src/tensor_dumper.cc @@ -0,0 +1,28 @@ +#include "tensor_dumper.h" + +#include +#include + +#include "tensorflow/contrib/lite/interpreter.h" + +namespace TFLiteRun +{ + +TensorDumper::TensorDumper(tflite::Interpreter &interpreter) : _interpreter(interpreter) +{ + // DO NOTHING +} + +void TensorDumper::dump(const std::string &filename) const +{ + // TODO Handle file open/write error + std::ofstream file(filename, std::ios::out | std::ios::binary); + for (const auto &o : _interpreter.outputs()) + { + const TfLiteTensor *tensor = _interpreter.tensor(o); + file.write(tensor->data.raw, tensor->bytes); + } + file.close(); +} + +} // end of namespace TFLiteRun diff --git a/tools/tflite_run/src/tensor_dumper.h b/tools/tflite_run/src/tensor_dumper.h new file mode 100644 index 0000000..80b4e0f --- /dev/null +++ b/tools/tflite_run/src/tensor_dumper.h @@ -0,0 +1,26 @@ +#ifndef __TFLITE_RUN_TENSOR_DUMPER_H__ +#define __TFLITE_RUN_TENSOR_DUMPER_H__ + +#include + +namespace tflite +{ +class Interpreter; +} + +namespace TFLiteRun +{ + +class TensorDumper +{ +public: + TensorDumper(tflite::Interpreter &interpreter); + void dump(const std::string &filename) const; + +private: + tflite::Interpreter &_interpreter; +}; + +} // end of namespace TFLiteRun + +#endif // __TFLITE_RUN_TENSOR_DUMPER_H__ diff --git a/tools/tflite_run/src/tensor_loader.cc b/tools/tflite_run/src/tensor_loader.cc new file mode 100644 index 0000000..613761f --- /dev/null +++ b/tools/tflite_run/src/tensor_loader.cc @@ -0,0 +1,60 @@ +#include "tensor_loader.h" + +#include + +#include + +#include "util/tensor/Shape.h" + +namespace TFLiteRun +{ + +TensorLoader::TensorLoader(tflite::Interpreter &interpreter) + : _interpreter(interpreter), _raw_data(nullptr) +{ +} + +void TensorLoader::load(const std::string &filename) +{ + // TODO Handle file open/read error + std::ifstream file(filename, std::ios::ate | std::ios::binary); + size_t file_size = file.tellg(); + file.seekg(0, std::ios::beg); + + _raw_data = std::unique_ptr(new float[file_size]); + file.read(reinterpret_cast(_raw_data.get()), file_size); + + size_t offset = 0; + for (const auto &o : _interpreter.outputs()) + { + const TfLiteTensor *tensor = _interpreter.tensor(o); + + // Convert tensor shape to `Shape` from `tensor->dims` + nnfw::util::tensor::Shape shape(static_cast(tensor->dims->size)); + for (int d = 0; d < tensor->dims->size; d++) + { + shape.dim(d) = tensor->dims->data[d]; + } + + float *base = _raw_data.get() + offset; + + assert(tensor->bytes % sizeof(float) == 0); + offset += (tensor->bytes / sizeof(float)); + + _tensor_map.insert(std::make_pair(o, nnfw::support::tflite::TensorView(shape, base))); + } + + // The file size and total output tensor size must match + assert(file_size == offset * sizeof(float)); + + file.close(); +} + +const nnfw::support::tflite::TensorView &TensorLoader::get(int tensor_idx) const +{ + auto found = _tensor_map.find(tensor_idx); + assert(found != _tensor_map.end()); + return found->second; +} + +} // end of namespace TFLiteRun diff --git a/tools/tflite_run/src/tensor_loader.h b/tools/tflite_run/src/tensor_loader.h new file mode 100644 index 0000000..f2a6991 --- /dev/null +++ b/tools/tflite_run/src/tensor_loader.h @@ -0,0 +1,35 @@ +#ifndef __TFLITE_RUN_TENSOR_LOADER_H__ +#define __TFLITE_RUN_TENSOR_LOADER_H__ + +#include + +#include +#include + +#include "support/tflite/TensorView.h" + +namespace tflite +{ +class Interpreter; +} + +namespace TFLiteRun +{ + +class TensorLoader +{ +public: + TensorLoader(tflite::Interpreter &interpreter); + void load(const std::string &filename); + const nnfw::support::tflite::TensorView &get(int tensor_idx) const; + size_t getNums() const { return _tensor_map.size(); } + +private: + tflite::Interpreter &_interpreter; + std::unique_ptr _raw_data; + std::unordered_map> _tensor_map; +}; + +} // end of namespace TFLiteRun + +#endif // __TFLITE_RUN_TENSOR_LOADER_H__ -- 2.7.4