From fb4db8878a2d7581475d0dc275bd6be986f128f4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 10 一月 2020 17:03:06 +0800
Subject: [PATCH] debug split
---
goreid.go | 10 +-
run.go | 129 ++++++++++++++++++++++++++++++++
go.sum | 68 +++++++++++++++++
csrc/reid.cpp | 7 -
go.mod | 16 ++++
5 files changed, 219 insertions(+), 11 deletions(-)
diff --git a/csrc/reid.cpp b/csrc/reid.cpp
index 0adcb11..462ff80 100644
--- a/csrc/reid.cpp
+++ b/csrc/reid.cpp
@@ -4,13 +4,8 @@
#include <stdexcept>
// #include <cuda_runtime_api.h>
#include <torch/torch.h>
-#include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/opencv.hpp"
-#include "opencv2/videoio/videoio.hpp"
-#include "opencv2/video.hpp"
-using namespace std;
+
reid::reid(const int gpu_index, const char *module_path)
:is_gpu_(gpu_index >= 0)
,start_(false)
diff --git a/go.mod b/go.mod
index 630db98..d05914f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,19 @@
module reid
go 1.12
+
+require (
+ basic.com/libgowrapper/sdkhelper.git v0.0.0-20200110053136-671903fa96fa
+ basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20200108123410-063a805b2573
+ basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3
+ basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865
+ basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca // indirect
+ github.com/gogo/protobuf v1.3.1
+ github.com/gorilla/websocket v1.4.1 // indirect
+ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 // indirect
+ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 // indirect
+ google.golang.org/grpc v1.26.0 // indirect
+ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc // indirect
+ nanomsg.org/go-mangos v1.4.0 // indirect
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..d1df05a
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,68 @@
+basic.com/libgowrapper/sdkhelper.git v0.0.0-20200110053136-671903fa96fa h1:w0456cbs6SeLuala9MuzIveiBM6s1xwAThofzfPbPfU=
+basic.com/libgowrapper/sdkhelper.git v0.0.0-20200110053136-671903fa96fa/go.mod h1:eBHanxa92Srb5c/OmupgcAZmLC3Et5HMp9JsebHAIC4=
+basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c h1:maWYZw9iSQUuN1jbDxgi9IvKrCD97tiTCv8PkLArZ/I=
+basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c/go.mod h1:bNdkzVVGY+oQEcaYN9VlyIK/03WB3NQNQApjiPJjIag=
+basic.com/pubsub/protomsg.git v0.0.0-20200108123410-063a805b2573 h1:0CkBMLT0OrdC6PIWnpkHxPBMPGayyjIN45NeEOeL+ZA=
+basic.com/pubsub/protomsg.git v0.0.0-20200108123410-063a805b2573/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3 h1:VY23IpugB/FsU2hSnVeLjZKX5cSgNmhcSEiw6vxX+bg=
+basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
+basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865 h1:3XvkNdRlJDXV45ie8U0uGA9ImJZtyTT0C/h+4Rizv0Y=
+basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865/go.mod h1:yxux5RP4A6a591vWljXxGlHdERVVyWDD3TwwQjuyogw=
+basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca h1:Y2Lgpxx5Tq0nKSAaB00F4piJhljMgPpfsBGQ2qpEloE=
+basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca/go.mod h1:yYRM7bM9y0KKd4IfNt3myjsvkFVFIIWNjsvK14tNbq4=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+nanomsg.org/go-mangos v1.4.0 h1:pVRLnzXePdSbhWlWdSncYszTagERhMG5zK/vXYmbEdM=
+nanomsg.org/go-mangos v1.4.0/go.mod h1:MOor8xUIgwsRMPpLr9xQxe7bT7rciibScOqVyztNxHQ=
diff --git a/goreid.go b/goreid.go
index 128f7b1..c81f75f 100644
--- a/goreid.go
+++ b/goreid.go
@@ -1,11 +1,11 @@
-package goreid
+package main
/*
-#cgo CFLAGS: -I${SRCDIR}/sdk/include -I${SRCDIR}/opencv-4.0.1/include/opencv4 -I${SRCDIR}/sdk/include/torch/csrc/api/include -I${SRCDIR}/csrc -w -g
-#cgo CXXFLAGS: -I${SRCDIR}/sdk/include -I${SRCDIR}/opencv-4.0.1/include/opencv4 -I${SRCDIR}/sdk/include/torch/csrc/api/include -I${SRCDIR}/csrc -w -g -std=c++11
+#cgo CFLAGS: -I${SRCDIR}/sdk/include -I${SRCDIR}/thirdparty/include/opencv4 -I${SRCDIR}/sdk/include/torch/csrc/api/include -I${SRCDIR}/csrc -w -g
+#cgo CXXFLAGS: -I${SRCDIR}/sdk/include -I${SRCDIR}/thirdparty/include/opencv4 -I${SRCDIR}/sdk/include/torch/csrc/api/include -I${SRCDIR}/csrc -w -g -std=c++11
#cgo LDFLAGS: -Wl,-rpath,${SRCDIR}/sdk/lib
#cgo LDFLAGS: -L${SRCDIR}/sdk/lib -ltorch -lc10 -lc10_cuda -lcudart -lgomp -lnvToolsExt
-#cgo LDFLAGS: -L${SRCDIR}/opencv-4.0.1/lib -lopencv_core -lopencv_imgproc
+#cgo LDFLAGS: -L${SRCDIR}/thirdparty/lib -lopencv_core -lopencv_imgproc
#cgo LDFLAGS: -ldl -lpthread
#include <stdlib.h>
@@ -24,7 +24,7 @@
}
// NewReID new reid
-func NewReID(gpu int, module string) *ReID {
+func NewSDK(gpu int, module string) *ReID {
cmodule := C.CString(module)
defer C.free(unsafe.Pointer(cmodule))
h := C.create_reid(C.int(gpu), cmodule)
diff --git a/run.go b/run.go
new file mode 100644
index 0000000..9cd9ec1
--- /dev/null
+++ b/run.go
@@ -0,0 +1,129 @@
+package main
+
+import (
+ "context"
+ "unsafe"
+
+ "basic.com/libgowrapper/sdkhelper.git"
+ "basic.com/valib/gogpu.git"
+
+ "basic.com/pubsub/protomsg.git"
+
+ "basic.com/valib/deliver.git"
+ "github.com/gogo/protobuf/proto"
+)
+
+type reid struct {
+ handle *ReID
+ list *sdkhelper.LockList
+ fnLogger func(...interface{})
+
+ ipc string
+}
+
+// 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)
+ if err != nil {
+ fn("Reid SDK Create Error When Read Config: ", err)
+ return nil
+ }
+
+ sModel, sGPU, sIPC :=
+ "reid-model",
+ "gpu-memory",
+ "ipc-url"
+
+ params := []string{sModel, sGPU, sIPC}
+
+ for _, v := range params {
+ if _, ok := cfg.Param[v]; !ok {
+ fn("Reid SDK Create Error Because of Param Not Found: ", v)
+ return nil
+ }
+ }
+
+ gpuM := sdkhelper.Atoi(cfg.Param[sGPU])
+
+ rGPU := 0
+
+ if rGPU == -1 {
+ rGPU = gogpu.ValidGPU(gpuM + 512)
+ }
+ if rGPU == -1 {
+ fn("Reid SDK Create Error When Find GPU")
+ return nil
+ }
+
+ rGPU = 0
+
+ handle := NewSDK(rGPU, cfg.Param[sModel])
+ if handle == nil {
+ fn("Reid SDK Create Error When New SDK")
+ return nil
+ }
+
+ return &reid{
+ handle: handle,
+ list: sdkhelper.NewLockList(6),
+ fnLogger: fn,
+
+ ipc: cfg.Param[sIPC],
+ }
+}
+
+// Run run
+func Run(ctx context.Context, i interface{}) {
+ s := i.(*reid)
+
+ c := deliver.NewClient(deliver.ReqRep, s.ipc)
+
+ var msg []byte
+ var err error
+
+ for {
+ select {
+ case <-ctx.Done():
+ return
+ default:
+
+ msg, err = c.Recv()
+ if err != nil {
+ s.fnLogger("REID~~~~~~Recv Image Error : ", err)
+ continue
+ }
+ i := &protomsg.Image{}
+ err := proto.Unmarshal(msg, i)
+ if err != nil {
+ s.fnLogger("REID~~~~~~protobuf decode CameraImage error: ", err)
+ continue
+ }
+ if i.Data == nil {
+ s.fnLogger("REID~~~~~~protomsg.Image data null")
+ continue
+ }
+ feat := s.handle.Extract2(unsafe.Pointer(&i.Data[0]), int(i.Width), int(i.Height), 3)
+ if feat == nil {
+
+ }
+ buf := float32SliceAsByteSlice(feat)
+ c.Send(buf)
+ }
+
+ }
+}
+
+func float32SliceAsByteSlice(src []float32) []byte {
+ if len(src) == 0 {
+ return nil
+ }
+
+ l := len(src) * 4
+ ptr := unsafe.Pointer(&src[0])
+ // It is important to keep in mind that the Go garbage collector
+ // will not interact with this data, and that if src if freed,
+ // the behavior of any Go code using the slice is nondeterministic.
+ // Reference: https://github.com/golang/go/wiki/cgo#turning-c-arrays-into-go-slices
+ return (*[1 << 26]byte)((*[1 << 26]byte)(ptr))[:l:l]
+}
--
Gitblit v1.8.0