Merge pull request Project-HAMi#71 from Project-HAMi/release-v1.3

archlitchi · web-flow · commit b6e8dc9e43bf · 2026-05-09T16:51:17.000+08:00
Update device config logic
diff --git a/ascend-device-configmap.yaml b/ascend-device-configmap.yaml
@@ -9,129 +9,129 @@ metadata:
     app.kubernetes.io/instance: hami
 data:
   device-config.yaml: |-
-    hamiVnpuCore: false
     vnpus:
-    - chipName: 910A
-      commonWord: Ascend910A
-      resourceName: huawei.com/Ascend910A
-      resourceMemoryName: huawei.com/Ascend910A-memory
-      memoryAllocatable: 32768
-      memoryCapacity: 32768
-      aiCore: 30
-      templates:
-        - name: vir02
-          memory: 2184
-          aiCore: 2
-        - name: vir04
-          memory: 4369
-          aiCore: 4
-        - name: vir08
-          memory: 8738
-          aiCore: 8
-        - name: vir16
-          memory: 17476
-          aiCore: 16
-    - chipName: 910B2
-      commonWord: Ascend910B2
-      resourceName: huawei.com/Ascend910B2
-      resourceMemoryName: huawei.com/Ascend910B2-memory
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      aiCore: 24
-      aiCPU: 6
-      templates:
-        - name: vir03_1c_8g
-          memory: 8192
-          aiCore: 3
-          aiCPU: 1
-        - name: vir06_1c_16g
-          memory: 16384
-          aiCore: 6
-          aiCPU: 1
-        - name: vir12_3c_32g
-          memory: 32768
-          aiCore: 12
-          aiCPU: 3
-    - chipName: 910B3
-      commonWord: Ascend910B3
-      resourceName: huawei.com/Ascend910B3
-      resourceMemoryName: huawei.com/Ascend910B3-memory
-      resourceCoreName: huawei.com/Ascend910B3-core
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        - name: vir05_1c_16g
-          memory: 16384
-          aiCore: 5
-          aiCPU: 1
-        - name: vir10_3c_32g
-          memory: 32768
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 910B4-1
-      commonWord: Ascend910B4-1
-      resourceName: huawei.com/Ascend910B4-1
-      resourceMemoryName: huawei.com/Ascend910B4-1-memory
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        - name: vir05_1c_16g
-          memory: 16384
-          aiCore: 5
-          aiCPU: 1
-        - name: vir10_3c_32g
-          memory: 32768
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 910B4
-      commonWord: Ascend910B4
-      resourceName: huawei.com/Ascend910B4
-      resourceMemoryName: huawei.com/Ascend910B4-memory
-      memoryAllocatable: 32768
-      memoryCapacity: 32768
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        - name: vir05_1c_8g
-          memory: 8192
-          aiCore: 5
-          aiCPU: 1
-        - name: vir10_3c_16g
-          memory: 16384
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 310P3
-      commonWord: Ascend310P
-      resourceName: huawei.com/Ascend310P
-      resourceMemoryName: huawei.com/Ascend310P-memory
-      memoryAllocatable: 21527
-      memoryCapacity: 24576
-      aiCore: 8
-      aiCPU: 7
-      templates:
-        - name: vir01
-          memory: 3072
-          aiCore: 1
-          aiCPU: 1
-        - name: vir02
-          memory: 6144
-          aiCore: 2
-          aiCPU: 2
-        - name: vir04
-          memory: 12288
-          aiCore: 4
-          aiCPU: 4
-    - chipName: Ascend910
-      commonWord: Ascend910C
-      resourceName: huawei.com/Ascend910C
-      resourceMemoryName: huawei.com/Ascend910C-memory
-      resourceCoreName: huawei.com/Ascend910C-core
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      aiCore: 20
-      aiCPU: 7
-
+      hamiVnpuCore: false
+      configs:
+      - chipName: 910A
+        commonWord: Ascend910A
+        resourceName: huawei.com/Ascend910A
+        resourceMemoryName: huawei.com/Ascend910A-memory
+        memoryAllocatable: 32768
+        memoryCapacity: 32768
+        aiCore: 30
+        templates:
+          - name: vir02
+            memory: 2184
+            aiCore: 2
+          - name: vir04
+            memory: 4369
+            aiCore: 4
+          - name: vir08
+            memory: 8738
+            aiCore: 8
+          - name: vir16
+            memory: 17476
+            aiCore: 16
+      - chipName: 910B2
+        commonWord: Ascend910B2
+        resourceName: huawei.com/Ascend910B2
+        resourceMemoryName: huawei.com/Ascend910B2-memory
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        aiCore: 24
+        aiCPU: 6
+        templates:
+          - name: vir03_1c_8g
+            memory: 8192
+            aiCore: 3
+            aiCPU: 1
+          - name: vir06_1c_16g
+            memory: 16384
+            aiCore: 6
+            aiCPU: 1
+          - name: vir12_3c_32g
+            memory: 32768
+            aiCore: 12
+            aiCPU: 3
+      - chipName: 910B3
+        commonWord: Ascend910B3
+        resourceName: huawei.com/Ascend910B3
+        resourceMemoryName: huawei.com/Ascend910B3-memory
+        resourceCoreName: huawei.com/Ascend910B3-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        aiCore: 20
+        aiCPU: 7
+        templates:
+          - name: vir05_1c_16g
+            memory: 16384
+            aiCore: 5
+            aiCPU: 1
+          - name: vir10_3c_32g
+            memory: 32768
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 910B4-1
+        commonWord: Ascend910B4-1
+        resourceName: huawei.com/Ascend910B4-1
+        resourceMemoryName: huawei.com/Ascend910B4-1-memory
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        aiCore: 20
+        aiCPU: 7
+        templates:
+          - name: vir05_1c_16g
+            memory: 16384
+            aiCore: 5
+            aiCPU: 1
+          - name: vir10_3c_32g
+            memory: 32768
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 910B4
+        commonWord: Ascend910B4
+        resourceName: huawei.com/Ascend910B4
+        resourceMemoryName: huawei.com/Ascend910B4-memory
+        memoryAllocatable: 32768
+        memoryCapacity: 32768
+        aiCore: 20
+        aiCPU: 7
+        templates:
+          - name: vir05_1c_8g
+            memory: 8192
+            aiCore: 5
+            aiCPU: 1
+          - name: vir10_3c_16g
+            memory: 16384
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 310P3
+        commonWord: Ascend310P
+        resourceName: huawei.com/Ascend310P
+        resourceMemoryName: huawei.com/Ascend310P-memory
+        memoryAllocatable: 21527
+        memoryCapacity: 24576
+        aiCore: 8
+        aiCPU: 7
+        templates:
+          - name: vir01
+            memory: 3072
+            aiCore: 1
+            aiCPU: 1
+          - name: vir02
+            memory: 6144
+            aiCore: 2
+            aiCPU: 2
+          - name: vir04
+            memory: 12288
+            aiCore: 4
+            aiCPU: 4
+      - chipName: Ascend910
+        commonWord: Ascend910C
+        resourceName: huawei.com/Ascend910C
+        resourceMemoryName: huawei.com/Ascend910C-memory
+        resourceCoreName: huawei.com/Ascend910C-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        aiCore: 20
+        aiCPU: 7
diff --git a/internal/manager/manager.go b/internal/manager/manager.go
@@ -89,7 +89,7 @@ func (am *AscendManager) LoadConfig(path string) error {
 		return fmt.Errorf("chip type is not Ascend")
 	}
 	idx := -1
-	for i, vnpu := range config.VNPUs {
+	for i, vnpu := range config.VNPUs.Configs {
 		if vnpu.ChipName == chipInfo.Name {
 			idx = i
 			break
@@ -98,7 +98,7 @@ func (am *AscendManager) LoadConfig(path string) error {
 	if idx == -1 {
 		return fmt.Errorf("can not find vnpu config for chip %s", chipInfo.Name)
 	}
-	am.config = config.VNPUs[idx]
+	am.config = config.VNPUs.Configs[idx]
 	am.globalConfig = *config
 	sort.Slice(am.config.Templates, func(i, j int) bool {
 		return am.config.Templates[i].Memory < am.config.Templates[j].Memory
@@ -263,5 +263,5 @@ func (am *AscendManager) IsHamiVnpuCore() bool {
 	if am.nodeConfig != nil {
 		return am.nodeConfig.HamiVnpuCore
 	}
-	return am.globalConfig.HamiVnpuCore
+	return am.globalConfig.VNPUs.HamiVnpuCore
 }
diff --git a/internal/vnpu.go b/internal/vnpu.go
@@ -41,9 +41,13 @@ type VNPUConfig struct {
 	Templates          []Template `json:"templates"`
 }
 
-type Config struct {
+type VNPUsConfig struct {
 	HamiVnpuCore bool         `json:"hamiVnpuCore,omitempty"`
-	VNPUs        []VNPUConfig `json:"vnpus"`
+	Configs      []VNPUConfig `json:"configs"`
+}
+
+type Config struct {
+	VNPUs VNPUsConfig `json:"vnpus"`
 }
 
 func LoadConfig(path string) (*Config, error) {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (am *AscendManager) LoadConfig(path string) error {`
`89`	`89`	`return fmt.Errorf("chip type is not Ascend")`
`90`	`90`	`}`
`91`	`91`	`idx := -1`
`92`		`- for i, vnpu := range config.VNPUs {`
	`92`	`+ for i, vnpu := range config.VNPUs.Configs {`
`93`	`93`	`if vnpu.ChipName == chipInfo.Name {`
`94`	`94`	`idx = i`
`95`	`95`	`break`
`@@ -98,7 +98,7 @@ func (am *AscendManager) LoadConfig(path string) error {`
`98`	`98`	`if idx == -1 {`
`99`	`99`	`return fmt.Errorf("can not find vnpu config for chip %s", chipInfo.Name)`
`100`	`100`	`}`
`101`		`- am.config = config.VNPUs[idx]`
	`101`	`+ am.config = config.VNPUs.Configs[idx]`
`102`	`102`	`am.globalConfig = *config`
`103`	`103`	`sort.Slice(am.config.Templates, func(i, j int) bool {`
`104`	`104`	`return am.config.Templates[i].Memory < am.config.Templates[j].Memory`
`@@ -263,5 +263,5 @@ func (am *AscendManager) IsHamiVnpuCore() bool {`
`263`	`263`	`if am.nodeConfig != nil {`
`264`	`264`	`return am.nodeConfig.HamiVnpuCore`
`265`	`265`	`}`
`266`		`- return am.globalConfig.HamiVnpuCore`
	`266`	`+ return am.globalConfig.VNPUs.HamiVnpuCore`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,13 @@ type VNPUConfig struct {`
`41`	`41`	Templates []Template `json:"templates"`
`42`	`42`	`}`
`43`	`43`
`44`		`-type Config struct {`
	`44`	`+type VNPUsConfig struct {`
`45`	`45`	HamiVnpuCore bool `json:"hamiVnpuCore,omitempty"`
`46`		- VNPUs []VNPUConfig `json:"vnpus"`
	`46`	+ Configs []VNPUConfig `json:"configs"`
	`47`	`+}`
	`48`	`+`
	`49`	`+type Config struct {`
	`50`	+ VNPUs VNPUsConfig `json:"vnpus"`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`func LoadConfig(path string) (*Config, error) {`