已合并
rename onnx plugin #916
yanke-xu创建于 5月30日
rename onnx plugin #916
已合并
共 3 个文件变更+6-6
| @@ -421,7 +421,7 @@ usage() { | |||
| 421 | echo " --vendor_name Specify the custom operator package vendor name, like: --vendor_name=customize, default to customize-cv" | 421 | echo " --vendor_name Specify the custom operator package vendor name, like: --vendor_name=customize, default to customize-cv" |
| 422 | echo " --aicpu build aicpu task" | 422 | echo " --aicpu build aicpu task" |
| 423 | echo " --opgraph build op_graph_cv.so" | 423 | echo " --opgraph build op_graph_cv.so" |
| 424 | - echo " --onnxplugin build op_cv_onnx_plugin.so" | 424 | + echo " --onnxplugin build oponnx_plugin_cv.so" |
| 425 | echo " --opapi build opapi_cv.so" | 425 | echo " --opapi build opapi_cv.so" |
| 426 | echo " --ophost build ophost_cv.so" | 426 | echo " --ophost build ophost_cv.so" |
| 427 | echo " --opkernel build binary kernel" | 427 | echo " --opkernel build binary kernel" |
| @@ -594,7 +594,7 @@ set_create_libs() { | |||
| 594 | return | 594 | return |
| 595 | fi | 595 | fi |
| 596 | if [[ "$ENABLE_PACKAGE" == "TRUE" && "$ENABLE_CUSTOM" != "TRUE" ]]; then | 596 | if [[ "$ENABLE_PACKAGE" == "TRUE" && "$ENABLE_CUSTOM" != "TRUE" ]]; then |
| 597 | - BUILD_LIBS=("ophost_${REPOSITORY_NAME}" "opapi_${REPOSITORY_NAME}" "opgraph_${REPOSITORY_NAME}" "op_${REPOSITORY_NAME}_onnx_plugin") | 597 | + BUILD_LIBS=("ophost_${REPOSITORY_NAME}" "opapi_${REPOSITORY_NAME}" "opgraph_${REPOSITORY_NAME}" "oponnx_plugin_${REPOSITORY_NAME}") |
| 598 | ENABLE_CREATE_LIB=TRUE | 598 | ENABLE_CREATE_LIB=TRUE |
| 599 | else | 599 | else |
| 600 | if [[ "$OP_HOST" == "TRUE" ]]; then | 600 | if [[ "$OP_HOST" == "TRUE" ]]; then |
| @@ -610,7 +610,7 @@ set_create_libs() { | |||
| 610 | ENABLE_CREATE_LIB=TRUE | 610 | ENABLE_CREATE_LIB=TRUE |
| 611 | fi | 611 | fi |
| 612 | if [[ "$ONNX_PLUGIN" == "TRUE" ]]; then | 612 | if [[ "$ONNX_PLUGIN" == "TRUE" ]]; then |
| 613 | - BUILD_LIBS+=("op_${REPOSITORY_NAME}_onnx_plugin") | 613 | + BUILD_LIBS+=("oponnx_plugin_${REPOSITORY_NAME}") |
| 614 | ENABLE_CREATE_LIB=TRUE | 614 | ENABLE_CREATE_LIB=TRUE |
| 615 | fi | 615 | fi |
| 616 | if [[ "$OP_KERNEL" == "TRUE" ]]; then | 616 | if [[ "$OP_KERNEL" == "TRUE" ]]; then |
| @@ -16,7 +16,7 @@ set(OPAPI_NAME opapi_${PKG_NAME}) | |||
| 16 | set(OPGRAPH_NAME opgraph_${PKG_NAME}) | 16 | set(OPGRAPH_NAME opgraph_${PKG_NAME}) |
| 17 | set(OP_GRAPH_NAME op_graph_${PKG_NAME}) | 17 | set(OP_GRAPH_NAME op_graph_${PKG_NAME}) |
| 18 | set(GRAPH_PLUGIN_NAME graph_plugin_${PKG_NAME}) | 18 | set(GRAPH_PLUGIN_NAME graph_plugin_${PKG_NAME}) |
| 19 | -set(ONNX_PLUGIN_NAME op_${PKG_NAME}_onnx_plugin) | 19 | +set(ONNX_PLUGIN_NAME oponnx_plugin_${PKG_NAME}) |
| 20 | 20 | ||
| 21 | set(OP_CATEGORY_LIST "image" "objdetect" "examples") | 21 | set(OP_CATEGORY_LIST "image" "objdetect" "examples") |
| 22 | 22 | ||
| @@ -11,8 +11,8 @@ | |||
| 11 | <file_info value="opgraph_cv_lib" copy_type="delivery" src_path="" dst_path="opp/built-in/op_graph/lib/linux/$(ARCH)/" install_path="opp/built-in/op_graph/lib/linux/$(ARCH)"> | 11 | <file_info value="opgraph_cv_lib" copy_type="delivery" src_path="" dst_path="opp/built-in/op_graph/lib/linux/$(ARCH)/" install_path="opp/built-in/op_graph/lib/linux/$(ARCH)"> |
| 12 | <file value="libopgraph_cv.so" install_mod="550"/> | 12 | <file value="libopgraph_cv.so" install_mod="550"/> |
| 13 | </file_info> | 13 | </file_info> |
| 14 | - <file_info value="op_cv_onnx_plugin" copy_type="delivery" src_path="" dst_path="opp/built-in/framework/onnx/" install_path="opp/built-in/framework/onnx"> | 14 | + <file_info value="oponnx_plugin_cv_lib" copy_type="delivery" src_path="" dst_path="opp/built-in/framework/onnx/" install_path="opp/built-in/framework/onnx"> |
| 15 | - <file value="libop_cv_onnx_plugin.so" install_mod="550"/> | 15 | + <file value="liboponnx_plugin_cv.so" install_mod="550"/> |
| 16 | </file_info> | 16 | </file_info> |
| 17 | <file_info copy_type="delivery" src_path="" dst_path="opp/built-in/op_impl/ai_core/tbe" install_path="opp/built-in/op_impl/ai_core/tbe" install_type="all"> | 17 | <file_info copy_type="delivery" src_path="" dst_path="opp/built-in/op_impl/ai_core/tbe" install_path="opp/built-in/op_impl/ai_core/tbe" install_type="all"> |
| 18 | <file value="config" install_mod="550"/> | 18 | <file value="config" install_mod="550"/> |