diff --git a/AIEngineModule/src/AI_Factory.cpp b/AIEngineModule/src/AI_Factory.cpp index 6820631..42811bf 100644 --- a/AIEngineModule/src/AI_Factory.cpp +++ b/AIEngineModule/src/AI_Factory.cpp @@ -43,7 +43,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_NF = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "Base_detect"; boe_config.Stream_num = 2; @@ -55,7 +55,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Type2 = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_WTB.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_WTB.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "WTB_detect"; boe_config.Stream_num = 2; @@ -67,7 +67,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_UP = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_UP.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_UP.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "UP_detect"; boe_config.Stream_num = 2; @@ -79,7 +79,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Chess = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_CHESS.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_CHESS.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "chess_detect"; boe_config.Stream_num = 2; @@ -91,7 +91,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_YX_1 = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_YX_L0.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_YX_L0.engine"; boe_config.strName = "YX1"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_YX_1->Init(boe_config); @@ -101,7 +101,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_YX_2 = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_YX_L127L255.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_YX_L127L255.engine"; boe_config.strName = "YX2"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_YX_2->Init(boe_config); @@ -113,7 +113,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Cls_L0 = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config jbl_config; jbl_config.gpuconfig.copy(gupconfig); - jbl_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/class_14.engine"; + jbl_config.strPath = "/home/aidlux/BOE/UseModel_FOG/class_14.engine"; jbl_config.inputType = AIModel_Base::Input_HWC; jbl_config.strName = "14_Class"; jbl_config.IsClass = true; @@ -125,7 +125,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Cls = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config jbl_config; jbl_config.gpuconfig.copy(gupconfig); - jbl_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/class_14.engine"; + jbl_config.strPath = "/home/aidlux/BOE/UseModel_FOG/class_14.engine"; jbl_config.inputType = AIModel_Base::Input_HWC; jbl_config.strName = "old_Class"; jbl_config.IsClass = true; @@ -138,7 +138,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_zf = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_zf.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_zf.engine"; boe_config.strName = "zf"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_zf->Init(boe_config); @@ -149,7 +149,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_127Cell = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_L127.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_L127.engine"; boe_config.strName = "127Cell"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_127Cell->Init(boe_config); @@ -160,7 +160,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_RE_POL = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/BOE_POL_128x128.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/BOE_POL_128x128.engine"; boe_config.strName = "RE_POL"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_RE_POL->Init(boe_config); @@ -171,7 +171,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_RE_AD = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/BOE_AD_128x128.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/BOE_AD_128x128.engine"; boe_config.strName = "RE_POL"; boe_config.inputType = AIModel_Base::Input_CHW; AI_defect_RE_AD->Init(boe_config); @@ -183,7 +183,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Edge_Big = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/Edge_Big.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/Edge_Big.engine"; boe_config.strName = "Edge_Big"; boe_config.inputType = AIModel_Base::Input_HWC; AI_defect_Edge_Big->Init(boe_config); @@ -194,7 +194,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Edge_Samll = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/Edge_Small.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/Edge_Small.engine"; boe_config.inputType = AIModel_Base::Input_HWC; boe_config.strName = "Edge_Small"; AI_defect_Edge_Samll->Init(boe_config); @@ -205,7 +205,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_LackPol = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/BOE_LOSSPOL.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/BOE_LOSSPOL.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "BOE_LOSSPOL"; AI_defect_LackPol->Init(boe_config); @@ -216,7 +216,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_MarkLine = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/defect_MARK_LINE.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/defect_MARK_LINE.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "MarkLine"; AI_defect_MarkLine->Init(boe_config); @@ -227,7 +227,7 @@ int AIFactory::InitALLAIModle(GPU_Config gupconfig) AI_defect_Edge_QX = AIModel_Base::GetInstance(); AIModel_Base::AIModelRun_Config boe_config; boe_config.gpuconfig.copy(gupconfig); - boe_config.strPath = "/home/aidlux/BOE/UseModel_Cell_ET/BOE_Edge_320x320.engine"; + boe_config.strPath = "/home/aidlux/BOE/UseModel_FOG/BOE_Edge_320x320.engine"; boe_config.inputType = AIModel_Base::Input_CHW; boe_config.strName = "Edge_QX"; AI_defect_Edge_QX->Init(boe_config); diff --git a/AlgorithmModule/CMakeLists.txt b/AlgorithmModule/CMakeLists.txt index c3415a1..2ed934c 100644 --- a/AlgorithmModule/CMakeLists.txt +++ b/AlgorithmModule/CMakeLists.txt @@ -69,9 +69,9 @@ file(GLOB_RECURSE SRC_LISTS ${PROJECT_SOURCE_DIR}/AIEngineModule/src/*.cu ) -add_library(CELL_ET_Check SHARED ${SRC_LISTS}) +add_library(FOG_Check SHARED ${SRC_LISTS}) -target_link_libraries(CELL_ET_Check +target_link_libraries(FOG_Check nvinfer Config ${OpenCV_LIBS} @@ -83,10 +83,10 @@ set(ModuleName "") # make install 安装到/usr/local下 # 自定义安装前缀 -set(CMAKE_INSTALL_PREFIX /usr/local/cellet CACHE PATH "Install path prefix" FORCE) +set(CMAKE_INSTALL_PREFIX /usr/local/fog CACHE PATH "Install path prefix" FORCE) set(HEADER_FILES include/ImgCheckBase.h include/ImgCheckConfig.h) # 安装动态库 -install(TARGETS CELL_ET_Check +install(TARGETS FOG_Check LIBRARY DESTINATION lib # 安装到 CMAKE_INSTALL_PREFIX/lib ARCHIVE DESTINATION lib/static RUNTIME DESTINATION bin diff --git a/AlgorithmModule/src/AI_Edge_Algin.cpp b/AlgorithmModule/src/AI_Edge_Algin.cpp index f1c764b..668358e 100644 --- a/AlgorithmModule/src/AI_Edge_Algin.cpp +++ b/AlgorithmModule/src/AI_Edge_Algin.cpp @@ -10,10 +10,10 @@ AI_Edge_Algin::AI_Edge_Algin() m_bModelSucc = false; m_str_curCamName = ""; AI_Factory = AIFactory::GetInstance(); - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Edge/Error/"); - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Edge/Result/"); - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Edge/Smasll/"); - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Edge/Big/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Edge/Error/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Edge/Result/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Edge/Smasll/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Edge/Big/"); runner = std::make_shared(); runner->Start(); } @@ -40,7 +40,7 @@ int AI_Edge_Algin::Detect(const cv::Mat &img, DetConfig *pDetConfig, std::shared { erridx = 0; } - str_error = "/home/aidlux/BOE/CELL_ET/Edge/Error/" + std::to_string(erridx) + "_src.png"; + str_error = "/home/aidlux/BOE/FOG/Edge/Error/" + std::to_string(erridx) + "_src.png"; } cv::Mat showimg; // 保存结果图片 @@ -288,8 +288,8 @@ int AI_Edge_Algin::Detect(const cv::Mat &img, DetConfig *pDetConfig, std::shared svidx = 0; /* code */ } - std::string str1 = "/home/aidlux/BOE/CELL_ET/Edge/Result/" + std::to_string(svidx) + "_mask.png"; - std::string str2 = "/home/aidlux/BOE/CELL_ET/Edge/Result/" + std::to_string(svidx) + "_show.png"; + std::string str1 = "/home/aidlux/BOE/FOG/Edge/Result/" + std::to_string(svidx) + "_mask.png"; + std::string str2 = "/home/aidlux/BOE/FOG/Edge/Result/" + std::to_string(svidx) + "_show.png"; int newWidth = 1280; float aspectRatio = static_cast(resultMask_erode_small.rows) / resultMask_erode_small.cols; @@ -370,8 +370,8 @@ int AI_Edge_Algin::SaveSmallImg(const cv::Mat &img, const cv::Mat &mask, cv::Rec if (bssss) { - std::string str1 = "/home/aidlux/BOE/CELL_ET/Edge/Smasll/" + std::to_string(svsmallidx) + "_in.png"; - std::string str2 = "/home/aidlux/BOE/CELL_ET/Edge/Smasll/" + std::to_string(svsmallidx) + "_in_mask.png"; + std::string str1 = "/home/aidlux/BOE/FOG/Edge/Smasll/" + std::to_string(svsmallidx) + "_in.png"; + std::string str2 = "/home/aidlux/BOE/FOG/Edge/Smasll/" + std::to_string(svsmallidx) + "_in_mask.png"; // std::string st3 = "/home/aidlux/BOE/Edge/Smasll/" + std::to_string(svsmallidx) + "_in_show.png"; cv::imwrite(str1, img); cv::imwrite(str2, mask); @@ -451,8 +451,8 @@ int AI_Edge_Algin::Det_big(const cv::Mat &img, vector &smallRoiList, std:: bigidx = 0; /* code */ } - std::string str1 = "/home/aidlux/BOE/CELL_ET/Edge/Big/" + std::to_string(bigidx) + "_in.png"; - std::string str2 = "/home/aidlux/BOE/CELL_ET/Edge/Big/" + std::to_string(bigidx) + "_in_mask.png"; + std::string str1 = "/home/aidlux/BOE/FOG/Edge/Big/" + std::to_string(bigidx) + "_in.png"; + std::string str2 = "/home/aidlux/BOE/FOG/Edge/Big/" + std::to_string(bigidx) + "_in_mask.png"; cv::imwrite(str1, detImg); cv::imwrite(str2, mask); } diff --git a/AlgorithmModule/src/AI_Edge_QX_Det.cpp b/AlgorithmModule/src/AI_Edge_QX_Det.cpp index 774dc71..b0429cc 100644 --- a/AlgorithmModule/src/AI_Edge_QX_Det.cpp +++ b/AlgorithmModule/src/AI_Edge_QX_Det.cpp @@ -6,7 +6,7 @@ AI_Edge_QX_Det::AI_Edge_QX_Det() { m_bInitSucc = false; - m_strSaveImgRootPath = "/home/aidlux/BOE/CELL_ET/Edge_QX/"; + m_strSaveImgRootPath = "/home/aidlux/BOE/FOG/Edge_QX/"; CheckUtil::CreateDir(m_strSaveImgRootPath); m_strSaveImgRootPath_OK = m_strSaveImgRootPath + "ok/"; CheckUtil::CreateDir(m_strSaveImgRootPath_OK); diff --git a/AlgorithmModule/src/AI_Mark_Det.cpp b/AlgorithmModule/src/AI_Mark_Det.cpp index 3fbf2e3..22f31c3 100644 --- a/AlgorithmModule/src/AI_Mark_Det.cpp +++ b/AlgorithmModule/src/AI_Mark_Det.cpp @@ -6,7 +6,7 @@ AI_Mark_Det::AI_Mark_Det() { m_bModelSucc = false; - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/MarkLine/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/MarkLine/"); m_pImageStorage = ImageStorage::getInstance(); m_Show_Area = 0; m_Show_Len = 0; @@ -241,8 +241,8 @@ int AI_Mark_Det::Detect(const cv::Mat &img, DetConfigResult *pDetConfig) if (pDetConfig->bDebugsaveimg || pDetConfig->bDetSaveImg) { - std::string str12 = "/home/aidlux/BOE/CELL_ET/MarkLine/" + pDetConfig->strCamName + "_" + std::to_string(ki) + "_in.png"; - std::string strmask = "/home/aidlux/BOE/CELL_ET/MarkLine/" + pDetConfig->strCamName + "_" + std::to_string(ki) + "_in_mask.png"; + std::string str12 = "/home/aidlux/BOE/FOG/MarkLine/" + pDetConfig->strCamName + "_" + std::to_string(ki) + "_in.png"; + std::string strmask = "/home/aidlux/BOE/FOG/MarkLine/" + pDetConfig->strCamName + "_" + std::to_string(ki) + "_in_mask.png"; if (pDetConfig->bDebugsaveimg) { str12 = pDetConfig->strCamName + "_" + std::to_string(ki) + "_in.png"; @@ -280,8 +280,8 @@ int AI_Mark_Det::Detect(const cv::Mat &img, DetConfigResult *pDetConfig) if (pDetConfig->bDebugsaveimg || pDetConfig->bDetSaveImg) { - std::string str12 = "/home/aidlux/BOE/CELL_ET/MarkLine/Check_big_" + pDetConfig->strCamName + "_in.png"; - std::string strmask = "/home/aidlux/BOE/CELL_ET/MarkLine/Check_big_" + pDetConfig->strCamName + "_in_mask.png"; + std::string str12 = "/home/aidlux/BOE/FOG/MarkLine/Check_big_" + pDetConfig->strCamName + "_in.png"; + std::string strmask = "/home/aidlux/BOE/FOG/MarkLine/Check_big_" + pDetConfig->strCamName + "_in_mask.png"; if (pDetConfig->bDebugsaveimg) { str12 = "Check_big_" + pDetConfig->strCamName + "_" + std::to_string(ki) + "_in.png"; diff --git a/AlgorithmModule/src/AI_Second_Det.cpp b/AlgorithmModule/src/AI_Second_Det.cpp index 8255db4..be46ef4 100644 --- a/AlgorithmModule/src/AI_Second_Det.cpp +++ b/AlgorithmModule/src/AI_Second_Det.cpp @@ -7,8 +7,8 @@ AI_SecondDet::AI_SecondDet() { m_bModelSucc_AD = false; m_bModelSucc_POL = false; - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Second/POL/"); - CheckUtil::CreateDir("/home/aidlux/BOE/CELL_ET/Second/AD/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Second/POL/"); + CheckUtil::CreateDir("/home/aidlux/BOE/FOG/Second/AD/"); m_pImageStorage = ImageStorage::getInstance(); m_Show_Area = 0; m_Show_Len = 0; @@ -517,7 +517,7 @@ int AI_SecondDet::SaveProcessImg(const cv::Mat &inImg, const cv::Mat &outImg, co static int saveimgIdx_ad = 0; // 循环存储 - std::string str_Root = "/home/aidlux/BOE/CELL_ET/Second/"; + std::string str_Root = "/home/aidlux/BOE/FOG/Second/"; if (pDetConfig->qx_type == CONFIG_QX_NAME_POL_Cell) { diff --git a/AlgorithmModule/src/AI_ZF_Det.cpp b/AlgorithmModule/src/AI_ZF_Det.cpp index aa72657..7a400b0 100644 --- a/AlgorithmModule/src/AI_ZF_Det.cpp +++ b/AlgorithmModule/src/AI_ZF_Det.cpp @@ -12,7 +12,7 @@ static bool compareContourAreas123(const vector &contour1, const vector

checkResult; int re = m_pALLImgCheckAnalysisy->GetCheckReuslt(checkResult); - saveImg("/home/aidlux/BOE/CELL_ET/testresult/", checkResult); + saveImg("/home/aidlux/BOE/FOG/testresult/", checkResult); getresultNum++; if (getresultNum == m_nProductSuccessCount) { @@ -812,7 +812,7 @@ void deal::ResultThread(int id) if (true) { // 存图 - std::string savepath = "/home/aidlux/BOE/CELL_ET/Detsave/"; + std::string savepath = "/home/aidlux/BOE/FOG/Detsave/"; saveImg(savepath, dealResult); // saveImg("/home/aidlux/BOE/ResultImg/", dealResult); } @@ -821,7 +821,7 @@ void deal::ResultThread(int id) // 存 检测统计 日志 mutex_DetResult_.lock(); m_DetResult.print(false); - std::string strlog = "/home/aidlux/BOE/CELL_ET/ResultImg/"; + std::string strlog = "/home/aidlux/BOE/FOG/ResultImg/"; if (m_strCurDate != "") { strlog += m_strCurDate; diff --git a/example/modifications_summary.txt b/example/modifications_summary.txt index 8519730..751210c 100644 --- a/example/modifications_summary.txt +++ b/example/modifications_summary.txt @@ -25,7 +25,7 @@ - Detailed error logging ## Test Command -./test_CELL_ET -f /path/to/images +./test_FOG -f /path/to/images ## Modified Files - example/deal.h - Removed unused members, added condition variables diff --git a/example/test_example.cpp b/example/test_example.cpp index 25f0644..74e6828 100644 --- a/example/test_example.cpp +++ b/example/test_example.cpp @@ -79,7 +79,7 @@ void test_LoadImage() printf("╚═══════════════════════════════════════════════════════════\n"); printf("\n"); - std::string root_dir = "/home/aidlux/BOE_CELL_ET/Image/20250718"; + std::string root_dir = "/home/aidlux/BOE_FOG/Image/20250718"; printf("测试目录：%s\n\n", root_dir.c_str()); LoadImage loader;