Merged
fix: 修复 pad_v2 GEIR 示例 include 路径与 GetSampleBuffers 声明冲突 #6915
tan_xinAdd on 10 days ago
fix: 修复 pad_v2 GEIR 示例 include 路径与 GetSampleBuffers 声明冲突 #6915
Merged
Merged fromtan_xin/ops-mathmaster-tileintocann/ops-mathmaster
Total: 1 files changed+2-3
| @@ -38,9 +38,8 @@ | |||
| 38 | #include "array_ops.h" | 38 | #include "array_ops.h" |
| 39 | #include "ge_ir_build.h" | 39 | #include "ge_ir_build.h" |
| 40 | 40 | ||
| 41 | -#include "experiment_ops.h" | ||
| 42 | #include "nn_other.h" | 41 | #include "nn_other.h" |
| 43 | -#include "../op_graph/pad_v2_proto.h" | 42 | +#include "../../op_graph/pad_v2_proto.h" |
| 44 | 43 | ||
| 45 | #define FAILED -1 | 44 | #define FAILED -1 |
| 46 | #define SUCCESS 0 | 45 | #define SUCCESS 0 |
| @@ -157,7 +156,7 @@ uint32_t GetDataTypeSize(DataType dt) | |||
| 157 | 156 | ||
| 158 | // 生成float32数据 | 157 | // 生成float32数据 |
| 159 | // 样例数据缓冲登记/释放（定义见 WriteDataToFile 前） | 158 | // 样例数据缓冲登记/释放（定义见 WriteDataToFile 前） |
| 160 | -std::vector<uint8_t*>& GetSampleBuffers(); | 159 | +static std::vector<uint8_t*>& GetSampleBuffers(); |
| 161 | void FreeSampleBuffers(); | 160 | void FreeSampleBuffers(); |
| 162 | 161 | ||
| 163 | int32_t GenDataFloat32(vector<int64_t> shapes, Tensor& input_tensor, TensorDesc& input_tensor_desc) | 162 | int32_t GenDataFloat32(vector<int64_t> shapes, Tensor& input_tensor, TensorDesc& input_tensor_desc) |