update CMakeLists

Li-Hongda · Li-Hongda · commit 374af6fcd970 · 2023-05-21T13:15:08.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,5 @@ bin
 weights
 yaml-cpp
 build
-demo
+demo
+results
diff --git a/configs/yolov6.yaml b/configs/yolov6.yaml
@@ -1,6 +1,6 @@
-yolov7:
-    onnx_file:     "../weights/yolov6/yolov6.onnx"
-    engine_file:   "../weights/yolov6/yolov6.trt"
+yolov6:
+    onnx_file:     "../weights/yolov6/yolov6s.onnx"
+    engine_file:   "../weights/yolov6/yolov6s.trt"
     type:          "coco"
     mode:          "fp32"
     batchSize:     1
diff --git a/include/build.h b/include/build.h
@@ -3,7 +3,7 @@
 
 
 #include "yolov5.h"
-// #include "yolov6.h"
+#include "yolov6.h"
 #include "yolov7.h"
 #include "yolov8.h"
 #include "rtdetr.h"
diff --git a/object_detection/CMakeLists.txt b/object_detection/CMakeLists.txt
@@ -62,7 +62,7 @@ list(APPEND ALL_INCLUDE ${PROJECT_INCLUDE})
 include_directories(${ALL_INCLUDE})
 
 add_subdirectory(yolov5)
-# add_subdirectory(yolov6)
+add_subdirectory(yolov6)
 add_subdirectory(yolov7)
 add_subdirectory(yolov8)
 add_subdirectory(rtdetr)
@@ -71,5 +71,5 @@ add_library(build SHARED ../src/build.cpp)
 
 set(EXECUTABLE_OUTPUT_PATH ../../bin)
 add_executable(object_detection main.cpp)
-target_link_libraries(object_detection yaml-cpp build yolov5 yolov7 yolov8 rtdetr cudart)
+target_link_libraries(object_detection yaml-cpp build yolov5 yolov6 yolov7 yolov8 rtdetr cudart)
 
diff --git a/object_detection/main.cpp b/object_detection/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char **argv)
     std::string cfg_dir = "../configs";
     std::string cfg_suffix = ".yaml";
     std::string savedir = "../results";
-    auto savepath = savedir + "/" + model_arch;
+    auto savepath = savedir + "/" + model_arch + "/";
     auto cfg = cfg_dir + "/" + model_arch + cfg_suffix;
     auto model = build_model(model_arch, cfg);
     check_dir(savepath, false);
diff --git a/object_detection/rtdetr/CMakeLists.txt b/object_detection/rtdetr/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(CMAKE_BUILD_TYPE "Debug")
-#set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Release")
 
 project(rtdetr)
 
diff --git a/object_detection/rtdetr/main.cpp b/object_detection/rtdetr/main.cpp
@@ -2,10 +2,13 @@
 
 int main(int argc, char** argv)
 {
-    std::string config = argv[1];
-    std::string inputpath = argv[2];
-    std::string savepath = argv[3];
-    YAML::Node root = YAML::LoadFile(config);
+    std::string inputpath = argv[1];
+    std::string cfg_dir = "../configs";
+    std::string cfg_suffix = ".yaml";
+    std::string savedir = "../results";
+    auto savepath = savedir + "/" + "rtdetr" + "/";
+    auto cfg = cfg_dir + "/" + "rtdetr" + cfg_suffix;    
+    YAML::Node root = YAML::LoadFile(cfg);
     RTDETR RTDETR(root["rtdetr"]);
     RTDETR.LoadEngine();
     RTDETR.Inference(inputpath, savepath);
diff --git a/object_detection/yolov5/CMakeLists.txt b/object_detection/yolov5/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(CMAKE_BUILD_TYPE "Debug")
-#set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Release")
 
 project(yolov5)
 
diff --git a/object_detection/yolov5/main.cpp b/object_detection/yolov5/main.cpp
@@ -3,10 +3,13 @@
 
 int main(int argc, char** argv)
 {
-    std::string config = argv[1];
-    std::string inputpath = argv[2];
-    std::string savepath = argv[3];
-    YAML::Node root = YAML::LoadFile(config);
+    std::string inputpath = argv[1];
+    std::string cfg_dir = "../configs";
+    std::string cfg_suffix = ".yaml";
+    std::string savedir = "../results";
+    auto savepath = savedir + "/" + "yolov5" + "/";
+    auto cfg = cfg_dir + "/" + "yolov5" + cfg_suffix;    
+    YAML::Node root = YAML::LoadFile(cfg);
     YOLOv5 YOLOv5(root["yolov5"]);
     YOLOv5.LoadEngine();
     YOLOv5.Inference(inputpath, savepath);
diff --git a/object_detection/yolov6/CMakeLists.txt b/object_detection/yolov6/CMakeLists.txt
@@ -0,0 +1,32 @@
+cmake_minimum_required(VERSION 3.10)
+
+set(CMAKE_BUILD_TYPE "Debug")
+# set(CMAKE_BUILD_TYPE "Release")
+
+project(yolov6)
+
+set(CMAKE_CXX_STANDARD 14)
+
+# YAML
+set(YAML_LIBRARY ../../yaml-cpp/build)
+set(YAML_INCLUDE ../../yaml-cpp/include)
+link_directories(${YAML_LIBRARY})
+list(APPEND ALL_INCLUDE ${YAML_INCLUDE})
+
+
+# Project
+set(PROJECT_INCLUDE  ../../include)
+message(STATUS "Find project include at ${PROJECT_INCLUDE}")
+list(APPEND ALL_INCLUDE ${PROJECT_INCLUDE})
+set(PROJECT_LIBRARY ../../src/common.cpp  
+                    ../../src/basemodel.cpp 
+                    ../../src/detection.cpp 
+                    ../../src/yolo.cpp 
+                    ../../src/yolov6.cpp
+                    ../../src/cuda_function.cu)
+
+include_directories(${ALL_INCLUDE})
+
+set(LIBRARY_OUTPUT_PATH ../../libs)
+add_library(yolov6 SHARED ${PROJECT_LIBRARY} ${SAMPLES_LIBRARY})
+target_link_libraries(yolov6 ${ALL_LIBS} yaml-cpp)
diff --git a/object_detection/yolov6/main.cpp b/object_detection/yolov6/main.cpp
@@ -0,0 +1,17 @@
+#include "../../include/yolov6.h"
+
+
+int main(int argc, char** argv)
+{
+    std::string inputpath = argv[1];
+    std::string cfg_dir = "../configs";
+    std::string cfg_suffix = ".yaml";
+    std::string savedir = "../results";
+    auto savepath = savedir + "/" + "yolov6" + "/";
+    auto cfg = cfg_dir + "/" + "yolov6" + cfg_suffix;    
+    YAML::Node root = YAML::LoadFile(cfg);
+    YOLOv6 YOLOv6(root["yolov6"]);
+    YOLOv6.LoadEngine();
+    YOLOv6.Inference(inputpath, savepath);
+    return 0;
+}
diff --git a/object_detection/yolov7/CMakeLists.txt b/object_detection/yolov7/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(CMAKE_BUILD_TYPE "Debug")
-#set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Release")
 
 project(yolov7)
 
diff --git a/object_detection/yolov7/main.cpp b/object_detection/yolov7/main.cpp
@@ -3,10 +3,13 @@
 
 int main(int argc, char** argv)
 {
-    std::string config = argv[1];
-    std::string inputpath = argv[2];
-    std::string savepath = argv[3];
-    YAML::Node root = YAML::LoadFile(config);
+    std::string inputpath = argv[1];
+    std::string cfg_dir = "../configs";
+    std::string cfg_suffix = ".yaml";
+    std::string savedir = "../results";
+    auto savepath = savedir + "/" + "yolov7" + "/";
+    auto cfg = cfg_dir + "/" + "yolov7" + cfg_suffix;    
+    YAML::Node root = YAML::LoadFile(cfg);
     YOLOv7 YOLOv7(root["yolov7"]);
     YOLOv7.LoadEngine();
     YOLOv7.Inference(inputpath, savepath);
diff --git a/object_detection/yolov8/CMakeLists.txt b/object_detection/yolov8/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(CMAKE_BUILD_TYPE "Debug")
-#set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Release")
 
 project(yolov8)
 
diff --git a/object_detection/yolov8/main.cpp b/object_detection/yolov8/main.cpp
@@ -3,10 +3,13 @@
 
 int main(int argc, char** argv)
 {
-    std::string config = argv[1];
-    std::string inputpath = argv[2];
-    std::string savepath = argv[3];
-    YAML::Node root = YAML::LoadFile(config);
+    std::string inputpath = argv[1];
+    std::string cfg_dir = "../configs";
+    std::string cfg_suffix = ".yaml";
+    std::string savedir = "../results";
+    auto savepath = savedir + "/" + "yolov8" + "/";
+    auto cfg = cfg_dir + "/" + "yolov8" + cfg_suffix;    
+    YAML::Node root = YAML::LoadFile(cfg);
     YOLOv8 YOLOv8(root["yolov8"]);
     YOLOv8.LoadEngine();
     YOLOv8.Inference(inputpath, savepath);
diff --git a/src/build.cpp b/src/build.cpp
@@ -7,8 +7,8 @@ std::shared_ptr<Model> build_model(std::string model_arch, std::string cfg) {
         model = std::make_shared<YOLOv5>(root[model_arch]);
     else if (model_arch == "yolov5-seg")
         model = std::make_shared<YOLOv5_seg>(root[model_arch]);
-    // else if (model_arch == "yolov6")
-    //     model = std::make_shared<YOLOv6>(root[model_arch]);
+    else if (model_arch == "yolov6")
+        model = std::make_shared<YOLOv6>(root[model_arch]);
     else if (model_arch == "yolov7")
         model = std::make_shared<YOLOv7>(root[model_arch]);
     else if (model_arch == "yolov8")
diff --git a/src/common.cpp b/src/common.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include<dirent.h>
+#include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -49,20 +49,34 @@ std::string replace(std::string str, const std::string& from, const std::string&
 }
 
 static bool isPathExists(const std::string& path){
-    struct stat   buffer;
+    struct stat buffer;
     return (stat (path.c_str(), &buffer) == 0);
 }
 
 static bool isFile(const std::string& filename) {
-    struct stat   buffer;
+    struct stat buffer;
     return S_ISREG(buffer.st_mode);
 }
  
 static bool isDirectory(const std::string& filefodler) {
-    struct stat   buffer;
+    struct stat buffer;
     return S_ISDIR(buffer.st_mode);
 }
 
+static void createDirectory(const std::string &path) {
+    uint32_t pathLen = path.length();
+
+    char tmpDirPath[256] = { 0 };
+    for (uint32_t i = 0; i < pathLen; ++i) {
+        tmpDirPath[i] = path[i];
+        if (tmpDirPath[i] == '\\' || tmpDirPath[i] == '/') {
+            if (access(tmpDirPath, 0) != 0) {
+                int32_t ret = mkdir(tmpDirPath, 00700);
+            }
+        }
+    }
+}
+
 int check_dir(const std::string & path, const bool is_mkdir) noexcept {
     DIR *p_dir;
     struct dirent *entry;
@@ -85,6 +99,7 @@ int check_dir(const std::string & path, const bool is_mkdir) noexcept {
             mkdir(path.c_str(), 00700);
         }
     } else {
-        mkdir(path.c_str(), 00700);
+        // mkdir(path.c_str(), 00700);
+        createDirectory(path);
     }
 }

-Original file line number
+Diff line change
 weights
 yaml-cpp
 build
 -demo
 +demo
 +results