Skip to content

Commit 7c9d002

Browse files
committed
Address comments
1 parent f0bdb22 commit 7c9d002

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

slice/internal/controller/workload_controller.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,10 @@ func (r *WorkloadReconciler) validatePartitionCount(
671671
log := ctrl.LoggerFrom(ctx)
672672
var incorrectSlices []string
673673
for _, slice := range slicesToCreate {
674-
dims, _ := topology.ParseTopology(slice.Spec.Topology)
674+
dims, err := topology.ParseTopologyV7(slice.Spec.Topology)
675+
if err != nil {
676+
return err
677+
}
675678
numberOfCubesFromTopology := dims[0] * dims[1] * dims[2] / core.TPUsPerCube
676679
if int(numberOfCubesFromTopology) != len(slice.Spec.PartitionIds) {
677680
incorrectSlices = append(incorrectSlices, slice.Name)

slice/internal/topology/topology.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func ParseAssignment(topologyAssignment *kueue.TopologyAssignment, nodes map[str
5858
return parsedAssignment
5959
}
6060

61-
func ParseTopology(tpuTopology string) ([]int64, error) {
61+
func ParseTopologyV7(tpuTopology string) ([]int64, error) {
6262
dimensions := strings.Split(tpuTopology, "x")
6363
if len(dimensions) != 3 {
6464
return nil, fmt.Errorf("invalid topology format: %s, expected 3 dimensions", tpuTopology)

slice/internal/topology/topology_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestParseTopology(t *testing.T) {
8383

8484
for name, tc := range testCases {
8585
t.Run(name, func(t *testing.T) {
86-
dims, err := ParseTopology(tc.topology)
86+
dims, err := ParseTopologyV7(tc.topology)
8787
if (err != nil) != tc.wantErr {
8888
t.Errorf("parseTopology() error = %v, wantErr %v", err, tc.wantErr)
8989
return

slice/internal/webhooks/jobset_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func annotateReplicatedJobWithSliceHealth(rj *v1alpha2.ReplicatedJob) {
135135
}
136136

137137
func (r *JobSetWebhook) podSetSliceSize(tpuTopology string, parallelism int32) (int64, error) {
138-
dims, err := topology.ParseTopology(tpuTopology)
138+
dims, err := topology.ParseTopologyV7(tpuTopology)
139139
if err != nil {
140140
return 0, err
141141
}

0 commit comments

Comments
 (0)