diff --git a/concurrency/__pycache__/uploadGPU.cpython-38.pyc b/concurrency/__pycache__/uploadGPU.cpython-38.pyc new file mode 100644 index 0000000..0928cb6 Binary files /dev/null and b/concurrency/__pycache__/uploadGPU.cpython-38.pyc differ diff --git a/enums/ModelTypeEnum.py b/enums/ModelTypeEnum.py index fca7d90..93eaff9 100644 --- a/enums/ModelTypeEnum.py +++ b/enums/ModelTypeEnum.py @@ -360,10 +360,18 @@ class ModelType(Enum): }) CITY_MANGEMENT_MODEL = ("16", "016", "城管模型", 'cityMangement2', lambda device, gpuName: { - 'labelnames': ["车辆", "垃圾", "商贩", "违停"], + 'labelnames': ["车辆", "垃圾", "商贩", "违停","占道经营","裸土"], 'postProcess':{ 'function':dmpr_yolo_stdc, - 'pars':{'carCls':0 ,'illCls':3,'scaleRatio':0.5,'border':80} + 'pars':{'carCls':0 ,'illCls':5,'scaleRatio':0.5,'border':80, + #车辆","垃圾","商贩","裸土","占道经营","违停"---> + #"车辆","垃圾","商贩","违停","占道经营","裸土" + 'classReindex':{ 0:0,1:1,2:2,3:5,4:4,5:3 } + + + }, + + }, 'models':[ { @@ -371,7 +379,7 @@ class ModelType(Enum): 'weight':'../AIlib2/weights/cityMangement3/yolov5_%s_fp16.engine'%(gpuName), 'name':'yolov5', 'model':yolov5Model, - 'par':{ 'half':True,'device':'cuda:0' ,'conf_thres':0.25,'iou_thres':0.45,'allowedList':[0,1,2,3],'segRegionCnt':1, 'trtFlag_det':False,'trtFlag_seg':False, "score_byClass":{"0":0.8,"1":0.4,"2":0.5,"3":0.5 } } + 'par':{ 'half':True,'device':'cuda:0' ,'conf_thres':0.25,'iou_thres':0.45,'allowedList':[0,1,2,3,4,5],'segRegionCnt':1, 'trtFlag_det':False,'trtFlag_seg':False, "score_byClass":{"0":0.8,"1":0.4,"2":0.5,"3":0.5,"4":0.4,"5":0.5 } } }, { 'weight':'../AIlib2/weights/conf/cityMangement3/dmpr.pth', diff --git a/enums/__pycache__/ModelTypeEnum.cpython-38.pyc b/enums/__pycache__/ModelTypeEnum.cpython-38.pyc index ebfb24c..9fa03aa 100644 Binary files a/enums/__pycache__/ModelTypeEnum.cpython-38.pyc and b/enums/__pycache__/ModelTypeEnum.cpython-38.pyc differ diff --git a/readme.md b/readme.md index d29501a..49661d6 100644 --- a/readme.md +++ b/readme.md @@ -6,3 +6,6 @@ (2)修改了minio情况下的,文件名命名方式。 3.2025.02.12 (1)增加了对alg算法开发的代码。可以通过配置文件config/service/dsp_test_service.yml中algSwitch: true,决定是否启用。 + + +4.create branch