diff --git a/demo.py b/demo.py index 99c34d1..5d27d2d 100644 --- a/demo.py +++ b/demo.py @@ -18,12 +18,14 @@ def river_demo_v2(): ###注意TRT模型生成时,就需要对应cuda device,下面的trt文件是cuda:0生成的,device只能是0 ##以下参数目前不可改 - Detweights = "../AIlib/weights/yolov5/class8/bestcao_fp16.engine" ##升级后的检测模型 + gpuname='3090' + Detweights = "../AIlib/weights/yolov5/class8/bestcao_%s_fp16.engine"%(gpuname) ##升级后的检测模型 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' ##升级的分割模型 + Segweights = '../AIlib/weights/STDC/model_maxmIOU75_1720_0.946_360640_%s_fp16.engine'%(gpuname) ##升级的分割模型 postFile= '../AIlib/conf/para.json' digitFont= { 'line_thickness':2,'boxLine_thickness':1, 'fontSize':1.0,'waterLineColor':(0,255,255),'waterLineWidth':3} diff --git a/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg b/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg deleted file mode 100644 index 00267b9..0000000 Binary files a/images/results/垃圾_20220713_东洼子沟8_7740_9949.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg b/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg deleted file mode 100644 index 1ec7a02..0000000 Binary files a/images/results/垃圾_20220713_中和桥沟8_1050_4046.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg b/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg deleted file mode 100644 index 43e233f..0000000 Binary files a/images/results/垃圾_20220713_中和桥沟8_1320_6950.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg b/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg deleted file mode 100644 index 7593a58..0000000 Binary files a/images/results/垃圾_20220713_中和桥沟8_3870_5366.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg b/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg deleted file mode 100644 index 43b799c..0000000 Binary files a/images/results/垃圾_20220713_仙林老十里长沟_4755_8969.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg b/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg deleted file mode 100644 index 1e05173..0000000 Binary files a/images/results/垃圾_20220713_仙林老十里长沟_4980_3384.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg b/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg deleted file mode 100644 index 5c2b5be..0000000 Binary files a/images/results/垃圾_20220713_北十里长沟西支7_1140_5591.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg b/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg deleted file mode 100644 index 3a19200..0000000 Binary files a/images/results/垃圾_20220713_北十里长沟西支7_450_6063.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_吨粮河_11745_1291.jpg b/images/results/垃圾_20220713_吨粮河_11745_1291.jpg deleted file mode 100644 index b93c4a5..0000000 Binary files a/images/results/垃圾_20220713_吨粮河_11745_1291.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg deleted file mode 100644 index 0b47c40..0000000 Binary files a/images/results/垃圾_20220713_孝陵卫西沟8_1830_5266.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg deleted file mode 100644 index 0463c01..0000000 Binary files a/images/results/垃圾_20220713_孝陵卫西沟8_675_3099.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg b/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg deleted file mode 100644 index a3bc77b..0000000 Binary files a/images/results/垃圾_20220713_孝陵卫西沟8_885_2579.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg b/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg deleted file mode 100644 index e623ea8..0000000 Binary files a/images/results/垃圾_20220713_涂家营沟_11190_3730.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg b/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg deleted file mode 100644 index 06b9fd9..0000000 Binary files a/images/results/垃圾_20220713_牛王庙沟_9240_9271.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_百水河7._1170_9467.jpg b/images/results/垃圾_20220713_百水河7._1170_9467.jpg deleted file mode 100644 index 5e83c29..0000000 Binary files a/images/results/垃圾_20220713_百水河7._1170_9467.jpg and /dev/null differ diff --git a/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg b/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg deleted file mode 100644 index 0c18bda..0000000 Binary files a/images/results/垃圾_20220713_石砌沟7_5160_4900.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg b/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg deleted file mode 100644 index b4f9480..0000000 Binary files a/images/results/菜地_20220713_丁家庄沟_1860_2655.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg b/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg deleted file mode 100644 index 864c6ba..0000000 Binary files a/images/results/菜地_20220713_东洼子沟8_1845_6862.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg b/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg deleted file mode 100644 index 55b4167..0000000 Binary files a/images/results/菜地_20220713_东洼子沟8_2760_2369.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_东洼子沟8_375_3912.jpg b/images/results/菜地_20220713_东洼子沟8_375_3912.jpg deleted file mode 100644 index 7699f38..0000000 Binary files a/images/results/菜地_20220713_东洼子沟8_375_3912.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg b/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg deleted file mode 100644 index 7ba120a..0000000 Binary files a/images/results/菜地_20220713_东洼子沟8_4365_5265.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_前进河_2910_2212.jpg b/images/results/菜地_20220713_前进河_2910_2212.jpg deleted file mode 100644 index 1d833cc..0000000 Binary files a/images/results/菜地_20220713_前进河_2910_2212.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_前进河_3015_2226.jpg b/images/results/菜地_20220713_前进河_3015_2226.jpg deleted file mode 100644 index a451b32..0000000 Binary files a/images/results/菜地_20220713_前进河_3015_2226.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_吨粮河_5640_3664.jpg b/images/results/菜地_20220713_吨粮河_5640_3664.jpg deleted file mode 100644 index 1df0b80..0000000 Binary files a/images/results/菜地_20220713_吨粮河_5640_3664.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_吨粮河_9825_1476.jpg b/images/results/菜地_20220713_吨粮河_9825_1476.jpg deleted file mode 100644 index 836eb00..0000000 Binary files a/images/results/菜地_20220713_吨粮河_9825_1476.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_工农联盟河_5835_2926.jpg b/images/results/菜地_20220713_工农联盟河_5835_2926.jpg deleted file mode 100644 index 5277097..0000000 Binary files a/images/results/菜地_20220713_工农联盟河_5835_2926.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_文苑河7_15525_6018.jpg b/images/results/菜地_20220713_文苑河7_15525_6018.jpg deleted file mode 100644 index 1b45714..0000000 Binary files a/images/results/菜地_20220713_文苑河7_15525_6018.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg b/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg deleted file mode 100644 index c1febef..0000000 Binary files a/images/results/菜地_20220713_运粮河-秦淮段8_14745_7080.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_青年河8_4335_1578.jpg b/images/results/菜地_20220713_青年河8_4335_1578.jpg deleted file mode 100644 index b2ee2d8..0000000 Binary files a/images/results/菜地_20220713_青年河8_4335_1578.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_青年河8_5925_8056.jpg b/images/results/菜地_20220713_青年河8_5925_8056.jpg deleted file mode 100644 index d9a5536..0000000 Binary files a/images/results/菜地_20220713_青年河8_5925_8056.jpg and /dev/null differ diff --git a/images/results/菜地_20220713_青年河8_7710_5941.jpg b/images/results/菜地_20220713_青年河8_7710_5941.jpg deleted file mode 100644 index 0325fb9..0000000 Binary files a/images/results/菜地_20220713_青年河8_7710_5941.jpg and /dev/null differ diff --git a/images/results/违建_20220713_东洼子沟8_1530_4829.jpg b/images/results/违建_20220713_东洼子沟8_1530_4829.jpg deleted file mode 100644 index 15608f8..0000000 Binary files a/images/results/违建_20220713_东洼子沟8_1530_4829.jpg and /dev/null differ diff --git a/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg b/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg deleted file mode 100644 index 35b1c80..0000000 Binary files a/images/results/违建_20220713_仙林老十里长沟_3780_4099.jpg and /dev/null differ diff --git a/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg b/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg deleted file mode 100644 index b6f8948..0000000 Binary files a/images/results/违建_20220713_仙林老十里长沟_4575_1319.jpg and /dev/null differ diff --git a/images/results/违建_20220713_前进河_2265_3219.jpg b/images/results/违建_20220713_前进河_2265_3219.jpg deleted file mode 100644 index 3eb945f..0000000 Binary files a/images/results/违建_20220713_前进河_2265_3219.jpg and /dev/null differ diff --git a/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg b/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg deleted file mode 100644 index 15dd92b..0000000 Binary files a/images/results/违建_20220713_北十里长沟西支7_10830_7793.jpg and /dev/null differ diff --git a/images/results/违建_20220713_北圩十字河_450_1309.jpg b/images/results/违建_20220713_北圩十字河_450_1309.jpg deleted file mode 100644 index 175263e..0000000 Binary files a/images/results/违建_20220713_北圩十字河_450_1309.jpg and /dev/null differ diff --git a/images/results/违建_20220713_北圩十字河_5130_3042.jpg b/images/results/违建_20220713_北圩十字河_5130_3042.jpg deleted file mode 100644 index 22a035b..0000000 Binary files a/images/results/违建_20220713_北圩十字河_5130_3042.jpg and /dev/null differ diff --git a/images/results/违建_20220713_吨粮河_12840_4957.jpg b/images/results/违建_20220713_吨粮河_12840_4957.jpg deleted file mode 100644 index 9e4b1cc..0000000 Binary files a/images/results/违建_20220713_吨粮河_12840_4957.jpg and /dev/null differ diff --git a/images/results/违建_20220713_小柳河_5685_9052.jpg b/images/results/违建_20220713_小柳河_5685_9052.jpg deleted file mode 100644 index 9e58879..0000000 Binary files a/images/results/违建_20220713_小柳河_5685_9052.jpg and /dev/null differ diff --git a/images/results/违建_20220713_百水河7._10680_5822.jpg b/images/results/违建_20220713_百水河7._10680_5822.jpg deleted file mode 100644 index 834df0f..0000000 Binary files a/images/results/违建_20220713_百水河7._10680_5822.jpg and /dev/null differ diff --git a/images/results/违建_20220713_百水河7._11220_3461.jpg b/images/results/违建_20220713_百水河7._11220_3461.jpg deleted file mode 100644 index 3f67809..0000000 Binary files a/images/results/违建_20220713_百水河7._11220_3461.jpg and /dev/null differ diff --git a/images/results/违建_20220713_百水河支流_1170_6936.jpg b/images/results/违建_20220713_百水河支流_1170_6936.jpg deleted file mode 100644 index 5b105de..0000000 Binary files a/images/results/违建_20220713_百水河支流_1170_6936.jpg and /dev/null differ diff --git a/images/results/违建_20220713_百水河支流_1695_7236.jpg b/images/results/违建_20220713_百水河支流_1695_7236.jpg deleted file mode 100644 index 25ee3b7..0000000 Binary files a/images/results/违建_20220713_百水河支流_1695_7236.jpg and /dev/null differ diff --git a/images/results/违建_20220713_百水河支流_2610_6678.jpg b/images/results/违建_20220713_百水河支流_2610_6678.jpg deleted file mode 100644 index 3530247..0000000 Binary files a/images/results/违建_20220713_百水河支流_2610_6678.jpg and /dev/null differ diff --git a/images/results/违建_20220713_石砌沟7_15_2108.jpg b/images/results/违建_20220713_石砌沟7_15_2108.jpg deleted file mode 100644 index 01b8824..0000000 Binary files a/images/results/违建_20220713_石砌沟7_15_2108.jpg and /dev/null differ diff --git a/images/results/违建_20220713_石砌沟7_2595_7092.jpg b/images/results/违建_20220713_石砌沟7_2595_7092.jpg deleted file mode 100644 index 660babd..0000000 Binary files a/images/results/违建_20220713_石砌沟7_2595_7092.jpg and /dev/null differ diff --git a/images/results/违建_20220713_红花河8_45_2905.jpg b/images/results/违建_20220713_红花河8_45_2905.jpg deleted file mode 100644 index 46ef84b..0000000 Binary files a/images/results/违建_20220713_红花河8_45_2905.jpg and /dev/null differ diff --git a/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg b/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg deleted file mode 100644 index c1febef..0000000 Binary files a/images/results/违建_20220713_运粮河-秦淮段8_14745_7080.jpg and /dev/null differ