From 728d6b93340548e39a471b96d38d1340198840e4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 17:08:38 +0800
Subject: [PATCH] 给真的yolo的ipcId
---
main.go | 131 +++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 68 deletions(-)
diff --git a/main.go b/main.go
index a74d53b..e0acdeb 100644
--- a/main.go
+++ b/main.go
@@ -8,16 +8,16 @@
"bytes"
"flag"
"fmt"
+ "ruleprocess/logger"
"github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
"image/color"
"os"
"ruleprocess/cache"
- "ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "ruleprocess/logger"
+ "ruleprocess/insertdata"
"sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -26,23 +26,20 @@
var pubPort = flag.Int("pubPort",50007,"pubsub port") //鏁版嵁鏇存柊
var initchan = make(chan bool)
func init () {
- var logFile = "./info.log"
- var logSaveDays = 15
-
// 鏃ュ織鍒濆鍖�
- logger.Config(logFile, logger.DebugLevel)
- logger.SetSaveDays(logSaveDays)
- logger.Info("loginit success !")
+ logger.Config("./info.log", logger.DebugLevel)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+
}
func main() {
flag.Parse()
wg := sync.WaitGroup{}
- wg.Add(1)
+ wg.Add(2)
dbapi.Init(*dbIp,*dbPort)
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
- fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ //fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
go ruleserver.TimeTicker()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
@@ -76,7 +73,7 @@
} else {
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
@@ -121,13 +118,12 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
+ //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -148,7 +144,7 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+ //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
@@ -164,8 +160,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -185,9 +180,9 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+ logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
@@ -195,55 +190,55 @@
continue
}
}
- if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
- arg := ruleserver.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
- arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
- if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFaceFeature{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _,faceExtCom := range faceParam.ExtComp {
- binfos := protomsg.Binfos{}
- err := proto.Unmarshal(faceExtCom.Comp, &binfos)
- if err != nil {
- logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos)
- }
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
- for _, extComp := range faceParam.ExtComp {
- baseinfos := protomsg.Binfos{}
- err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
- if err1 != nil {
- logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
- arg.Photo = append(arg.Photo, photoMap)
- }
- args.Sdkdata = append(args.Sdkdata,&arg)
- } else {
- continue
- }
- }
+ //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+ // arg := ruleserver.SdkData{}
+ // arg.TaskId = m.Tasklab.Taskid
+ // arg.SdkId = sdkinfo.Sdkid
+ // arg.SdkName = sdkinfo.SdkName
+ // arg.IsYolo = false
+ // bdata, err := util.UnCompress(m.Data)
+ // if err != nil {
+ // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ // }
+ // i := protomsg.Image{}
+ // err = proto.Unmarshal(bdata, &i)
+ // arg.ImageWidth = int(i.Width)
+ // arg.ImageHeight = int(i.Height)
+ // // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ // arg.KeepRight = false
+ // arg.IsStatic = false
+ // if len(sdkinfo.Sdkdata) > 1 {
+ // faceParam := protomsg.ParamFaceFeature{}
+ // err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // for _,faceExtCom := range faceParam.ExtComp {
+ // binfos := protomsg.Binfos{}
+ // err := proto.Unmarshal(faceExtCom.Comp, &binfos)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos.Infos[0].CompareScore)
+ // }
+ // logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
+ // for _, extComp := range faceParam.ExtComp {
+ // baseinfos := protomsg.Binfos{}
+ // err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
+ // if err1 != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
+ // args.Sdkdata = append(args.Sdkdata,&arg)
+ // } else {
+ // continue
+ // }
+ //}
}
return m
--
Gitblit v1.8.0