From aaa1c01fa7febe0de698b38ddae4cfe5fe7cc4ff Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 15 一月 2020 13:34:56 +0800
Subject: [PATCH] debug

---
 run.go |   37 ++++++++++++-------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/run.go b/run.go
index dae12d4..126d96c 100644
--- a/run.go
+++ b/run.go
@@ -1,19 +1,18 @@
 package main
 
 import (
-	"bufio"
 	"context"
-	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"time"
 	"unsafe"
 
-	"basic.com/libgowrapper/sdkhelper.git"
+	"reid/common"
+
 	"basic.com/valib/gogpu.git"
 
 	"basic.com/pubsub/protomsg.git"
-	"basic.com/valib/godraw.git"
 
 	"github.com/gogo/protobuf/proto"
 
@@ -34,7 +33,7 @@
 // Create Reid
 func Create(config string, typ, id string, gpu int, shm bool, ipc2Rule string, ruleMaxSize int, fn func(...interface{}), reserved map[string]interface{}) interface{} {
 
-	cfg, err := sdkhelper.ReadConfig(config)
+	cfg, err := common.ReadConfig(config)
 	if err != nil {
 		fn("Reid SDK Create Error When Read Config: ", err)
 		return nil
@@ -54,7 +53,7 @@
 		}
 	}
 
-	gpuM := sdkhelper.Atoi(cfg.Param[sGPU])
+	gpuM := common.Atoi(cfg.Param[sGPU])
 
 	rGPU := gpu
 
@@ -99,6 +98,13 @@
 
 	for {
 		if err = sock.Listen(s.ipc); err != nil {
+			suf := "ipc://"
+			p := strings.Index(s.ipc, suf)
+			if p >= 0 {
+				file := s.ipc[p+len(string(suf)):]
+				os.Remove(file)
+				s.fnLogger("remove:", file)
+			}
 			s.fnLogger("can't listen on rep socket: ", err)
 			time.Sleep(5 * time.Millisecond)
 		} else {
@@ -130,11 +136,6 @@
 			}
 			s.fnLogger("REID~~~~~~Recv Image:", len(i.Data))
 
-			/////////////////////////////////
-			if jpg, err := godraw.ToJpeg(i.Data, int(i.Width), int(i.Height), nil); err == nil {
-				ioutil.WriteFile("./pic.jpg", jpg, 0644)
-			}
-			/////////////////////////////////
 			feat := s.handle.Extract2(unsafe.Pointer(&i.Data[0]), int(i.Width), int(i.Height), 3)
 			if feat == nil {
 				// feat = make([]float32, 1)
@@ -143,20 +144,6 @@
 					s.fnLogger("REID~~~~~~extractor---human_feats------%f", feat[k+2000])
 				}
 				s.fnLogger("REID~~~~~~Run Reid Use GPU: ", s.gpu)
-
-				/////////////////////////////////
-				if f, err := os.Create("./reid-feat.txt"); err == nil {
-					defer f.Close()
-
-					w := bufio.NewWriter(f)
-					for k, v := range feat {
-						lineStr := fmt.Sprintf("%d->%f", k, v)
-						fmt.Fprintln(w, lineStr)
-					}
-					w.Flush()
-				}
-				/////////////////////////////////
-
 			}
 			buf := float32SliceAsByteSlice(feat)
 			ioutil.WriteFile("./reid-feat-byte.txt", buf, 0644)

--
Gitblit v1.8.0