diff --git a/demo.py b/demo.py index 29aadb1..99c34d1 100644 --- a/demo.py +++ b/demo.py @@ -1,18 +1,77 @@ import sys sys.path.extend(['..','../AIlib' ]) -from AI import AI_process,AI_process_forest,get_postProcess_para +from AI import AI_process,AI_process_v2,AI_process_forest,get_postProcess_para import cv2,os,time from segutils.segmodel import SegModel +from segutils.segmodel_trt import SegModel_STDC_trt +from segutils.trtUtils import DetectMultiBackend from models.experimental import attempt_load from utils.torch_utils import select_device from utilsK.queRiver import get_labelnames,get_label_arrays import numpy as np import torch from utilsK.masterUtils import get_needed_objectsIndex -def river_demo(): +def river_demo_v2(): ##预先设置的参数 device_='0' ##选定模型，可选 cpu,'0','1' + ###注意TRT模型生成时，就需要对应cuda device，下面的trt文件是cuda:0生成的，device只能是0 + ##以下参数目前不可改 + + Detweights = "../AIlib/weights/yolov5/class8/bestcao_fp16.engine" ##升级后的检测模型 + labelnames = "../AIlib/weights/yolov5/class8/labelnames.json" ##对应类别表 + + seg_nclass = 2 + #Segweights = "../AIlib/weights/BiSeNet/checkpoint.pth" + Segweights = '../AIlib/weights/STDC/model_maxmIOU75_1720_0.946_360640.engine' ##升级的分割模型 + + postFile= '../AIlib/conf/para.json' + digitFont= { 'line_thickness':2,'boxLine_thickness':1, 'fontSize':1.0,'waterLineColor':(0,255,255),'waterLineWidth':3} + conf_thres,iou_thres,classes,rainbows=get_postProcess_para(postFile) + + ####模型选择参数用如下： + mode_paras=[ + {"id":"0","config":{"k1":"v1","k2":"v2"}}, + {"id":"1","config":{"k1":"v1","k2":"v2"}}, + {"id":"2","config":{"k1":"v1","k2":"v2"}}, + {"id":"3","config":{"k1":"v1","k2":"v2"}}, + {"id":"4","config":{"k1":"v1","k2":"v2"}}, + {"id":"5","config":{"k1":"v1","k2":"v2"}}, + {"id":"6","config":{"k1":"v1","k2":"v2"}}, + {"id":"7","config":{"k1":"v1","k2":"v2"}}, + ] + + allowedList,allowedList_string=get_needed_objectsIndex(mode_paras) + #allowedList=[0,1,2,3] + ##加载模型，准备好显示字符 + device = select_device(device_) + names=get_labelnames(labelnames) + + label_arraylist = get_label_arrays(names,rainbows,outfontsize=40,fontpath="../AIlib/conf/platech.ttf") + half = device.type != 'cpu' # half precision only supported on CUDA + + segmodel = SegModel_STDC_trt(weights=Segweights,modelsize=(640,360),std=(0.229, 0.224, 0.225),mean=(0.485, 0.456, 0.406),device=device) + model = DetectMultiBackend(Detweights, device=device) + + ##图像测试 + #url='images/examples/20220624_响水河_12300_1621.jpg' + impth = 'images/slope/' + outpth = 'images/results/' + folders = os.listdir(impth) + for i in range(len(folders)): + imgpath = os.path.join(impth, folders[i]) + im0s=[cv2.imread(imgpath)] + H,W,C = im0s[0].shape + time00 = time.time() + p_result,timeOut = AI_process_v2(im0s,model,segmodel,names,label_arraylist,rainbows,half,device,conf_thres, iou_thres,allowedList,font=digitFont) + time11 = time.time() + image_array = p_result[1] + cv2.imwrite( os.path.join( outpth,folders[i] ) ,image_array ) + print('%s,%d*%d,AI-process: %.1f, %s'%(folders[i],H,W, (time11 - time00) * 1000,timeOut)) + +def river_demo(): + ##预先设置的参数 + device_='1' ##选定模型，可选 cpu,'0','1' ##以下参数目前不可改 #Detweights = "../AIlib/weights/yolov5/class5/best_5classes.pt" @@ -54,6 +113,7 @@ def river_demo(): half = device.type != 'cpu' # half precision only supported on CUDA model = attempt_load(Detweights, map_location=device) # load FP32 model if half: model.half() + segmodel = SegModel(nclass=seg_nclass,weights=Segweights,device=device) @@ -74,7 +134,6 @@ def river_demo(): cv2.imwrite( os.path.join( outpth,folders[i] ) ,image_array ) print('%s,%d*%d,AI-process: %.1f, %s'%(folders[i],H,W, (time11 - time00) * 1000,timeOut)) - def road_forest_demo(business ): ##使用森林，道路模型,business 控制['forest','road'] @@ -187,7 +246,7 @@ def jkm_demo(): if __name__=="__main__": - #river_demo() + river_demo_v2() #road_forest_demo('forest' ) - jkm_demo() + #jkm_demo() diff --git a/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg b/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg new file mode 100644 index 0000000..00267b9 Binary files /dev/null and b/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg differ diff --git a/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg b/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg new file mode 100644 index 0000000..1ec7a02 Binary files /dev/null and b/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg differ diff --git a/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg b/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg new file mode 100644 index 0000000..43e233f Binary files /dev/null and b/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg differ diff --git a/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg b/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg new file mode 100644 index 0000000..7593a58 Binary files /dev/null and b/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg differ diff --git a/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg b/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg new file mode 100644 index 0000000..43b799c Binary files /dev/null and b/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg differ diff --git a/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg b/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg new file mode 100644 index 0000000..1e05173 Binary files /dev/null and b/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg differ diff --git a/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg b/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg new file mode 100644 index 0000000..5c2b5be Binary files /dev/null and b/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg differ diff --git a/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg b/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg new file mode 100644 index 0000000..3a19200 Binary files /dev/null and b/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg differ diff --git a/images/results/垃圾_20220713_吨粮河_11745_1291.jpg b/images/results/垃圾_20220713_吨粮河_11745_1291.jpg new file mode 100644 index 0000000..b93c4a5 Binary files /dev/null and b/images/results/垃圾_20220713_吨粮河_11745_1291.jpg differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg new file mode 100644 index 0000000..0b47c40 Binary files /dev/null and b/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg new file mode 100644 index 0000000..0463c01 Binary files /dev/null and b/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg new file mode 100644 index 0000000..a3bc77b Binary files /dev/null and b/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg differ diff --git a/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg b/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg new file mode 100644 index 0000000..e623ea8 Binary files /dev/null and b/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg differ diff --git a/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg b/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg new file mode 100644 index 0000000..06b9fd9 Binary files /dev/null and b/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg differ diff --git a/images/results/垃圾_20220713_百水河7._1170_9467.jpg b/images/results/垃圾_20220713_百水河7._1170_9467.jpg new file mode 100644 index 0000000..5e83c29 Binary files /dev/null and b/images/results/垃圾_20220713_百水河7._1170_9467.jpg differ diff --git a/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg b/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg new file mode 100644 index 0000000..0c18bda Binary files /dev/null and b/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg differ diff --git a/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg b/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg new file mode 100644 index 0000000..b4f9480 Binary files /dev/null and b/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg differ diff --git a/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg b/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg new file mode 100644 index 0000000..864c6ba Binary files /dev/null and b/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg differ diff --git a/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg b/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg new file mode 100644 index 0000000..55b4167 Binary files /dev/null and b/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg differ diff --git a/images/results/菜地_20220713_东洼子沟8_375_3912.jpg b/images/results/菜地_20220713_东洼子沟8_375_3912.jpg new file mode 100644 index 0000000..7699f38 Binary files /dev/null and b/images/results/菜地_20220713_东洼子沟8_375_3912.jpg differ diff --git a/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg b/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg new file mode 100644 index 0000000..7ba120a Binary files /dev/null and b/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg differ diff --git a/images/results/菜地_20220713_前进河_2910_2212.jpg b/images/results/菜地_20220713_前进河_2910_2212.jpg new file mode 100644 index 0000000..1d833cc Binary files /dev/null and b/images/results/菜地_20220713_前进河_2910_2212.jpg differ diff --git a/images/results/菜地_20220713_前进河_3015_2226.jpg b/images/results/菜地_20220713_前进河_3015_2226.jpg new file mode 100644 index 0000000..a451b32 Binary files /dev/null and b/images/results/菜地_20220713_前进河_3015_2226.jpg differ diff --git a/images/results/菜地_20220713_吨粮河_5640_3664.jpg b/images/results/菜地_20220713_吨粮河_5640_3664.jpg new file mode 100644 index 0000000..1df0b80 Binary files /dev/null and b/images/results/菜地_20220713_吨粮河_5640_3664.jpg differ diff --git a/images/results/菜地_20220713_吨粮河_9825_1476.jpg b/images/results/菜地_20220713_吨粮河_9825_1476.jpg new file mode 100644 index 0000000..836eb00 Binary files /dev/null and b/images/results/菜地_20220713_吨粮河_9825_1476.jpg differ diff --git a/images/results/菜地_20220713_工农联盟河_5835_2926.jpg b/images/results/菜地_20220713_工农联盟河_5835_2926.jpg new file mode 100644 index 0000000..5277097 Binary files /dev/null and b/images/results/菜地_20220713_工农联盟河_5835_2926.jpg differ diff --git a/images/results/菜地_20220713_文苑河7_15525_6018.jpg b/images/results/菜地_20220713_文苑河7_15525_6018.jpg new file mode 100644 index 0000000..1b45714 Binary files /dev/null and b/images/results/菜地_20220713_文苑河7_15525_6018.jpg differ diff --git a/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg b/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg new file mode 100644 index 0000000..c1febef Binary files /dev/null and b/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg differ diff --git a/images/results/菜地_20220713_青年河8_4335_1578.jpg b/images/results/菜地_20220713_青年河8_4335_1578.jpg new file mode 100644 index 0000000..b2ee2d8 Binary files /dev/null and b/images/results/菜地_20220713_青年河8_4335_1578.jpg differ diff --git a/images/results/菜地_20220713_青年河8_5925_8056.jpg b/images/results/菜地_20220713_青年河8_5925_8056.jpg new file mode 100644 index 0000000..d9a5536 Binary files /dev/null and b/images/results/菜地_20220713_青年河8_5925_8056.jpg differ diff --git a/images/results/菜地_20220713_青年河8_7710_5941.jpg b/images/results/菜地_20220713_青年河8_7710_5941.jpg new file mode 100644 index 0000000..0325fb9 Binary files /dev/null and b/images/results/菜地_20220713_青年河8_7710_5941.jpg differ diff --git a/images/results/违建_20220713_东洼子沟8_1530_4829.jpg b/images/results/违建_20220713_东洼子沟8_1530_4829.jpg new file mode 100644 index 0000000..15608f8 Binary files /dev/null and b/images/results/违建_20220713_东洼子沟8_1530_4829.jpg differ diff --git a/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg b/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg new file mode 100644 index 0000000..35b1c80 Binary files /dev/null and b/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg differ diff --git a/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg b/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg new file mode 100644 index 0000000..b6f8948 Binary files /dev/null and b/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg differ diff --git a/images/results/违建_20220713_前进河_2265_3219.jpg b/images/results/违建_20220713_前进河_2265_3219.jpg new file mode 100644 index 0000000..3eb945f Binary files /dev/null and b/images/results/违建_20220713_前进河_2265_3219.jpg differ diff --git a/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg b/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg new file mode 100644 index 0000000..15dd92b Binary files /dev/null and b/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg differ diff --git a/images/results/违建_20220713_北圩十字河_450_1309.jpg b/images/results/违建_20220713_北圩十字河_450_1309.jpg new file mode 100644 index 0000000..175263e Binary files /dev/null and b/images/results/违建_20220713_北圩十字河_450_1309.jpg differ diff --git a/images/results/违建_20220713_北圩十字河_5130_3042.jpg b/images/results/违建_20220713_北圩十字河_5130_3042.jpg new file mode 100644 index 0000000..22a035b Binary files /dev/null and b/images/results/违建_20220713_北圩十字河_5130_3042.jpg differ diff --git a/images/results/违建_20220713_吨粮河_12840_4957.jpg b/images/results/违建_20220713_吨粮河_12840_4957.jpg new file mode 100644 index 0000000..9e4b1cc Binary files /dev/null and b/images/results/违建_20220713_吨粮河_12840_4957.jpg differ diff --git a/images/results/违建_20220713_小柳河_5685_9052.jpg b/images/results/违建_20220713_小柳河_5685_9052.jpg new file mode 100644 index 0000000..9e58879 Binary files /dev/null and b/images/results/违建_20220713_小柳河_5685_9052.jpg differ diff --git a/images/results/违建_20220713_百水河7._10680_5822.jpg b/images/results/违建_20220713_百水河7._10680_5822.jpg new file mode 100644 index 0000000..834df0f Binary files /dev/null and b/images/results/违建_20220713_百水河7._10680_5822.jpg differ diff --git a/images/results/违建_20220713_百水河7._11220_3461.jpg b/images/results/违建_20220713_百水河7._11220_3461.jpg new file mode 100644 index 0000000..3f67809 Binary files /dev/null and b/images/results/违建_20220713_百水河7._11220_3461.jpg differ diff --git a/images/results/违建_20220713_百水河支流_1170_6936.jpg b/images/results/违建_20220713_百水河支流_1170_6936.jpg new file mode 100644 index 0000000..5b105de Binary files /dev/null and b/images/results/违建_20220713_百水河支流_1170_6936.jpg differ diff --git a/images/results/违建_20220713_百水河支流_1695_7236.jpg b/images/results/违建_20220713_百水河支流_1695_7236.jpg new file mode 100644 index 0000000..25ee3b7 Binary files /dev/null and b/images/results/违建_20220713_百水河支流_1695_7236.jpg differ diff --git a/images/results/违建_20220713_百水河支流_2610_6678.jpg b/images/results/违建_20220713_百水河支流_2610_6678.jpg new file mode 100644 index 0000000..3530247 Binary files /dev/null and b/images/results/违建_20220713_百水河支流_2610_6678.jpg differ diff --git a/images/results/违建_20220713_石砌沟7_15_2108.jpg b/images/results/违建_20220713_石砌沟7_15_2108.jpg new file mode 100644 index 0000000..01b8824 Binary files /dev/null and b/images/results/违建_20220713_石砌沟7_15_2108.jpg differ diff --git a/images/results/违建_20220713_石砌沟7_2595_7092.jpg b/images/results/违建_20220713_石砌沟7_2595_7092.jpg new file mode 100644 index 0000000..660babd Binary files /dev/null and b/images/results/违建_20220713_石砌沟7_2595_7092.jpg differ diff --git a/images/results/违建_20220713_红花河8_45_2905.jpg b/images/results/违建_20220713_红花河8_45_2905.jpg new file mode 100644 index 0000000..46ef84b Binary files /dev/null and b/images/results/违建_20220713_红花河8_45_2905.jpg differ diff --git a/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg b/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg new file mode 100644 index 0000000..c1febef Binary files /dev/null and b/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg differ diff --git a/readme.md b/readme.md index aca6243..b2a30ac 100644 --- a/readme.md +++ b/readme.md @@ -11,4 +11,10 @@ 增加道路模型，测试图像在test/images/road 2022.11.21 -增加健康码（健康吗、行程卡）检测、车牌检测，测试图像在test/images/jkm、test/images/plate +增加健康码（健康吗、行程卡）检测、车牌检测，测试图像在test/images/jkm、test/images/plate + +2022.12.06 +将河道测试的代码换成trt的。 +fp16,trt:yolov5,torch1.8 :4.1 ms STDC:1.2 ms +fp16,pth:yolovt,torch1.8 :9.6 ms STDC:4.6 ms +fp16,pth:yolov5,torch1.7 :6.0ms, STDC:7.2 ms