From 9646370818113b8fb2f7ad07056d53b4a84f04f8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 10 一月 2020 13:53:56 +0800
Subject: [PATCH] add sub reid
---
/dev/null | 10 ----------
libgowrapper/reid | 2 +-
libgowrapper/humantrack | 2 +-
zconf/HumanTrack.json | 17 ++++++++++++-----
4 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/libgowrapper/humantrack b/libgowrapper/humantrack
index a417585..201990b 160000
--- a/libgowrapper/humantrack
+++ b/libgowrapper/humantrack
@@ -1 +1 @@
-Subproject commit a4175850ae3c7f91a2d2d705350341471dad1abb
+Subproject commit 201990b737a0347188dc094bb7306ad7ffbbf94b
diff --git a/libgowrapper/reid b/libgowrapper/reid
index ae87fbb..c3765bd 160000
--- a/libgowrapper/reid
+++ b/libgowrapper/reid
@@ -1 +1 @@
-Subproject commit ae87fbb44d1b7cb32faa69a0698d941cb5bfc4b0
+Subproject commit c3765bd24fe73747688a0ec2a550f219c9acb384
diff --git a/zconf/HumanTrack-humantrack.json b/zconf/HumanTrack-humantrack.json
deleted file mode 100644
index 7f65404..0000000
--- a/zconf/HumanTrack-humantrack.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "so_file_path": "./libs/humantrack/libhumantrack.so",
- "runtime":"./libs/humantrack:/usr/local/cuda-10.0/lib64",
- "param":{
- "batch_size": "16",
- "flag": "0",
- "gpu-memory":"2048",
- "reid-model":"./data/reid/model.pt"
- }
-}
\ No newline at end of file
diff --git a/zconf/HumanTrack.json b/zconf/HumanTrack.json
index 39b51ae..803dc45 100644
--- a/zconf/HumanTrack.json
+++ b/zconf/HumanTrack.json
@@ -1,11 +1,18 @@
{
"so_file_path": "./libs/humantrack/libhumantrack.so",
- "runtime":"./libs/humantrack",
- "param": {
- "cfg_path": "./data/yolo/cfg/yolov3.cfg",
- "weights_path": "./data/yolo/yolov3.weights",
- "names_path": "./data/yolo/data/coco.names",
+ "runtime":"./libs/humantrack:/usr/local/cuda-10.0/lib64",
+ "param":{
+ "batch_size": "16",
+ "flag": "0",
"gpu-memory":"2048",
"reid-model":"./data/reid/model.pt"
+ },
+ "sub":{
+ "so_file_path": "./libs/reid/libreid.so",
+ "runtime":"./libs/reid",
+ "param": {
+ "gpu-memory":"1024",
+ "reid-model":"./data/reid/model.pt"
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0