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

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

Former-commit-id: a85fa2d64436fe17b290129f245a738e9600948f
This commit is contained in:
tzwang 2024-06-22 21:20:15 +08:00
parent 984edd943d 4fd24d2f80
commit 3363408433
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,7 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
var result_ch = make(chan *types.ImageResult, len(ts)) var result_ch = make(chan *types.ImageResult, len(ts))
var results []*types.ImageResult var results []*types.ImageResult
limit := make(chan bool, 7)
var imageNumIdx int32 = 0 var imageNumIdx int32 = 0
var imageNumIdxEnd int32 = 0 var imageNumIdxEnd int32 = 0
@ -284,7 +285,7 @@ func infer(opt *option.InferOption, clusters []*strategy.AssignedCluster, ts []s
imageNumIdx = imageNumIdx + c.imageNum imageNumIdx = imageNumIdx + c.imageNum
wg.Add(len(new_images)) wg.Add(len(new_images))
go sendInferReq(new_images, c, &wg, result_ch) go sendInferReq(new_images, c, &wg, result_ch, limit)
} }
wg.Wait() wg.Wait()
close(result_ch) close(result_ch)
@ -375,8 +376,9 @@ func sendInferReq(images []struct {
clusterId string clusterId string
clusterName string clusterName string
imageNum int32 imageNum int32
}, wg *sync.WaitGroup, ch chan<- *types.ImageResult) { }, wg *sync.WaitGroup, ch chan<- *types.ImageResult, limit chan bool) {
for _, image := range images { for _, image := range images {
limit <- true
go func(t struct { go func(t struct {
imageResult *types.ImageResult imageResult *types.ImageResult
file multipart.File file multipart.File
@ -395,6 +397,7 @@ func sendInferReq(images []struct {
t.imageResult.Card = c.urls[0].Card t.imageResult.Card = c.urls[0].Card
ch <- t.imageResult ch <- t.imageResult
wg.Done() wg.Done()
<-limit
return return
} }
t.imageResult.ImageResult = r t.imageResult.ImageResult = r
@ -404,6 +407,7 @@ func sendInferReq(images []struct {
ch <- t.imageResult ch <- t.imageResult
wg.Done() wg.Done()
<-limit
return return
} else { } else {
idx := rand.Intn(len(c.urls)) idx := rand.Intn(len(c.urls))
@ -415,6 +419,7 @@ func sendInferReq(images []struct {
t.imageResult.Card = c.urls[idx].Card t.imageResult.Card = c.urls[idx].Card
ch <- t.imageResult ch <- t.imageResult
wg.Done() wg.Done()
<-limit
return return
} }
t.imageResult.ImageResult = r t.imageResult.ImageResult = r
@ -424,9 +429,11 @@ func sendInferReq(images []struct {
ch <- t.imageResult ch <- t.imageResult
wg.Done() wg.Done()
<-limit
return return
} }
}(image, cluster) }(image, cluster)
<-limit
} }
} }