From 3bb1bc1189bfa14670d2f7839d708f443f5b5942 Mon Sep 17 00:00:00 2001 From: Kevin Cheng Date: Thu, 17 Jun 2021 15:57:08 -0700 Subject: Constant data is embedded in flatbuffer as u8 array instead of saving out as separate numpy files now. Change-Id: I9d757ee3bdc637595732b06c5319d1dc957eaf96 --- include/tosa_generated.h | 25 +++++++++++++------------ include/tosa_serialization_handler.h | 29 +++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 18 deletions(-) (limited to 'include') diff --git a/include/tosa_generated.h b/include/tosa_generated.h index 735aca8..0f73819 100644 --- a/include/tosa_generated.h +++ b/include/tosa_generated.h @@ -1951,7 +1951,7 @@ struct TosaTensor FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_NAME = 4, VT_SHAPE = 6, VT_TYPE = 8, - VT_NPY_FILENAME = 10 + VT_DATA = 10 }; const flatbuffers::String *name() const { return GetPointer(VT_NAME); @@ -1962,8 +1962,8 @@ struct TosaTensor FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { tosa::DType type() const { return static_cast(GetField(VT_TYPE, 0)); } - const flatbuffers::String *npy_filename() const { - return GetPointer(VT_NPY_FILENAME); + const flatbuffers::Vector *data() const { + return GetPointer *>(VT_DATA); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -1972,8 +1972,8 @@ struct TosaTensor FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyOffset(verifier, VT_SHAPE) && verifier.VerifyVector(shape()) && VerifyField(verifier, VT_TYPE) && - VerifyOffset(verifier, VT_NPY_FILENAME) && - verifier.VerifyString(npy_filename()) && + VerifyOffset(verifier, VT_DATA) && + verifier.VerifyVector(data()) && verifier.EndTable(); } }; @@ -1991,8 +1991,8 @@ struct TosaTensorBuilder { void add_type(tosa::DType type) { fbb_.AddElement(TosaTensor::VT_TYPE, static_cast(type), 0); } - void add_npy_filename(flatbuffers::Offset npy_filename) { - fbb_.AddOffset(TosaTensor::VT_NPY_FILENAME, npy_filename); + void add_data(flatbuffers::Offset> data) { + fbb_.AddOffset(TosaTensor::VT_DATA, data); } explicit TosaTensorBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -2011,9 +2011,9 @@ inline flatbuffers::Offset CreateTosaTensor( flatbuffers::Offset name = 0, flatbuffers::Offset> shape = 0, tosa::DType type = tosa::DType_UNKNOWN, - flatbuffers::Offset npy_filename = 0) { + flatbuffers::Offset> data = 0) { TosaTensorBuilder builder_(_fbb); - builder_.add_npy_filename(npy_filename); + builder_.add_data(data); builder_.add_type(type); builder_.add_shape(shape); builder_.add_name(name); @@ -2025,16 +2025,17 @@ inline flatbuffers::Offset CreateTosaTensorDirect( const char *name = nullptr, const std::vector *shape = nullptr, tosa::DType type = tosa::DType_UNKNOWN, - const char *npy_filename = nullptr) { + const std::vector *data = nullptr) { auto name__ = name ? _fbb.CreateString(name) : 0; auto shape__ = shape ? _fbb.CreateVector(*shape) : 0; - auto npy_filename__ = npy_filename ? _fbb.CreateString(npy_filename) : 0; + if (data) { _fbb.ForceVectorAlignment(data->size(), sizeof(uint8_t), 8); } + auto data__ = data ? _fbb.CreateVector(*data) : 0; return tosa::CreateTosaTensor( _fbb, name__, shape__, type, - npy_filename__); + data__); } struct TosaOperator FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { diff --git a/include/tosa_serialization_handler.h b/include/tosa_serialization_handler.h index 398590d..db9481b 100644 --- a/include/tosa_serialization_handler.h +++ b/include/tosa_serialization_handler.h @@ -26,6 +26,8 @@ #include #include +#define TENSOR_BUFFER_FORCE_ALIGNMENT 8 + namespace tosa { @@ -108,13 +110,13 @@ class TosaSerializationTensor public: // constructor and destructor TosaSerializationTensor(const flatbuffers::String* name, - const flatbuffers::Vector& shape, + const flatbuffers::Vector* shape, DType dtype, - const flatbuffers::String* npy_filename); + const flatbuffers::Vector* data); TosaSerializationTensor(std::string& name, const std::vector& shape, DType dtype, - const std::string& npy_filename); + const std::vector& data); TosaSerializationTensor(); ~TosaSerializationTensor(); @@ -131,9 +133,9 @@ public: { return _dtype; } - const std::string& GetNpyFilePtr() const + const std::vector& GetData() const { - return _npy_filename; + return _data; } // modifier @@ -150,7 +152,7 @@ private: DType _dtype; /* data type enumeration, see tosa_isa_generated.h */ std::vector _shape; /* shape of the tensor */ std::string _name; /* name of the tensor, used for solving dependency */ - std::string _npy_filename; /* numpy array filename if not null. so null is the distinguisher */ + std::vector _data; /* data array */ }; class TosaSerializationOperator @@ -283,6 +285,21 @@ public: tosa_err_t SaveFileTosaFlatbuffer(const char* filename); tosa_err_t LoadFileSchema(const char* schema_filename); + // data format conversion. little-endian. + static tosa_err_t ConvertF32toU8(const std::vector& in, std::vector& out); + static tosa_err_t ConvertI48toU8(const std::vector& in, std::vector& out); + static tosa_err_t ConvertI32toU8(const std::vector& in, std::vector& out); + static tosa_err_t ConvertI16toU8(const std::vector& in, std::vector& out); + static tosa_err_t ConvertI8toU8(const std::vector& in, std::vector& out); + static tosa_err_t ConvertBooltoU8(const std::vector& in, std::vector& out); + + static tosa_err_t ConvertU8toF32(const std::vector& in, uint32_t out_size, std::vector& out); + static tosa_err_t ConvertU8toI48(const std::vector& in, uint32_t out_size, std::vector& out); + static tosa_err_t ConvertU8toI32(const std::vector& in, uint32_t out_size, std::vector& out); + static tosa_err_t ConvertU8toI16(const std::vector& in, uint32_t out_size, std::vector& out); + static tosa_err_t ConvertU8toI8(const std::vector& in, uint32_t out_size, std::vector& out); + static tosa_err_t ConvertU8toBool(const std::vector& in, uint32_t out_size, std::vector& out); + // version const TosaVersion& GetTosaVersion() const { -- cgit v1.2.1