删除多余代码

CMakeLists.txt

@@ -37,7 +37,6 @@ link_libraries(${LIBRARY})
 # 添加源文件
 set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/Src/main.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Unet.cpp
-                ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/CommonUtility.cpp
                 ${CMAKE_CURRENT_SOURCE_DIR}/Src/Utility/Filesystem.cpp)
 
 # 添加可执行目标

Doc/Tutorial_Python.md

@@ -44,7 +44,7 @@ def Preprocessing(pil_img, newW, newH):
 
 ```python
     # 加载模型
-    model = migraphx.parse_onnx("../Resource/Models/Segmentation/unet_13_256.onnx")
+    model = migraphx.parse_onnx("../Resource/Models/unet_13_256.onnx")
 
     # 编译模型
     model.compile(migraphx.get_target("gpu"), device_id=0)   #device_id: 设置GPU设备，默认为0号设备

Src/Unet.cpp

@@ -6,8 +6,6 @@
 #include <Filesystem.h>
 #include <SimpleLog.h>
 
-using namespace cv::dnn;
-
 namespace migraphxSamples
 {
 

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