colin
/
TIM-VX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set graph attributes when compile graph to binary 

Keep the same graph attributes as compile graph

Signed-off-by: Kee <xuke537@hotmail.com>
This commit is contained in:
Kee 2022-08-11 17:37:52 +08:00 committed by Sven
parent 5482760ba2
commit 96d186c8d2
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tim/vx/graph.cc
View File

@ -154,7 +154,7 @@ std::shared_ptr<Tensor> GraphImpl::CreateTensorPlaceHolder() {
return tensor_placeholder_; return tensor_placeholder_;
} }
bool GraphImpl::Compile() { bool GraphImpl::Setup() {
bool status = true; bool status = true;
auto major = vsi_nn_GetVersionMajor(); auto major = vsi_nn_GetVersionMajor();
@ -180,7 +180,13 @@ bool GraphImpl::Compile() {
std::call_once(setup_once_, [&status, this]() { std::call_once(setup_once_, [&status, this]() {
status = (VSI_SUCCESS == vsi_nn_SetupGraph(this->graph_, true)); status = (VSI_SUCCESS == vsi_nn_SetupGraph(this->graph_, true));
}); });
return status;
}
bool GraphImpl::Compile() {
bool status = true;
status = Setup();
std::call_once(verify_graph_once_, [&status, this]() { std::call_once(verify_graph_once_, [&status, this]() {
status = (VSI_SUCCESS == vsi_nn_VerifyGraph(this->graph_)); status = (VSI_SUCCESS == vsi_nn_VerifyGraph(this->graph_));
}); });
@ -189,19 +195,7 @@ bool GraphImpl::Compile() {
} }
bool GraphImpl::CompileToBinary(void* buf, size_t* size) { bool GraphImpl::CompileToBinary(void* buf, size_t* size) {
bool status = true; return ((Setup()) && (VSI_SUCCESS == vsi_nn_GenerateNBG(graph_, buf, size)));
std::call_once(setio_once_, [&status, this]() {
status = (vsi_nn_SetGraphInputs(this->graph_, this->inputs_.data(),
this->inputs_.size()) &&
vsi_nn_SetGraphOutputs(this->graph_, this->outputs_.data(),
this->outputs_.size()));
});
std::call_once(setup_once_, [&status, this]() {
status = (VSI_SUCCESS == vsi_nn_SetupGraph(this->graph_, true));
});
return ((status) && (VSI_SUCCESS == vsi_nn_GenerateNBG(graph_, buf, size)));
} }
bool GraphImpl::Run() { bool GraphImpl::Run() {

3
src/tim/vx/graph_private.h
View File

@ -93,6 +93,9 @@ class GraphImpl : public Graph {
std::map<std::shared_ptr<Tensor>, std::shared_ptr<Operation>> tensor_producer_; std::map<std::shared_ptr<Tensor>, std::shared_ptr<Operation>> tensor_producer_;
CompileOption options_; CompileOption options_;
private:
/// Setup graph
bool Setup();
}; };
} // namespace vx } // namespace vx