modified aitask submit options
Former-commit-id: 1eb8398a899ff5bb1129dfdf6b2559cf1ec0130c
This commit is contained in:
parent
2f9462965e
commit
a32ff30ff0
|
@ -46,7 +46,8 @@ const (
|
|||
SAILINGSI = "sailingsi"
|
||||
MLU = "MLU"
|
||||
CAMBRICONMLU290 = 256
|
||||
GCU = "enflame"
|
||||
GCU = "GCU"
|
||||
ENFLAME = "enflame"
|
||||
EnflameT20 = 128
|
||||
BASE_TOPS = 128
|
||||
CAMBRICON = "cambricon"
|
||||
|
@ -57,7 +58,7 @@ const (
|
|||
var (
|
||||
cardAliasMap = map[string]string{
|
||||
MLU: CAMBRICON,
|
||||
GCU: GCU,
|
||||
GCU: ENFLAME,
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -449,7 +450,7 @@ func (o *OctopusLink) generateAlgorithmId(option *option.AiOption) error {
|
|||
|
||||
for _, algorithm := range resp.Payload.Algorithms {
|
||||
if algorithm.FrameworkName == strings.Title(option.TaskType) {
|
||||
ns := strings.Split(algorithm.AlgorithmName, DASH)
|
||||
ns := strings.Split(algorithm.AlgorithmName, UNDERSCORE)
|
||||
if ns[0] != option.DatasetsName {
|
||||
continue
|
||||
}
|
||||
|
|
|
@ -57,17 +57,17 @@ var RESOURCESGAIMAP = map[string]ResourceSpecSGAI{
|
|||
},
|
||||
"OBtVaaXAv9n9FbLR7pWAoa3yR13jXwNc": {
|
||||
CPU: 2,
|
||||
GPU: 1,
|
||||
GPU: 3,
|
||||
RAM: 4 * RAM_SIZE_1G,
|
||||
},
|
||||
"sBWfpkntUzsWYly11kdwEHZOYYIsFmve": {
|
||||
CPU: 5,
|
||||
GPU: 1,
|
||||
RAM: 10 * RAM_SIZE_1G,
|
||||
CPU: 4,
|
||||
GPU: 4,
|
||||
RAM: 8 * RAM_SIZE_1G,
|
||||
},
|
||||
"jeYBVPwyIALjVYNzHvysh2o5CsBpBLp2": {
|
||||
CPU: 5,
|
||||
GPU: 2,
|
||||
GPU: 5,
|
||||
RAM: 10 * RAM_SIZE_1G,
|
||||
},
|
||||
}
|
||||
|
@ -75,9 +75,9 @@ var RESOURCESGAIMAP = map[string]ResourceSpecSGAI{
|
|||
var RESOURCESPECSAI = map[string]string{
|
||||
"WodTB2rJ8SobMgQ1nrtR245jxOrsovFi": "CPU:1, DCU:1, RAM:2G",
|
||||
"6d41v1XV53MQPmQOJ5kNatIck9yl8nWZ": "CPU:1, DCU:2, RAM:2G",
|
||||
"OBtVaaXAv9n9FbLR7pWAoa3yR13jXwNc": "CPU:2, DCU:1, RAM:4G",
|
||||
"sBWfpkntUzsWYly11kdwEHZOYYIsFmve": "CPU:5, DCU:1, RAM:10G",
|
||||
"jeYBVPwyIALjVYNzHvysh2o5CsBpBLp2": "CPU:5, DCU:2, RAM:10G",
|
||||
"OBtVaaXAv9n9FbLR7pWAoa3yR13jXwNc": "CPU:2, DCU:3, RAM:4G",
|
||||
"sBWfpkntUzsWYly11kdwEHZOYYIsFmve": "CPU:4, DCU:4, RAM:8G",
|
||||
"jeYBVPwyIALjVYNzHvysh2o5CsBpBLp2": "CPU:5, DCU:5, RAM:10G",
|
||||
}
|
||||
|
||||
type ResourceSpecSGAI struct {
|
||||
|
@ -356,17 +356,25 @@ func (s *ShuguangAi) generateResourceId(option *option.AiOption) error {
|
|||
}
|
||||
|
||||
if option.ResourceType == CARD {
|
||||
if option.Tops == 0 {
|
||||
if 0 <= option.Tops && option.Tops <= DCU_TOPS {
|
||||
option.ResourceId = "WodTB2rJ8SobMgQ1nrtR245jxOrsovFi"
|
||||
return nil
|
||||
}
|
||||
|
||||
if option.Tops > DCU_TOPS {
|
||||
cardNum := 5
|
||||
for k, v := range RESOURCESGAIMAP {
|
||||
for i := 1; i <= cardNum; i++ {
|
||||
if float64(i)*DCU_TOPS <= option.Tops && option.Tops <= float64(v.GPU)*DCU_TOPS {
|
||||
option.ResourceId = k
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if option.Tops > float64(cardNum)*DCU_TOPS {
|
||||
option.ResourceId = "jeYBVPwyIALjVYNzHvysh2o5CsBpBLp2"
|
||||
return nil
|
||||
}
|
||||
|
||||
//Todo add more dcu specs
|
||||
}
|
||||
|
||||
return errors.New("failed to get ResourceId")
|
||||
|
@ -443,15 +451,15 @@ func (s *ShuguangAi) generateParams(option *option.AiOption) error {
|
|||
return errors.New("ResourceType not set")
|
||||
}
|
||||
|
||||
epoch := "epoch" + COMMA + "1"
|
||||
option.Params = append(option.Params, epoch)
|
||||
//epoch := "epoch" + COMMA + "1"
|
||||
//option.Params = append(option.Params, epoch)
|
||||
|
||||
switch option.ResourceType {
|
||||
case CPU:
|
||||
card := "card" + COMMA + CPU
|
||||
option.Params = append(option.Params, card)
|
||||
return nil
|
||||
case GPU:
|
||||
case CARD:
|
||||
card := "card" + COMMA + "cuda:0"
|
||||
option.Params = append(option.Params, card)
|
||||
return nil
|
||||
|
|
Loading…
Reference in New Issue