From 585a7a05f7d7382b0a3071122c108364cb913dc0 Mon Sep 17 00:00:00 2001 From: th Date: Fri, 25 Jul 2025 18:52:10 +0800 Subject: [PATCH] =?UTF-8?q?1)=E6=96=B0=E5=A2=9EM027:=E5=BB=BA=E7=AD=91?= =?UTF-8?q?=E7=89=A9=E4=B8=8B=E8=A1=8C=E4=BA=BA=E6=A3=80=E6=B5=8B=E5=8F=8A?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=202)=E5=AF=86=E9=9B=86=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=A8=A1=E5=9E=8B=E5=8F=8A=E8=87=AA=E7=A0=94?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E6=A8=A1=E5=9E=8B=E4=BC=98=E5=8C=96=203)?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A8=A1=E5=9E=8B=E6=94=AF=E6=8C=81pt?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8A=A0=E8=BD=BD=EF=BC=88=E5=B7=B4=E4=B8=AD?= =?UTF-8?q?=E6=B0=B4=E5=88=A9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/ModelUtils.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/util/ModelUtils.py b/util/ModelUtils.py index c710ca5..4dd2f7e 100644 --- a/util/ModelUtils.py +++ b/util/ModelUtils.py @@ -406,13 +406,8 @@ class DENSECROWDCOUNTModel: par = modeType.value[4](str(device), gpu_name) rainbows = par["rainbows"] models=[ modelPar['model'](weights=modelPar['weight'],par=modelPar['par']) for modelPar in par['models'] ] -<<<<<<< HEAD postPar = [pp['par'] for pp in par['models']] 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: logger.error("模型加载异常：{}, requestId:{}", format_exc(), requestId) raise ServiceException(ExceptionType.MODEL_LOADING_EXCEPTION.value[0], @@ -761,7 +756,6 @@ MODEL_CONFIG = { None, lambda x: cc_process(x) ), -<<<<<<< HEAD # 加载建筑物下行人检测模型 ModelType.CITY_UNDERBUILDCOUNT_MODEL.value[1]: ( 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, lambda x: cc_process(x) ), -======= ->>>>>>> origin/zsl }