fix gather timvx op test & rename savegraph (#946)

* fix timvx op test

* change savegraph path

Co-authored-by: xlchen <[email protected]>

Author: cccxinli

tests/op/test_timvx_op_eltwise_mul.cpp

@@ -29,7 +29,7 @@
 #include "graph/tensor.h"
 #include "operator/prototype/eltwise_param.h"
 
-int create_test_concat_node(graph_t graph, const char* input_name0, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
+int create_test_eltwise_node(graph_t graph, const char* input_name0, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
 {
     (void)layout;
     (void)n;
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
         fprintf(stderr, "Tengine init failed.\n");
 
     // create
-    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_concat_node);
+    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_eltwise_node);
     if (NULL == ir_graph)
         return -1;
 

tests/op/test_timvx_op_eltwise_sum.cpp

@@ -29,7 +29,7 @@
 #include "graph/tensor.h"
 #include "operator/prototype/eltwise_param.h"
 
-int create_test_concat_node(graph_t graph, const char* input_name0, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
+int create_test_eltwise_node(graph_t graph, const char* input_name0, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
 {
     (void)layout;
     (void)n;
@@ -149,7 +149,7 @@ int main(int argc, char* argv[])
         fprintf(stderr, "Tengine init failed.\n");
 
     // create
-    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_concat_node);
+    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_eltwise_node);
     if (NULL == ir_graph)
         return -1;
 

tests/op/test_timvx_op_flatten.cpp

@@ -29,7 +29,7 @@
 #include "graph/tensor.h"
 #include "operator/prototype/flatten_param.h"
 
-int create_test_fc_node(graph_t graph, const char* input_name, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
+int create_test_flatten_node(graph_t graph, const char* input_name, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
 {
     (void)layout;
     (void)n;
@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
         fprintf(stderr, "Tengine init failed.\n");
 
     // create
-    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_fc_node);
+    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_flatten_node);
     if (NULL == ir_graph)
         return -1;
 

tests/op/test_timvx_op_gather.cpp

@@ -29,7 +29,7 @@
 #include "graph/tensor.h"
 #include "operator/prototype/gather_param.h"
 
-int create_test_fc_node(graph_t graph, const char* input_name, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
+int create_test_gather_node(graph_t graph, const char* input_name, const char* node_name, int data_type, int layout, int n, int c, int h, int w)
 {
     (void)layout;
     (void)n;
@@ -51,6 +51,14 @@ int create_test_fc_node(graph_t graph, const char* input_name, const char* node_
     /* input tensors of test node */
     set_node_input_tensor(test_node, 0, input_tensor);
 
+    /* indices tensor */
+    node_t indices_node = create_graph_node(graph, "indices", "Const");
+    tensor_t indices_tensor = create_graph_tensor(graph, "indices", TENGINE_DT_UINT8);
+    set_node_output_tensor(indices_node, 0, indices_tensor, TENSOR_TYPE_CONST);
+    int indices_dims[1] = {2}; // channel num
+    set_tensor_shape(indices_tensor, indices_dims, 1);
+    set_node_input_tensor(test_node, 1, indices_tensor);
+
     /* output tensors of test node */
     tensor_t output_tensor = create_graph_tensor(graph, node_name, data_type);
     set_node_output_tensor(test_node, 0, output_tensor, TENSOR_TYPE_VAR);
@@ -82,6 +90,13 @@ float input_fp32[6] = {
 float input_scale = 1;
 int input_zero_point = 0;
 
+float indices_fp32[2] = {
+    0.0f,
+    1.0f,
+};
+float indices_scale = 1;
+int indices_zero_point = 0;
+
 float reference_out[4] = {
     3.0f,
     7.0f,
@@ -118,7 +133,7 @@ int main(int argc, char* argv[])
         fprintf(stderr, "Tengine init failed.\n");
 
     // create
-    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_fc_node);
+    struct graph* ir_graph = (struct graph*)create_timvx_test_graph(test_node_name, data_type, layout, n, c, h, w, &create_test_gather_node);
     if (NULL == ir_graph)
         return -1;
 
@@ -127,17 +142,23 @@ int main(int argc, char* argv[])
 
     // set quantize params
     struct tensor* input_tensor = (struct tensor*)get_graph_tensor(ir_graph, "input_node");
+    struct tensor* indices_tensor = (struct tensor*)get_graph_tensor(ir_graph, "indices");
     struct tensor* output_tensor = (struct tensor*)get_graph_tensor(ir_graph, "gather");
 
-    //    tensor_t weight_tesnor = get_graph_input_tensor(ir_graph, 1, 0);
     set_tensor_quant_param(input_tensor, &input_scale, &input_zero_point, 1);
+    set_tensor_quant_param(indices_tensor, &indices_scale, &indices_zero_point, 1);
     set_tensor_quant_param(output_tensor, &output_scale, &output_zero_point, 1);
 
     // set input data
     uint8_t input_u8[6] = {0};
     get_uint8_data(input_fp32, input_u8, 6, input_scale, input_zero_point);
     set_tensor_buffer(input_tensor, input_u8, 6);
 
+    // set indices data
+    uint8_t indices_u8[2] = {0};
+    get_uint8_data(indices_fp32, indices_u8, 2, indices_scale, indices_zero_point);
+    set_tensor_buffer(indices_tensor, indices_u8, 2);
+
     // set bias data
     // fill_input_uint8_tensor_by_index(graph, 0, 0, 0.0f);
 

tools/convert_tool/CMakeLists.txt

@@ -63,7 +63,7 @@ file(GLOB_RECURSE NCNN_SERIALIZER_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/ncnn/*.cpp")
 
 
 # SAVE GRAPH
-FILE(GLOB_RECURSE SAVE_GRAPH_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/utils/save_graph/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/utils/save_graph/*.c")
+FILE(GLOB_RECURSE SAVE_GRAPH_SRCS "${CMAKE_SOURCE_DIR}/tools/save_graph/*.cpp" "${CMAKE_SOURCE_DIR}/tools/save_graph/*.c")
 
 # GRAPH OPTIMIZER
 FILE(GLOB_RECURSE GRAPH_OPT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/utils/graph_optimizer/*.cpp")
@@ -84,6 +84,7 @@ TARGET_INCLUDE_DIRECTORIES (convert_tool PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 TARGET_INCLUDE_DIRECTORIES (convert_tool PRIVATE "${CMAKE_SOURCE_DIR}/source")
 TARGET_INCLUDE_DIRECTORIES (convert_tool PRIVATE "${CMAKE_BINARY_DIR}/source")
 TARGET_INCLUDE_DIRECTORIES (convert_tool PRIVATE "${CMAKE_SOURCE_DIR}/source/operator/prototype")
+TARGET_INCLUDE_DIRECTORIES (convert_tool PRIVATE "${CMAKE_SOURCE_DIR}/tools")
 install(TARGETS convert_tool DESTINATION bin)
 
 # add to a virtual project group

tools/convert_tool/caffe/caffe2tengine.hpp

@@ -47,7 +47,7 @@ extern "C" {
 #include "utility/log.h"
 #include "utility/sys_port.h"
 #include "utility/vector.h"
-#include "../utils/save_graph/op_include.h"
+#include "save_graph/op_include.h"
 }
 
 enum PoolArg

tools/convert_tool/convert_tool.cpp

@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "tengine/c_api.h"
-#include "utils/save_graph/save_graph.hpp"
+#include "save_graph/save_graph.hpp"
 #include "onnx/onnx2tengine.hpp"
 #include "caffe/caffe2tengine.hpp"
 #include "ncnn/ncnn2tengine.hpp"

tools/convert_tool/ncnn/ncnn2tengine.hpp

@@ -47,7 +47,7 @@ extern "C" {
 #include "utility/log.h"
 #include "utility/sys_port.h"
 #include "utility/vector.h"
-#include "../utils/save_graph/op_include.h"
+#include "save_graph/op_include.h"
 }
 #define NCNN_MAX_PARAM_COUNT 32
 

tools/convert_tool/onnx/onnx2tengine.hpp

@@ -49,7 +49,8 @@ extern "C" {
 #include "utility/log.h"
 #include "utility/sys_port.h"
 #include "utility/vector.h"
-#include "../utils/save_graph/op_include.h"
+#include "save_graph/op_include.h"
+// #include "../../save_graph/op_include.h"
 }
 
 class onnx_serializer