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
 }