From dfe2ae7835eb15e350bcc6c3579d1018067d1fee Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 13 一月 2020 13:43:06 +0800
Subject: [PATCH] vehicle use gpu

---
 modulemake.sh        |    7 -------
 zconf/Plate.json     |    4 ++--
 libgowrapper/vehicle |    2 +-
 app/master/reaper.go |    2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/master/reaper.go b/app/master/reaper.go
index 529e3d0..56eec1f 100644
--- a/app/master/reaper.go
+++ b/app/master/reaper.go
@@ -52,9 +52,9 @@
 	rEnv := ""
 	if len(env) != 0 {
 		rEnv = "LD_LIBRARY_PATH=" + env
-		logo.Infoln("Env String: ", rEnv)
 		cmd.Env = os.Environ()
 		cmd.Env = append(cmd.Env, rEnv)
+		logo.Infoln("Env String: ", cmd.Env)
 	}
 
 	pid := -1
diff --git a/libgowrapper/vehicle b/libgowrapper/vehicle
index ea0341a..f14627d 160000
--- a/libgowrapper/vehicle
+++ b/libgowrapper/vehicle
@@ -1 +1 @@
-Subproject commit ea0341ad9cd92a6b43cf0ce8553fa17e3c006974
+Subproject commit f14627dcfb33c909eb0fbc7a3966c08758c9e95f
diff --git a/modulemake.sh b/modulemake.sh
index 354a29b..7ee4f65 100755
--- a/modulemake.sh
+++ b/modulemake.sh
@@ -52,13 +52,6 @@
         cp -fr `pwd`/thirdparty/lib/* $deps_dir
     fi
 
-# ~~~~~~patch humantrack reid
-    if [ -d `pwd`/goreid/sdk/lib ]; then
-        cp -fr `pwd`/goreid/sdk/lib/* $deps_dir
-        cp -fr `pwd`/goreid/opencv-4.0.1/lib/* $deps_dir
-    fi
-# ~~~~~~patch
-
     echo "~~~WATCH lib$value.so In $deps_dir IF CORRECT"
 
     cd $src
diff --git a/zconf/Plate.json b/zconf/Plate.json
index f8a7d1e..9bb812c 100644
--- a/zconf/Plate.json
+++ b/zconf/Plate.json
@@ -4,8 +4,8 @@
     "param": {
         "license_path": "./vtr.key",
         "model_path": "./data/model",
-        "scene": "2",
+        "scene": "4",
         "mode": "0",
-        "gpu-memory":"0"
+        "gpu-memory":"1024"
     }
 }

--
Gitblit v1.8.0