gitadmin
/
tuoheng_algN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1)新增M027:建筑物下行人检测及计数 2)密集人群计数模型及自研车牌模型优化 3)分类模型支持pt模型加载（巴中水利）

This commit is contained in:
th 2025-07-25 18:52:10 +08:00
parent b75a74d52c
commit 585a7a05f7
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/ModelUtils.py
View File

@ -406,13 +406,8 @@ class DENSECROWDCOUNTModel:
par = modeType.value[4](str(device), gpu_name) par = modeType.value[4](str(device), gpu_name)
rainbows = par["rainbows"] rainbows = par["rainbows"]
models=[ modelPar['model'](weights=modelPar['weight'],par=modelPar['par']) for modelPar in par['models'] ] models=[ modelPar['model'](weights=modelPar['weight'],par=modelPar['par']) for modelPar in par['models'] ]
<<<<<<< HEAD
postPar = [pp['par'] for pp in par['models']] postPar = [pp['par'] for pp in par['models']]
self.model_conf = (modeType, device, models, postPar, rainbows) self.model_conf = (modeType, device, models, postPar, rainbows)
=======
postPar = par['models'][0]['par']
self.model_conf = (modeType, device, models[0], postPar, rainbows)
>>>>>>> origin/zsl
except Exception: except Exception:
logger.error("模型加载异常：{}, requestId:{}", format_exc(), requestId) logger.error("模型加载异常：{}, requestId:{}", format_exc(), requestId)
raise ServiceException(ExceptionType.MODEL_LOADING_EXCEPTION.value[0], raise ServiceException(ExceptionType.MODEL_LOADING_EXCEPTION.value[0],
@ -761,7 +756,6 @@ MODEL_CONFIG = {
None, None,
lambda x: cc_process(x) lambda x: cc_process(x)
), ),
<<<<<<< HEAD
# 加载建筑物下行人检测模型 # 加载建筑物下行人检测模型
ModelType.CITY_UNDERBUILDCOUNT_MODEL.value[1]: ( ModelType.CITY_UNDERBUILDCOUNT_MODEL.value[1]: (
lambda x, y, r, t, z, h: DENSECROWDCOUNTModel(x, y, r, ModelType.CITY_UNDERBUILDCOUNT_MODEL, t, z, h), lambda x, y, r, t, z, h: DENSECROWDCOUNTModel(x, y, r, ModelType.CITY_UNDERBUILDCOUNT_MODEL, t, z, h),
@ -769,6 +763,4 @@ MODEL_CONFIG = {
None, None,
lambda x: cc_process(x) lambda x: cc_process(x)
), ),
=======
>>>>>>> origin/zsl
} }