chore: Bump version number to 6.0.0

laugh12321 · laugh12321 · commit 85e77f560a3c · 2025-01-26T18:52:56.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,42 +1,50 @@
 # 设置项目
-cmake_minimum_required(VERSION 3.15.0)                  # 设置CMake的最低版本要求
-cmake_policy(SET CMP0091 NEW)                           # 允许在CMake 3.10+中自动设置项目名作为二进制目录名
-cmake_policy(SET CMP0146 OLD)                           # 忽略对find_package的过时警告
-project(TensorRT-YOLO VERSION 5.1.1 LANGUAGES CXX CUDA) # 定义项目名称、版本和使用的编程语言（C++和CUDA）
+cmake_minimum_required(VERSION 3.12)
+cmake_policy(SET CMP0091 NEW)
+project(TensorRT-YOLO VERSION 6.0.0 LANGUAGES CXX CUDA)
 
 # 设置 C++ 标准
-set(CMAKE_CXX_STANDARD 17)                              # 设置C++标准为17
-set(CMAKE_CXX_STANDARD_REQUIRED ON)                     # 要求C++标准必须满足17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# 添加编译规则
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)                   # 生成编译数据库，便于代码分析工具使用
+# 生成编译数据库，便于代码分析工具使用
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # 添加依赖项
-## CUDA
-find_package(CUDA REQUIRED)                             # 查找CUDA包
-set(CMAKE_CUDA_ARCHITECTURES native)                    # 自动检测最佳CUDA架构
-set(CUDA_PATH ${CUDA_TOOLKIT_ROOT_DIR})                 # 缓存CUDA路径
-
-## Pybind11
-set(PYBIND11_FINDPYTHON ON)                                                            # 开启寻找Python
-find_package(Python COMPONENTS Interpreter Development REQUIRED)                       # 查找Python解释器和开发组件
-find_package(pybind11 CONFIG REQUIRED)                                                 # 查找pybind11包
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
+    find_package(CUDAToolkit REQUIRED)
+    set(CUDA_INCLUDE_DIRS ${CUDAToolkit_INCLUDE_DIRS})
+    set(CUDA_LIBRARIES ${CUDAToolkit_LIBRARIES})
+else()
+    find_package(CUDA REQUIRED)
+endif()
+set(CMAKE_CUDA_ARCHITECTURES 89;86;75;70;61)  # CUDA 架构版本 8.9, 8.6, 7.5, 7.0, 6.1
 
 # 添加编译选项
-option(TENSORRT_PATH "TensorRT Path. Example: /usr/local/tensorrt" "")                 # 添加编译选项，用于指定TensorRT路径
-# 检查 TensorRT 路径是否已设置
+option(TENSORRT_PATH "TensorRT Path. Example: /usr/local/tensorrt" "")
 if(NOT TENSORRT_PATH)
-    message(FATAL_ERROR "TensorRT path is not set. Please specify the TensorRT path.") # 如果未设置，则报错
+    message(FATAL_ERROR "TensorRT path is not set. Please specify the TensorRT path.")
 endif()
 
-# 添加公共配置
+# 添加选项：是否编译Python版本
+option(BUILD_PYTHON "Build Python bindings" OFF)
+if(BUILD_PYTHON)
+    message(STATUS "Python bindings will be built.")
+
+    # Pybind11 依赖
+    set(PYBIND11_FINDPYTHON ON)
+    find_package(Python COMPONENTS Interpreter Development REQUIRED)
+    find_package(pybind11 CONFIG REQUIRED)
+else()
+    message(STATUS "Python bindings will NOT be built.")
+endif()
+
+# 配置CUDA和TensorRT的函数
 function(configure_cuda_trt target)
-    # 添加CUDA定义、包含目录、链接库
     target_compile_definitions(${target} PRIVATE ${CUDA_DEFINITIONS})
     target_include_directories(${target} PRIVATE ${CUDA_INCLUDE_DIRS})
     target_link_libraries(${target} PRIVATE ${CUDA_cudart_LIBRARY})
 
-    # 添加TensorRT的包含目录、库目录、链接库
     target_include_directories(${target} PRIVATE ${TENSORRT_PATH}/include)
     target_link_directories(${target} PRIVATE ${TENSORRT_PATH}/lib)
     if(MSVC AND EXISTS ${TENSORRT_PATH}/lib/nvinfer_10.dll)
@@ -46,66 +54,76 @@ function(configure_cuda_trt target)
     endif()
 endfunction()
 
+# 添加源文件的函数
 function(add_compile_files target)
-    # 添加头文件搜索路径
-    include_directories(${PROJECT_SOURCE_DIR}/include) 
+    include_directories(${PROJECT_SOURCE_DIR}) 
     file(GLOB_RECURSE SOURCES
-        ${PROJECT_SOURCE_DIR}/source/deploy/core/*.cpp
-        ${PROJECT_SOURCE_DIR}/source/deploy/utils/*.cpp
-        ${PROJECT_SOURCE_DIR}/source/deploy/vision/*.cpp
-        ${PROJECT_SOURCE_DIR}/source/deploy/vision/*.cu
+        ${PROJECT_SOURCE_DIR}/deploy/core/*.cpp
+        ${PROJECT_SOURCE_DIR}/deploy/utils/*.cpp
+        ${PROJECT_SOURCE_DIR}/deploy/infer/*.cpp
+        ${PROJECT_SOURCE_DIR}/deploy/infer/*.cu
+        ${PROJECT_SOURCE_DIR}/deploy/model.cpp
     )
-    # 添加源文件
-    target_sources(${target} PRIVATE ${SOURCES}) 
+    target_sources(${target} PRIVATE ${SOURCES})
 endfunction()
 
+# 设置编译选项的函数
 function(set_compile_options target)
-
     if(MSVC)
-        target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:-O2>)                                   # 对于MSVC，在Release模式下使用-O2优化
-        set_property(TARGET ${target} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # 设置MSVC运行时库
+        target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:-O2>)
+        set_property(TARGET ${target} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     else()
-        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-O3 -flto=auto>)                  # 对于非MSVC，使用-O3优化和自动LTO
-        target_link_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-O3 -flto=auto>)                     # 链接时同样使用-O3优化和自动LTO
+        target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-O3 -flto=auto>)
+        target_link_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-O3 -flto=auto>)
     endif()
-
 endfunction()
 
 # 添加子目录
-add_subdirectory(${PROJECT_SOURCE_DIR}/plugin)                                                        # 添加插件目录
+add_subdirectory(${PROJECT_SOURCE_DIR}/plugin)
 
 # 定义目标 deploy
-add_library(deploy SHARED)                                                                            # 创建共享库
-add_compile_files(deploy)                                                                             # 添加源文件
-configure_cuda_trt(deploy)                                                                            # 配置CUDA和TensorRT
-set_compile_options(deploy)                                                                           # 设置编译选项
-set_target_properties(deploy PROPERTIES OUTPUT_NAME deploy)                                           # 设置输出名称
-if(MSVC)
-    set_target_properties(deploy PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/lib) # 设置Release模式下输出目录
-    set_target_properties(deploy PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/lib)
-    set_target_properties(deploy PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/lib)   # 设置Debug模式下输出目录
-    set_target_properties(deploy PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/lib)
-else()
-    set_target_properties(deploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)         # 设置库文件输出目录
-endif()
+add_library(deploy SHARED)
+add_compile_files(deploy)
+configure_cuda_trt(deploy)
+set_compile_options(deploy)
+set_target_properties(deploy PROPERTIES OUTPUT_NAME deploy)
 
-# 定义目标 pydeploy
-pybind11_add_module(pydeploy ${PROJECT_SOURCE_DIR}/source/deploy/pybind/deploy.cpp)                   # 创建pybind11模块
-add_compile_files(pydeploy)                                                                           # 添加源文件
-configure_cuda_trt(pydeploy)                                                                          # 配置CUDA和TensorRT
-set_compile_options(pydeploy)                                                                         # 设置编译选项
-set_target_properties(pydeploy PROPERTIES OUTPUT_NAME pydeploy)                                       # 设置输出名称
 if(MSVC)
-    set_target_properties(pydeploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/tensorrt_yolo/libs) # 设置Release模式下输出目录
-    set_target_properties(pydeploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/tensorrt_yolo/libs)   # 设置Debug模式下输出目录
+    set_target_properties(deploy PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/lib
+        ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/lib
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/lib
+        ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/lib
+    )
 else()
-    set_target_properties(pydeploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/tensorrt_yolo/libs)         # 设置库文件输出目录
+    set_target_properties(deploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 endif()
-set_target_properties(pydeploy PROPERTIES
-    COMPILE_DEFINITIONS "CUDA_PATH=\"${CUDA_TOOLKIT_ROOT_DIR}\""
-    COMPILE_DEFINITIONS "TENSORRT_PATH=\"${TENSORRT_PATH}\""
-) # 设置编译定义
-configure_file(
-    ${CMAKE_SOURCE_DIR}/tensorrt_yolo/c_lib_wrap.py.in
-    ${CMAKE_SOURCE_DIR}/tensorrt_yolo/c_lib_wrap.py
-) # 配置文件
+
+# 定义目标 pydeploy（仅在BUILD_PYTHON为ON时编译）
+if(BUILD_PYTHON)
+    pybind11_add_module(pydeploy ${PROJECT_SOURCE_DIR}/deploy/pybind.cpp)
+    add_compile_files(pydeploy)
+    configure_cuda_trt(pydeploy)
+    set_compile_options(pydeploy)
+    set_target_properties(pydeploy PROPERTIES OUTPUT_NAME pydeploy)
+
+    if(MSVC)
+        set_target_properties(pydeploy PROPERTIES
+            LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/python/tensorrt_yolo/libs
+            LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/python/tensorrt_yolo/libs
+        )
+    else()
+        set_target_properties(pydeploy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/python/tensorrt_yolo/libs)
+    endif()
+
+    set_target_properties(pydeploy PROPERTIES
+        COMPILE_DEFINITIONS "CUDA_PATH=\"${CUDA_TOOLKIT_ROOT_DIR}\""
+        COMPILE_DEFINITIONS "TENSORRT_PATH=\"${TENSORRT_PATH}\""
+    )
+
+    # 配置文件
+    configure_file(
+        ${CMAKE_SOURCE_DIR}/python/tensorrt_yolo/c_lib_wrap.py.in
+        ${CMAKE_SOURCE_DIR}/python/tensorrt_yolo/c_lib_wrap.py
+    )
+endif()
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 # Project settings -----------------------------------------------------------------------------------------------------
 [project]
-version = "5.1.1"
+version = "6.0.0"
 readme = "README.md"
 name = "tensorrt_yolo"
 requires-python = ">=3.8"
diff --git a/xmake.lua b/xmake.lua
@@ -1,17 +1,30 @@
 -- 设置项目信息
 set_project("TensorRT-YOLO")
-set_version("5.1.1")
+set_version("6.0.0")
 set_languages("cxx17")
 set_allowedplats("windows", "linux")
 
--- 添加依赖
-add_requires("python", {system = true})
-add_requires("pybind11")
-
 -- 添加编译规则
 add_rules("plugin.compile_commands.autoupdate", {outputdir = "build"})
 add_rules("mode.release")
 
+-- 全局添加 Python 和 pybind11 依赖
+add_requires("python", {system = true, optional = true})  -- 设置为可选依赖
+add_requires("pybind11", {optional = true})              -- 设置为可选依赖
+
+-- 定义选项
+option("build_python")
+    set_showmenu(true)
+    set_description("Build Python bindings")
+    set_default(false)
+    on_check(function (option)
+        if option:enabled() then
+            -- 启用 Python 和 pybind11 依赖
+            add_requires("python", {system = true})
+            add_requires("pybind11")
+        end
+    end)
+
 -- 定义选项
 option("tensorrt")
     set_showmenu(true)
@@ -36,21 +49,22 @@ end
 -- 定义一个函数来添加 CUDA 支持
 function configure_cuda(target)
     add_rules("cuda")
-    add_cugencodes("native")
+    add_cugencodes("sm_89", "sm_86", "sm_75", "sm_70", "sm_61")
     add_cuflags("-allow-unsupported-compiler")
 end
 
 -- 定义一个函数来添加公共配置
 function common_config(target)
     -- 添加库目录
-    add_includedirs("$(projectdir)/include")
+    add_includedirs("$(projectdir)")
 
     -- 添加文件
     add_files(
-        "$(projectdir)/source/deploy/core/*.cpp",
-        "$(projectdir)/source/deploy/utils/*.cpp",
-        "$(projectdir)/source/deploy/vision/*.cpp",
-        "$(projectdir)/source/deploy/vision/*.cu"
+        "$(projectdir)/deploy/core/*.cpp",
+        "$(projectdir)/deploy/utils/*.cpp",
+        "$(projectdir)/deploy/infer/*.cpp",
+        "$(projectdir)/deploy/infer/*.cu",
+        "$(projectdir)/deploy/model.cpp"
     )
 
     -- 添加 cuda
@@ -60,6 +74,7 @@ function common_config(target)
     configure_tensorrt(target)
 end
 
+-- 包含插件
 includes("plugin/xmake.lua")
 
 -- 定义目标
@@ -73,34 +88,36 @@ target("deploy")
     -- 公共配置
     common_config("deploy")
 
--- 定义目标
-target("pydeploy")
-    -- 定义规则
-    add_rules("python.library")
+-- 定义目标（仅在 build_python 为 true 时编译）
+if has_config("build_python") then
+    target("pydeploy")
+        -- 定义规则
+        add_rules("python.library")
 
-    -- 添加依赖
-    add_packages("pybind11")
+        -- 添加依赖
+        add_packages("pybind11")
 
-    -- 设置编译路径
-    set_targetdir("$(projectdir)/tensorrt_yolo/libs")
+        -- 设置编译路径
+        set_targetdir("$(projectdir)/python/tensorrt_yolo/libs")
 
-    -- 公共配置
-    common_config("pydeploy")
+        -- 公共配置
+        common_config("pydeploy")
 
-    -- 添加文件
-    add_files("$(projectdir)/source/deploy/pybind/deploy.cpp")
+        -- 添加文件
+        add_files("$(projectdir)/deploy/pybind.cpp")
 
-    -- 在配置阶段查找 CUDA SDK
-    local cuda
-    on_load(function (target)
-        import("detect.sdks.find_cuda")
-        cuda = assert(find_cuda(nil, {verbose = true}), "Cuda SDK not found!")
+        -- 在配置阶段查找 CUDA SDK
+        local cuda
+        on_load(function (target)
+            import("detect.sdks.find_cuda")
+            cuda = assert(find_cuda(nil, {verbose = true}), "Cuda SDK not found!")
 
-        -- 设置配置变量
-        target:set("configvar", "CUDA_PATH", cuda.bindir)
-        target:set("configvar", "TENSORRT_PATH", "$(tensorrt)")
+            -- 设置配置变量
+            target:set("configvar", "CUDA_PATH", cuda.bindir)
+            target:set("configvar", "TENSORRT_PATH", "$(tensorrt)")
 
-        -- 设置配置目录和配置文件
-        target:set("configdir", "$(projectdir)/tensorrt_yolo")
-        target:add("configfiles", "$(projectdir)/tensorrt_yolo/c_lib_wrap.py.in")
-    end)
+            -- 设置配置目录和配置文件
+            target:set("configdir", "$(projectdir)/python/tensorrt_yolo")
+            target:add("configfiles", "$(projectdir)/python/tensorrt_yolo/c_lib_wrap.py.in")
+        end)
+end
