From dedfcf78de467a55d69a396f3cbc57514deb2af1 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 11 一月 2020 09:36:42 +0800
Subject: [PATCH] debug split
---
libgowrapper/reid | 2 +-
libgowrapper/humantrack | 2 +-
zconf/HumanTrack.json | 1 +
app/slave/slave.go | 12 +++++++++++-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/slave/slave.go b/app/slave/slave.go
index 8ac53ef..d00d6e2 100644
--- a/app/slave/slave.go
+++ b/app/slave/slave.go
@@ -6,6 +6,7 @@
"analysis/util"
"context"
"plugin"
+ "strconv"
"basic.com/valib/gogpu.git"
)
@@ -49,10 +50,19 @@
return false
}
}
+ // 璁剧疆gpu index
+ rGPU := gpu
+ if v, ok := cfg.Param["gpu"]; ok {
+ if t, err := strconv.Atoi(v); err != nil {
+ rGPU = -1
+ } else {
+ rGPU = t
+ }
+ }
// func Create(config string, typ, id string, gpu int, shm bool, ipc2Rule string, ruleMaxSize int, fn func(...interface{}), reserved map[string]string) interface{}
// func Run(ctx context.Context, i interface{}) {
- handle := sdk.fnCreate(config, typ, id, gpu, shm, util.ToRuleIPC, 30, logo.Infoln, nil)
+ handle := sdk.fnCreate(config, typ, id, rGPU, shm, util.ToRuleIPC, 30, logo.Infoln, nil)
if handle == nil {
logo.Errorln("Create SDK: ", typ, " ID: ", id, " Error")
return false
diff --git a/libgowrapper/humantrack b/libgowrapper/humantrack
index 8e69694..a91ae4e 160000
--- a/libgowrapper/humantrack
+++ b/libgowrapper/humantrack
@@ -1 +1 @@
-Subproject commit 8e69694b2716538a358cee52d39eac55f2c8ae64
+Subproject commit a91ae4e576ac1d11e7834d8161a7d5355cd139e9
diff --git a/libgowrapper/reid b/libgowrapper/reid
index 7419cbb..bdf3ad7 160000
--- a/libgowrapper/reid
+++ b/libgowrapper/reid
@@ -1 +1 @@
-Subproject commit 7419cbb40e0e51d9daf2ea827d8c939a6f40d870
+Subproject commit bdf3ad71583fb4ef100d3819ecdae8fd9f70083e
diff --git a/zconf/HumanTrack.json b/zconf/HumanTrack.json
index f10ea53..fc2589d 100644
--- a/zconf/HumanTrack.json
+++ b/zconf/HumanTrack.json
@@ -10,6 +10,7 @@
"so_file_path": "./libs/reid/libreid.so",
"runtime":"./libs/reid",
"param": {
+ "gpu":0,
"gpu-memory":"1024",
"reid-model":"./data/reid/model.pt"
}
--
Gitblit v1.8.0