删除多余代码

CMakeLists.txt

@@ -35,7 +35,6 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Src/main.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Bert.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/tokenization.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/utf8proc.c
-                ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/CommonUtility.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/Filesystem.cpp)
 
 # 添加可执行目标

Src/Bert.h

-#ifndef BERT_H
-#define BERT_H
+#ifndef __BERT_H__
+#define __BERT_H__
 
 #include <cstdint>
 #include <string>
 #include <migraphx/program.hpp>
-#include <CommonDefinition.h>
 #include <tokenization.h>
 
 namespace migraphxSamples
 {
+    typedef enum _ErrorCode
+    {
+        SUCCESS=0, 
+        MODEL_NOT_EXIST, 
+        CONFIG_FILE_NOT_EXIST, 
+        FAIL_TO_LOAD_MODEL, 
+        FAIL_TO_OPEN_CONFIG_FILE, 
+    }ErrorCode;
+
     typedef struct _Sort_st
     {
         int index;

Src/Utility/CommonDefinition.h

-// 常用定义
-
-#ifndef __COMMON_DEFINITION_H__
-#define __COMMON_DEFINITION_H__
-
-#include <opencv2/opencv.hpp>
-
-namespace migraphxSamples
-{
-   
-// 路径分隔符(Linux:‘/’,Windows:’\\’)
-#ifdef _WIN32
-#define  PATH_SEPARATOR '\\'
-#else
-#define  PATH_SEPARATOR '/'
-#endif
-
-#define CONFIG_FILE                                                     "../Resource/Configuration.xml"
-
-typedef enum _ErrorCode
-{
-    SUCCESS=0,  // 0
-    MODEL_NOT_EXIST, // 模型不存在
-    CONFIG_FILE_NOT_EXIST, // 配置文件不存在
-    FAIL_TO_LOAD_MODEL, // 加载模型失败
-    FAIL_TO_OPEN_CONFIG_FILE, // 加载配置文件失败
-    IMAGE_ERROR, // 图像错误
-}ErrorCode;
-
-typedef struct _ResultOfPrediction
-{
-    float confidence;
-    int label;
-    _ResultOfPrediction():confidence(0.0f),label(0){}
-
-}ResultOfPrediction;
-
-typedef struct _ResultOfDetection
-{
-    cv::Rect boundingBox;
-    float confidence;
-    int classID;
-    std::string className;
-    bool exist;
-
-    _ResultOfDetection():confidence(0.0f),classID(0),exist(true){}
-
-}ResultOfDetection;
-
-typedef struct _InitializationParameterOfNLP
-{
-    std::string parentPath;
-    std::string configFilePath;
-}InitializationParameterOfNLP;
-
-}
-
-#endif
-

Src/Utility/CommonUtility.cpp

-#include <CommonUtility.h>
-
-namespace migraphxSamples
-{
-
-bool CompareConfidence(const ResultOfDetection &L,const ResultOfDetection &R)
-{
-    return L.confidence > R.confidence;
-}
-
-bool CompareArea(const ResultOfDetection &L,const ResultOfDetection &R)
-{
-    return L.boundingBox.area() > R.boundingBox.area();
-}
-
-void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold)
-{
-    // sort
-    std::sort(detections.begin(), detections.end(), CompareConfidence);
-
-    for (int i = 0; i<detections.size(); ++i)
-    {
-        if (detections[i].exist)
-        {
-            for (int j = i + 1; j<detections.size(); ++j)
-            {
-                if (detections[j].exist)
-                {
-                    // compute IOU
-                    float intersectionArea = (detections[i].boundingBox & detections[j].boundingBox).area();
-                    float intersectionRate = intersectionArea / (detections[i].boundingBox.area() + detections[j].boundingBox.area() - intersectionArea);
-
-                    if (intersectionRate>IOUThreshold)
-                    {
-                        detections[j].exist = false;
-                    }
-                }
-            }
-        }
-    }
-
-}
-
-}

Src/Utility/CommonUtility.h

-// 常用工具
-
-#ifndef __COMMON_UTILITY_H__
-#define __COMMON_UTILITY_H__
-
-#include <CommonDefinition.h>
-
-namespace migraphxSamples
-{
-
-// 排序规则: 按照置信度或者按照面积排序
-bool CompareConfidence(const ResultOfDetection &L,const ResultOfDetection &R);
-bool CompareArea(const ResultOfDetection &L,const ResultOfDetection &R);
-
-// 非极大抑制
-void NMS(std::vector<ResultOfDetection> &detections, float IOUThreshold);
-
-}
-
-#endif