Browse Source

Feature/ncnntool/add install (#3212)

tags/20211122
Jimmy GitHub 4 years ago
parent
commit
52c6502ae7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 1 deletions
  1. +6
    -1
      tools/CMakeLists.txt
  2. +1
    -0
      tools/caffe/CMakeLists.txt
  3. +1
    -0
      tools/darknet/CMakeLists.txt
  4. +1
    -0
      tools/mlir/CMakeLists.txt
  5. +1
    -0
      tools/mxnet/CMakeLists.txt
  6. +1
    -0
      tools/onnx/CMakeLists.txt
  7. +2
    -0
      tools/quantize/CMakeLists.txt

+ 6
- 1
tools/CMakeLists.txt View File

@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.1) # for CMAKE_CXX_STANDARD
set(CMAKE_CXX_STANDARD 11)

macro(ncnn_install_tool toolname)
install(TARGETS ${toolname} RUNTIME DESTINATION bin)
endmacro()
if(MSVC)
# warning C4018: '<': signed/unsigned mismatch
# warning C4244: 'argument': conversion from 'uint64_t' to 'const unsigned int', possible loss of data
@@ -36,3 +38,6 @@ add_executable(ncnnmerge ncnnmerge.cpp)
set_property(TARGET ncnn2mem PROPERTY FOLDER "tools")
set_property(TARGET ncnnoptimize PROPERTY FOLDER "tools")
set_property(TARGET ncnnmerge PROPERTY FOLDER "tools")
ncnn_install_tool(ncnn2mem)
ncnn_install_tool(ncnnmerge)
ncnn_install_tool(ncnnoptimize)

+ 1
- 0
tools/caffe/CMakeLists.txt View File

@@ -12,6 +12,7 @@ if(PROTOBUF_FOUND)

# add all caffe2ncnn tool to a virtual project group
set_property(TARGET caffe2ncnn PROPERTY FOLDER "tools/converter")
ncnn_install_tool(caffe2ncnn)
else()
message(WARNING "Protobuf not found, caffe model convert tool won't be built")
endif()

+ 1
- 0
tools/darknet/CMakeLists.txt View File

@@ -1,2 +1,3 @@
add_executable(darknet2ncnn darknet2ncnn.cpp)
set_property(TARGET darknet2ncnn PROPERTY FOLDER "tools/converter")
ncnn_install_tool(darknet2ncnn)

+ 1
- 0
tools/mlir/CMakeLists.txt View File

@@ -58,3 +58,4 @@ target_link_libraries(mlir2ncnn
MLIRStandard
MLIRTransforms
)
ncnn_install_tool(mlir2ncnn)

+ 1
- 0
tools/mxnet/CMakeLists.txt View File

@@ -3,3 +3,4 @@ add_executable(mxnet2ncnn mxnet2ncnn.cpp)

# add all mxnet2ncnn tool to a virtual project group
set_property(TARGET mxnet2ncnn PROPERTY FOLDER "tools/converter")
ncnn_install_tool(mxnet2ncnn)

+ 1
- 0
tools/onnx/CMakeLists.txt View File

@@ -12,6 +12,7 @@ if(PROTOBUF_FOUND)

# add all onnx2ncnn tool to a virtual project group
set_property(TARGET onnx2ncnn PROPERTY FOLDER "tools/converter")
ncnn_install_tool(onnx2ncnn)
else()
message(WARNING "Protobuf not found, onnx model convert tool won't be built")
endif()

+ 2
- 0
tools/quantize/CMakeLists.txt View File

@@ -37,3 +37,5 @@ target_link_libraries(ncnn2int8 PRIVATE ncnn)

# add ncnn2int8 tool to a virtual project group
set_property(TARGET ncnn2int8 PROPERTY FOLDER "tools/optimization")
ncnn_install_tool(ncnn2table)
ncnn_install_tool(ncnn2int8)

Loading…
Cancel
Save