From c7015465785507d5782fb63c2684de6fe16253fb Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 07 一月 2020 14:07:18 +0800
Subject: [PATCH] udpate so
---
libgowrapper/humantrack | 2 +-
modulemake.sh | 13 +++++++++----
zconf/Plate.json | 4 ++--
zconf/FaceDetect.json | 4 ++--
zconf/HumanTrack.json | 4 ++--
libgowrapper/face | 2 +-
zconf/Yolo.json | 4 ++--
7 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/libgowrapper/face b/libgowrapper/face
index 32e14ce..7f2e848 160000
--- a/libgowrapper/face
+++ b/libgowrapper/face
@@ -1 +1 @@
-Subproject commit 32e14ce1721c112623d85661f072ff8e0463483c
+Subproject commit 7f2e8481db8503533898f29a864e609f5478bf92
diff --git a/libgowrapper/humantrack b/libgowrapper/humantrack
index a417585..768fee7 160000
--- a/libgowrapper/humantrack
+++ b/libgowrapper/humantrack
@@ -1 +1 @@
-Subproject commit a4175850ae3c7f91a2d2d705350341471dad1abb
+Subproject commit 768fee705255b0f37ba185b2df2f91acb1245a45
diff --git a/modulemake.sh b/modulemake.sh
index b5138f9..c8b1c2d 100755
--- a/modulemake.sh
+++ b/modulemake.sh
@@ -35,18 +35,23 @@
continue
fi
+ deps_dir=$runtime_dir"/"$value
+ if [ ! -d $deps_dir ];then
+ mkdir -p $deps_dir
+ fi
+
# move to runtime_dir
- mv -f lib$value.so $runtime_dir
+ mv -f lib$value.so $deps_dir
# move sdk to runtime_dir
if [ -d `pwd`/sdk/lib ]; then
- cp -fr `pwd`/sdk/lib/* $runtime_dir
+ cp -fr `pwd`/sdk/lib/* $deps_dir
fi
if [ -d `pwd`/thirdparty/lib ]; then
- cp -fr `pwd`/thirdparty/lib/* $runtime_dir
+ cp -fr `pwd`/thirdparty/lib/* $deps_dir
fi
- echo "~~~WATCH lib$value.so In $runtime_dir IF CORRECT"
+ echo "~~~WATCH lib$value.so In $deps_dir IF CORRECT"
cd $src
done
diff --git a/zconf/FaceDetect.json b/zconf/FaceDetect.json
index 67d19e1..76873c5 100644
--- a/zconf/FaceDetect.json
+++ b/zconf/FaceDetect.json
@@ -1,6 +1,6 @@
{
- "so_file_path":"./libs/libface.so",
- "runtime":"./libs:/usr/local/cuda-8.0/lib64",
+ "so_file_path":"./libs/face/libface.so",
+ "runtime":"./libs/face:/usr/local/cuda-8.0/lib64",
"param":{
"detect_thread": "16",
"detect_num": "30",
diff --git a/zconf/HumanTrack.json b/zconf/HumanTrack.json
index 69ddb1f..c1bf801 100644
--- a/zconf/HumanTrack.json
+++ b/zconf/HumanTrack.json
@@ -1,6 +1,6 @@
{
- "so_file_path": "./libs/libhumantrack.so",
- "runtime":"./libs:/usr/local/cuda-10.0/lib64",
+ "so_file_path": "./libs/humantrack/libhumantrack.so",
+ "runtime":"./libs/humantrack:/usr/local/cuda-10.0/lib64",
"param":{
"batch_size": "16",
"flag": "0",
diff --git a/zconf/Plate.json b/zconf/Plate.json
index 515daee..86739cc 100644
--- a/zconf/Plate.json
+++ b/zconf/Plate.json
@@ -1,6 +1,6 @@
{
- "so_file_path": "./libs/libvehicle.so",
- "runtime":"",
+ "so_file_path": "./libs/vehicle/libvehicle.so",
+ "runtime":"./libs/vehicle",
"param": {
"license_path": "./vtr.key",
"model_path": "./data/model",
diff --git a/zconf/Yolo.json b/zconf/Yolo.json
index e562b57..82d5f96 100644
--- a/zconf/Yolo.json
+++ b/zconf/Yolo.json
@@ -1,6 +1,6 @@
{
- "so_file_path": "./libs/libyolo.so",
- "runtime": "./libs:/usr/local/cuda-8.0/lib64",
+ "so_file_path": "./libs/yolo/libyolo.so",
+ "runtime": "./libs/yolo:/usr/local/cuda-8.0/lib64",
"param": {
"cfg_path": "./data/yolo/cfg/yolov3.cfg",
"weights_path": "./data/yolo/yolov3.weights",
--
Gitblit v1.8.0