未验证 提交 18166afc 编写于 作者: K kalcohol 提交者: GitHub

fix tim vx (#1281)

* apply code-format changes

* change build sources aux

* change loop var type from @AddSalt8227
Co-authored-by: Nkalcohol <kalcohol@users.noreply.github.com>
上级 33f29a22
......@@ -92,13 +92,15 @@ IF (TENGINE_ENABLE_TIM_VX_INTEGRATION)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/kernel/evis _VX_OVX_KERNEL_EVIS)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/kernel/vx _VX_OVX_KERNEL_VX)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/ops _VX_OVX_OPS)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/client _VX_OVX_CLIENT)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/libnnext _VX_OVX_LIBNNEXT)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/libnnext/ops/kernel _VX_OVX_LIBNNEXT_OPS_KERNEL)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/quantization _VX_OVX_QUANTIZATION)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/custom/ops _VX_OVX_CUSTOM_OPS)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/custom/ops/kernel _VX_OVX_CUSTOM_OPS_KERNEL)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/utils _VX_OVX_UTILS)
AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/POST _VX_OVX_POST)
#AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/client _VX_OVX_CLIENT)
#AUX_SOURCE_DIRECTORY (${_VX_OVX_ROOT}/libnnext/ops/kernel _VX_OVX_LIBNNEXT_OPS_KERNEL)
# add ovx api lib target
ADD_LIBRARY (${_TIM_OVX_NAME} STATIC)
......@@ -107,17 +109,19 @@ IF (TENGINE_ENABLE_TIM_VX_INTEGRATION)
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_SRC})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL_CL})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL_CPU})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL_EVIS})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL_VX})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_OPS})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_CLIENT})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_LIBNNEXT})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_LIBNNEXT_OPS_KERNEL})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_QUANTIZATION})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_CUSTOM_OPS})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_CUSTOM_OPS_KERNEL})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_UTILS})
TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_POST})
#TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_KERNEL_CPU})
#TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_CLIENT})
#TARGET_SOURCES (${_TIM_OVX_NAME} PRIVATE ${_VX_OVX_LIBNNEXT_OPS_KERNEL})
TARGET_INCLUDE_DIRECTORIES (${_TIM_OVX_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty/tim-vx/include)
TARGET_INCLUDE_DIRECTORIES (${_TIM_OVX_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/3rdparty/tim-vx/include/CL)
......
......@@ -641,7 +641,7 @@ int VXEngine::VXEngineRun(struct subgraph* subgraph)
const char* env = getenv(TENGINE_DUMP_LAYER);
if (env && env[0] == '1')
{
for (uint8_t i = 0; i < ir_graph->tensor_num; i++)
for (uint16_t i = 0; i < ir_graph->tensor_num; i++)
{
if (ir_graph->tensor_list[i]->tensor_type == TENSOR_TYPE_VAR)
{
......@@ -659,7 +659,7 @@ int VXEngine::VXEngineRun(struct subgraph* subgraph)
}
}
for (uint8_t i = 0; i < ir_graph->tensor_num; i++)
for (uint16_t i = 0; i < ir_graph->tensor_num; i++)
{
TLOG_INFO("TIM-VX: Tensor type %d\n",ir_graph->tensor_list[i]->tensor_type);
if (ir_graph->tensor_list[i]->tensor_type == TENSOR_TYPE_VAR)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册