From 9d9cd1d3b93613071d1dffc1c82c4515d2a65af6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 21 一月 2020 17:22:39 +0800
Subject: [PATCH] bug fixed change real fetcher ip
---
app/slave/slave.go | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/app/slave/slave.go b/app/slave/slave.go
index 6c77ec2..d00d6e2 100644
--- a/app/slave/slave.go
+++ b/app/slave/slave.go
@@ -6,6 +6,9 @@
"analysis/util"
"context"
"plugin"
+ "strconv"
+
+ "basic.com/valib/gogpu.git"
)
// TwoPluginConflict test
@@ -15,7 +18,7 @@
logo.Errorln("Slave Read Config Error: ", err)
return false
}
- sdk := loadSDK(cfg.SoFile)
+ sdk := LoadSDK(cfg.SoFile)
if sdk == nil {
}
@@ -24,7 +27,7 @@
logo.Errorln("Slave Open so File: ", commSoFile, " Error: ", err)
return false
}
- return true
+ return false
}
// Run run
@@ -34,15 +37,32 @@
logo.Errorln("Slave Read Config Error: ", err)
return false
}
- sdk := loadSDK(cfg.SoFile)
+ sdk := LoadSDK(cfg.SoFile)
if sdk == nil {
return false
}
+ // 閰嶇疆鏂囦欢璁剧疆浜唃pu memory涓斿�艰嚦灏戜袱浣嶆暟,鍒ゆ柇鏄惁鏈塯pu鍙敤
+ if v, ok := cfg.Param["gpu-memory"]; ok && len(v) > 1 {
+ indices := gogpu.RankGPU()
+ if len(indices) == 0 {
+ logo.Errorln("!!!!!!THERE IS NO VALID GPU")
+ return false
+ }
+ }
+ // 璁剧疆gpu index
+ rGPU := gpu
+ if v, ok := cfg.Param["gpu"]; ok {
+ if t, err := strconv.Atoi(v); err != nil {
+ rGPU = -1
+ } else {
+ rGPU = t
+ }
+ }
// func Create(config string, typ, id string, gpu int, shm bool, ipc2Rule string, ruleMaxSize int, fn func(...interface{}), reserved map[string]string) interface{}
// func Run(ctx context.Context, i interface{}) {
- handle := sdk.fnCreate(config, typ, id, gpu, shm, util.ToRuleIPC, 30, logo.Infoln, nil)
+ handle := sdk.fnCreate(config, typ, id, rGPU, shm, util.ToRuleIPC, 30, logo.Infoln, nil)
if handle == nil {
logo.Errorln("Create SDK: ", typ, " ID: ", id, " Error")
return false
--
Gitblit v1.8.0