From 2d25b62b60da018412ed164b6fd29470498cea17 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 13 十二月 2019 12:27:39 +0800
Subject: [PATCH] update
---
proc/proc.go | 35 ++++++++++++++---
proc/single.go | 9 ++--
work/common.go | 23 -----------
3 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/proc/proc.go b/proc/proc.go
index 0d719b7..c6b0ab2 100644
--- a/proc/proc.go
+++ b/proc/proc.go
@@ -35,6 +35,29 @@
name = "./data/yolo/data/coco.names"
)
+const (
+ FDetect = "FaceDetect"
+ // FExtract = "FaceExtract"
+ // FProperty = "FaceProperty"
+ FCompare = "FaceCompare"
+ FtTract = "FaceTrack"
+ FtDetect = "FaceTrackDetect"
+ FtOnly = "FaceTrackOnly"
+ YDetect = "Yolo"
+ PlateID = "Plate"
+)
+
+var (
+ SDK = []string{
+ YDetect,
+ FDetect,
+ FCompare,
+ PlateID,
+ // FtTract,
+ // FtOnly,
+ }
+)
+
func prepare(name string, gpu int) (string, bool) {
return initSDK(name, gpu)
}
@@ -43,7 +66,7 @@
sdkType := name
- if s, f := util.FindStringInArray(sdkType, work.SDK); f {
+ if s, f := util.FindStringInArray(sdkType, SDK); f {
sdkType = s
} else {
logo.Errorln("THERE IS NO THIS SDK TYPE: ", sdkType)
@@ -63,18 +86,18 @@
var e sdk.Engine
ret := true
- if sdkType == work.FDetect {
+ if sdkType == FDetect {
e, ret = createFaceDetect(gpu, thrds, util.SFI.DetectNum, util.SFI.DetectAngle, util.SFI.TrackInterval, util.SFI.SampleSize)
- } else if sdkType == work.YDetect {
+ } else if sdkType == YDetect {
e, ret = createYolo(gpu)
- } else if sdkType == work.FtTract {
+ } else if sdkType == FtTract {
e, ret = createFaceTrack(gpu, thrds, util.SFI.DetectNum, util.SFI.DetectAngle, util.SFI.TrackInterval, util.SFI.SampleSize)
- } else if sdkType == work.FCompare {
+ } else if sdkType == FCompare {
e = sdk.NewEFExtract(100)
- } else if sdkType == work.PlateID {
+ } else if sdkType == PlateID {
e = sdk.NewPlateIDDetector(util.SCI.LicenseServerPath, util.SCI.Model, util.SCI.MaxImageWidth, util.SCI.MaxImageHeight)
}
diff --git a/proc/single.go b/proc/single.go
index 0ad44dd..31145c4 100644
--- a/proc/single.go
+++ b/proc/single.go
@@ -3,7 +3,6 @@
import (
"analysis/logo"
"analysis/util"
- "analysis/work"
"context"
"strings"
)
@@ -58,12 +57,12 @@
logo.Errorf("NO THIS SDK PROC SDKPROC : ", typ)
}
rSDK := []string{
- work.FDetect,
- work.FCompare,
+ FDetect,
+ FCompare,
}
if typ == util.FeatYolo {
rSDK = rSDK[0:0]
- rSDK = append(rSDK, work.YDetect)
+ rSDK = append(rSDK, YDetect)
}
var res []bool
for _, v := range rSDK {
@@ -95,7 +94,7 @@
func allProc(ctx context.Context, gpu int, shm bool) bool {
var res []bool
- for _, v := range work.SDK {
+ for _, v := range SDK {
_, f := prepare(v, gpu)
res = append(res, f)
}
diff --git a/work/common.go b/work/common.go
index b646ce2..30a0653 100644
--- a/work/common.go
+++ b/work/common.go
@@ -6,29 +6,6 @@
"basic.com/pubsub/protomsg.git"
)
-const (
- FDetect = "FaceDetect"
- // FExtract = "FaceExtract"
- // FProperty = "FaceProperty"
- FCompare = "FaceCompare"
- FtTract = "FaceTrack"
- FtDetect = "FaceTrackDetect"
- FtOnly = "FaceTrackOnly"
- YDetect = "Yolo"
- PlateID = "Plate"
-)
-
-var (
- SDK = []string{
- YDetect,
- FDetect,
- FCompare,
- PlateID,
- // FtTract,
- // FtOnly,
- }
-)
-
const mode = deliver.PushPull
// MsgRS msg recv and snd
--
Gitblit v1.8.0