floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix imageinfer bugs' (#231) from tzwang/pcm-coordinator:master into master 

Former-commit-id: e41c76c6d88ad64a59bad841a1426bfb8a754236
This commit is contained in:
tzwang 2024-06-22 15:41:52 +08:00
parent 21f5919396 3891d1c73b
commit 031b016476
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/internal/logic/inference/imageinferencelogic.go
View File

@ -292,6 +292,26 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
results = append(results, s) results = append(results, s)
} }
//save ai sub tasks
for _, r := range results {
for _, task := range aiTaskList {
if r.ClusterId == strconv.Itoa(int(task.ClusterId)) {
taskAiSub := &models.TaskAiSub{
Id: task.Id,
ImageName: r.ImageName,
Result: r.ImageResult,
Card: r.Card,
ClusterId: task.ClusterId,
ClusterName: r.ClusterName,
}
tx := svcCtx.DbEngin.Save(&taskAiSub)
if tx.Error != nil {
logx.Errorf(err.Error())
}
}
}
}
sort.Slice(results, func(p, q int) bool { sort.Slice(results, func(p, q int) bool {
return results[p].ClusterName < results[q].ClusterName return results[p].ClusterName < results[q].ClusterName
}) })
@ -345,6 +365,7 @@ func sendInferReq(images []struct {
r, err := getInferResult(c.urls[0].Url, t.file, t.imageResult.ImageName, c.clusterName) r, err := getInferResult(c.urls[0].Url, t.file, t.imageResult.ImageName, c.clusterName)
if err != nil { if err != nil {
t.imageResult.ImageResult = err.Error() t.imageResult.ImageResult = err.Error()
t.imageResult.ClusterId = c.clusterId
t.imageResult.ClusterName = c.clusterName t.imageResult.ClusterName = c.clusterName
t.imageResult.Card = c.urls[0].Card t.imageResult.Card = c.urls[0].Card
ch <- t.imageResult ch <- t.imageResult
@ -352,6 +373,7 @@ func sendInferReq(images []struct {
return return
} }
t.imageResult.ImageResult = r t.imageResult.ImageResult = r
t.imageResult.ClusterId = c.clusterId
t.imageResult.ClusterName = c.clusterName t.imageResult.ClusterName = c.clusterName
t.imageResult.Card = c.urls[0].Card t.imageResult.Card = c.urls[0].Card
@ -363,6 +385,7 @@ func sendInferReq(images []struct {
r, err := getInferResult(c.urls[idx].Url, t.file, t.imageResult.ImageName, c.clusterName) r, err := getInferResult(c.urls[idx].Url, t.file, t.imageResult.ImageName, c.clusterName)
if err != nil { if err != nil {
t.imageResult.ImageResult = err.Error() t.imageResult.ImageResult = err.Error()
t.imageResult.ClusterId = c.clusterId
t.imageResult.ClusterName = c.clusterName t.imageResult.ClusterName = c.clusterName
t.imageResult.Card = c.urls[idx].Card t.imageResult.Card = c.urls[idx].Card
ch <- t.imageResult ch <- t.imageResult
@ -370,6 +393,7 @@ func sendInferReq(images []struct {
return return
} }
t.imageResult.ImageResult = r t.imageResult.ImageResult = r
t.imageResult.ClusterId = c.clusterId
t.imageResult.ClusterName = c.clusterName t.imageResult.ClusterName = c.clusterName
t.imageResult.Card = c.urls[idx].Card t.imageResult.Card = c.urls[idx].Card

4
pkg/models/taskaisubmodel_gen.go
View File

@ -38,9 +38,9 @@ type (
Id int64 `db:"id"` // id Id int64 `db:"id"` // id
ImageName string `db:"image_name"` // 图片名称 ImageName string `db:"image_name"` // 图片名称
Result string `db:"result"` // 识别结果 Result string `db:"result"` // 识别结果
Card sql.NullString `db:"card"` // 加速卡 Card string `db:"card"` // 加速卡
ClusterId int64 `db:"cluster_id"` // 集群id ClusterId int64 `db:"cluster_id"` // 集群id
ClusterName sql.NullString `db:"cluster_name"` // 集群名称 ClusterName string `db:"cluster_name"` // 集群名称
} }
) )