diff options
author | Kevin Cheng <kevin.cheng@arm.com> | 2021-11-11 01:36:33 +0000 |
---|---|---|
committer | Kevin Cheng <kevin.cheng@arm.com> | 2021-11-11 16:56:17 -0800 |
commit | 545a508429afe1d22760563d252839e13ecd12a3 (patch) | |
tree | 38280879dbe9ab09387eb912d8248d8daa002acb /src | |
parent | 2752adbaab2ad4864e7d7831bf9fa87a70e797ed (diff) | |
download | serialization_lib-545a508429afe1d22760563d252839e13ecd12a3.tar.gz |
Clean up constructor interface
- replace string type constructor argument with "const string&"
- replace vector type constructor argument with "const vector<T>&"
- add rvalue reference constructor for TosaSerializationOperator and TosaSerializationBasicBlock
- add SetData() for TosaSerializationTensor, so tensor can be constructed first and data can be linked later
Signed-off-by: Kevin Cheng <kevin.cheng@arm.com>
Change-Id: I7c739df54c37b7ba69ebb6e5af118f660c7c0623
Diffstat (limited to 'src')
-rw-r--r-- | src/tosa_serialization_handler.cpp | 69 |
1 files changed, 51 insertions, 18 deletions
diff --git a/src/tosa_serialization_handler.cpp b/src/tosa_serialization_handler.cpp index a382542..547c3db 100644 --- a/src/tosa_serialization_handler.cpp +++ b/src/tosa_serialization_handler.cpp @@ -36,7 +36,7 @@ TosaSerializationTensor::TosaSerializationTensor(const flatbuffers::String* name } } -TosaSerializationTensor::TosaSerializationTensor(std::string& name, +TosaSerializationTensor::TosaSerializationTensor(const std::string& name, const std::vector<int32_t>& shape, DType dtype, const std::vector<uint8_t>& data) @@ -50,22 +50,17 @@ TosaSerializationTensor::TosaSerializationTensor(std::string& name, TosaSerializationTensor::TosaSerializationTensor() { _dtype = DType_UNKNOWN; - - _name = "UNKNOWN"; + _name = "UNKNOWN"; } TosaSerializationTensor::~TosaSerializationTensor() {} -TosaSerializationOperator::TosaSerializationOperator(Op op, - Attribute attribute_type, - const TosaAttributeBase* attribute, - QuantInfo qinfo_type, - const TosaQuantInfoBase* qinfo, - std::vector<std::string> input_tensor_names, - std::vector<std::string> output_tensor_names) +void TosaSerializationOperator::InitializeAttributeQinfo(Attribute attribute_type, + const TosaAttributeBase* attribute, + QuantInfo qinfo_type, + const TosaQuantInfoBase* qinfo) { - _op = op; _attribute_type = attribute_type; switch (attribute_type) @@ -104,25 +99,50 @@ TosaSerializationOperator::TosaSerializationOperator(Op op, } assert(_attribute && _qinfo); +} +TosaSerializationOperator::TosaSerializationOperator(Op op, + Attribute attribute_type, + const TosaAttributeBase* attribute, + QuantInfo qinfo_type, + const TosaQuantInfoBase* qinfo, + const std::vector<std::string>& input_tensor_names, + const std::vector<std::string>& output_tensor_names) +{ + _op = op; _input_tensor_names = input_tensor_names; _output_tensor_names = output_tensor_names; + + InitializeAttributeQinfo(attribute_type, attribute, qinfo_type, qinfo); +} + +TosaSerializationOperator::TosaSerializationOperator(Op op, + Attribute attribute_type, + const TosaAttributeBase* attribute, + QuantInfo qinfo_type, + const TosaQuantInfoBase* qinfo, + std::vector<std::string>&& input_tensor_names, + std::vector<std::string>&& output_tensor_names) +{ + _op = op; + _input_tensor_names = std::move(input_tensor_names); + _output_tensor_names = std::move(output_tensor_names); + + InitializeAttributeQinfo(attribute_type, attribute, qinfo_type, qinfo); } TosaSerializationOperator::~TosaSerializationOperator() { delete _attribute; delete _qinfo; - // TosaSerializationTensor should be free'd in TosaSerializationSerializationHandler destructor } -TosaSerializationBasicBlock::TosaSerializationBasicBlock(std::string name, - std::vector<TosaSerializationOperator*> operators, - std::vector<TosaSerializationTensor*> tensors, - std::vector<std::string> inputs, - std::vector<std::string> outputs) +TosaSerializationBasicBlock::TosaSerializationBasicBlock(const std::string& name, + const std::vector<TosaSerializationOperator*>& operators, + const std::vector<TosaSerializationTensor*>& tensors, + const std::vector<std::string>& inputs, + const std::vector<std::string>& outputs) { - _name = name; _operators = operators; _tensors = tensors; @@ -130,6 +150,19 @@ TosaSerializationBasicBlock::TosaSerializationBasicBlock(std::string name, _outputs = outputs; } +TosaSerializationBasicBlock::TosaSerializationBasicBlock(std::string&& name, + std::vector<TosaSerializationOperator*>&& operators, + std::vector<TosaSerializationTensor*>&& tensors, + std::vector<std::string>&& inputs, + std::vector<std::string>&& outputs) +{ + _name = std::move(name); + _operators = std::move(operators); + _tensors = std::move(tensors); + _inputs = std::move(inputs); + _outputs = std::move(outputs); +} + TosaSerializationBasicBlock::~TosaSerializationBasicBlock() { // deallocate all operators |