From 3f2d9d1703a4d2ee4d1ba7ddae28d9e6e156f65b Mon Sep 17 00:00:00 2001
From: th <wangjin@ta-tech.cn>
Date: Fri, 11 Apr 2025 16:03:15 +0800
Subject: [PATCH] ss

---
 .../__pycache__/uploadGPU.cpython-38.pyc      | Bin 0 -> 3542 bytes
 enums/ModelTypeEnum.py                        |  14 +++++++++++---
 .../__pycache__/ModelTypeEnum.cpython-38.pyc  | Bin 16931 -> 17042 bytes
 readme.md                                     |   3 +++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 concurrency/__pycache__/uploadGPU.cpython-38.pyc

diff --git a/concurrency/__pycache__/uploadGPU.cpython-38.pyc b/concurrency/__pycache__/uploadGPU.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0928cb6d5a6d7788f17b525dc37ed71a0973172b
GIT binary patch
literal 3542
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

literal 0
HcmV?d00001

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 ebfb24c0d79725f73df2f7dd23cb9d2eb724b901..9fa03aa2013edc605888d540f901f98118b648e9 100644
GIT binary patch
delta 854
zcmZutT}YE*6yEvv?b~!e&ds^0Q|Fq_&H1xL#axbM8AVAHK?D)ikx^OFw`ul6KWKGR
z6dj0uKCu!nBqHP^2ukQKFS}KOu1u!{c@y4fomagHdJpG$&-*^lIp=-P_y|0{1CFD1
zd%l5J?EY%naCyox>(4LZV;6g7hWZ=*H_d288(Pqg4lK|VbZRCn)FgCWhhhV|vw%hD
z!D95{rqaPmOIqP9A6p5QVji2oGS2pEd04K=Sb>!oz$y&lHVkQ|ti*dY-`8LmYcaw#
zee5=jZr99NBi0ErZN%6{BTH7sdVWR&HjWsuX}4h*SQ<yx9x+6k>2-Oyd%(tDn1Apx
zcbgVIK3se>F`)3p;`oPoZA=9Y)sTQ`hTI_$RSKvOkQH!@A)-(q;IVF;g*sxQ@8u!)
zob62CsZ8c@@7askJEYbzLl7(?XIQ2{MT@6<;rTPMa>?{&Fq@oIXw+M&4^>2g<ajSU
zC3|4FMD#F#Lz2K^bgs$ka)AO8TN6zLcEMMDF>noFRL7uMg3o$i=mx+KTCQG)94*zn
zfOY+DI0)d<Cu;{e3#cmkg{fS00G8=w-4ygtVeAcr_32nxl8#Gs-k;LLjc-9xmuRJF
z2%gZn_<p#hzmM;eK-2#;+a)lPy>*Y-#uHNQKw2ySGy2umHrOD77PUYyPM}w@GWe#i
zw%Py7{GtQxW0J|J|7`D+z(em+Ug}EJL$iJ<Q3c>7+L>`Ta;XT+Sx)!kl~gvXs&ODF
zELKX5+@h6QI`_J^BxWJ$8Mv^e@cB0soZb^r)MD`>uK*u?>O5#_;IN1s$uel5X!4%*
zA3hm&Czy|LfsD-4w-{xkn$UkIeE=&|kg5Wi;;DL%D5ACta0}QWpo2204oL84PIw0;
Ra9Q&WGHm&ptmMlQ`~|Yo-GKlA

delta 774
zcmZ8dO;1x%5Pfs|+E-dyXiHm=(l08dw534_AC*u_3`C4XQ4?b{CT2`yjF3ED6ODo<
zU`$*X<LCl>ek8in4c?83(YW(3hzm7tpc{!Bc7XGcjo!&Ub2I16xpVKsJMeN5yr(@L
zm%?lM%39@Kb;Y|Hq3_PRTW`38fC6o(R#ZblJ33H9C)SxNx=exYn-Eg4-T?HV7aOpV
z6+ZN%qoQ&Sa5Q0%J2VV&N7$^xX3j0R4_h&UZ5YLvX*UGtIM)-H#CA-vSAe%45AHWL
z!-gFeS+QYy_kvDC#f)jkF3c_}m^-X2088`OZE7c#Oo2YOr9(RK;QAR0J}}gdGh|dc
z8coq$bSkFDEGEh@wzj-vty-z__pn;h&&r)>H$aMJdM?8QqWD7a6iXFw2?6!ns^$Q}
z(Mg5GD14E6;s(HD`75ajcqcbg^8nwd+Oh3kw=U_oAVnvV5n4`HVN*7CCPBCawfM5~
zLS_QQjzX`yKEpcAW~)%6T6P7-=t=H1#N>EBEnrH{6gEI)9P~6CBkVEYKCSjlz%`jV
za74f(Io<0K0F)R=(zCvH&Bbrm-9W$Narh)_ef_XYwrd`X@B-ZqL}X>a^M84yp_PYt
zKlog133;wKEFeJ9(J;Lo%0pKE7)k&%kQkl~<k=?!U!50c@Os%WbiDuszL3LjWB*=y
zH9YR$lW3M?vU+t-(cHAF;P%OkLvOOi30e@MZ0VRi$H#h_E44z7mP&Ws|L`N}K#}<b
z8_cTwrB0h_(~I)bNHf3&&6g7(=tVgnv`qAV3w#y~STIOG%ZH%Ik2xQn7T|Zg6czUN
Kmg;b+0{#FHxWXg=

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