mirror of
https://github.com/hanzo-ml/trainer.git
synced 2026-09-24 00:31:34 +00:00
* feat: api for volcano scheduling plugin Signed-off-by: Xinmin Du <[email protected]> * feat: init volcano-plugin Signed-off-by: Xinmin Du <[email protected]> * feat: init test file Signed-off-by: Xinmin Du <[email protected]> * feat: register volcano plugin Signed-off-by: Xinmin Du <[email protected]> * feat: deal with minTaskMember, minMember, NetworkTopo Signed-off-by: Xinmin Du <[email protected]> * fix: calculate of minResource Signed-off-by: Xinmin Du <[email protected]> * test: build PodGroup test Signed-off-by: Xinmin Du <[email protected]> * refactor: separate to 2 prs(build&handler) Signed-off-by: Xinmin Du <[email protected]> * test: add test for new&reconcile_builder Signed-off-by: Xinmin Du <[email protected]> * fix: typo Signed-off-by: Xinmin Du <[email protected]> * fix: trainer/v2 import Signed-off-by: Xinmin Du <[email protected]> * fix: networktopo type Signed-off-by: Xinmin Du <[email protected]> * fix: OpenAPI validation errors Signed-off-by: Xinmin Du <[email protected]> * fix: remove minTaskMembers Signed-off-by: Xinmin Du <[email protected]> * test: test coverage 100% Signed-off-by: Xinmin Du <[email protected]> * feat: update apis Signed-off-by: Xinmin Du <[email protected]> * feat: replace testify Signed-off-by: Xinmin Du <[email protected]> * fix: registry Volcano CRDs to the scheme Signed-off-by: Xinmin Du <[email protected]> * fix: add volcano to scheme Signed-off-by: Xinmin Du <[email protected]> * fix: fix networktopo schema Signed-off-by: Xinmin Du <[email protected]> * fix: add networktopo spec in trainer Signed-off-by: Xinmin Du <[email protected]> * fix: unit test Signed-off-by: Xinmin Du <[email protected]> * feat: import networkTopo directly Signed-off-by: Xinmin Du <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint Signed-off-by: Xinmin Du <[email protected]> * feat: add volcano installation in integration test Signed-off-by: Xinmin Du <[email protected]> * fix: filter volcano api Signed-off-by: Xinmin Du <[email protected]> * fix: get volcano.podgroup with local version Signed-off-by: Xinmin Du <[email protected]> * fix: init test env with volcano podgroup installed Signed-off-by: Xinmin Du <[email protected]> * fix: check plugin in enforcePodgroupPolicy Signed-off-by: Xinmin Du <[email protected]> * fix: group-name label in unit test Signed-off-by: Xinmin Du <[email protected]> * fix: ReconcilerBuilders Signed-off-by: Xinmin Du <[email protected]> * feat: add PodGroupHandler Signed-off-by: Xinmin Du <[email protected]> * feat: unit test for handlers Signed-off-by: Xinmin Du <[email protected]> * fix: group name annotation Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: no need to delete RBAC Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/indexer.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: nil checking for trainjob Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/volcano.go Co-authored-by: Andrey Velichkevich <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: make generate Signed-off-by: Xinmin Du <[email protected]> * fix: index conflict Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/coscheduling/coscheduling.go Co-authored-by: Shao Wang <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: update volcano to v1.12.2 Signed-off-by: Xinmin Du <[email protected]> * feat: re-use indexer Signed-off-by: Xinmin Du <[email protected]> * feat: add validate Signed-off-by: Xinmin Du <[email protected]> * fix: no scheduler when coscheduling is nil Signed-off-by: Xinmin Du <[email protected]> * fix: put group-name in annotations Signed-off-by: Xinmin Du <[email protected]> * feat: validate if priorityClass installed Signed-off-by: Xinmin Du <[email protected]> * feat: propagate annotations to pod Signed-off-by: Xinmin Du <[email protected]> * feat: integration test for volcano Signed-off-by: Xinmin Du <[email protected]> * fix: golangci-lint check Signed-off-by: Xinmin Du <[email protected]> * feat: use shared indexer Signed-off-by: Xinmin Du <[email protected]> * feat: remove indexer to runtime/ Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: append owner reference & missing import Signed-off-by: Xinmin Du <[email protected]> * fix: rewrite volcano UT Signed-off-by: Xinmin Du <[email protected]> * feat: add copyright Signed-off-by: Xinmin Du <[email protected]> * fix: sync RBAC to Helm charts Signed-off-by: Xinmin Du <[email protected]> * fix: refactor UTs Signed-off-by: Xinmin Du <[email protected]> * fix: test validation separately Signed-off-by: Xinmin Du <[email protected]> * Update hack/swagger/main.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> * fix: refactor TestVolcano Signed-off-by: Xinmin Du <[email protected]> * fix: refactor TestValidate Signed-off-by: Xinmin Du <[email protected]> * Update pkg/runtime/framework/plugins/volcano/volcano_test.go Co-authored-by: Yuki Iwai <[email protected]> Signed-off-by: Du Xinmin <[email protected]> --------- Signed-off-by: Xinmin Du <[email protected]> Signed-off-by: Du Xinmin <[email protected]> Co-authored-by: Andrey Velichkevich <[email protected]> Co-authored-by: Shao Wang <[email protected]> Co-authored-by: Yuki Iwai <[email protected]>
91 lines
3.0 KiB
Go
91 lines
3.0 KiB
Go
/*
|
|
Copyright 2024 The Kubeflow Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package indexer
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"k8s.io/utils/ptr"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
trainer "github.com/kubeflow/trainer/v2/pkg/apis/trainer/v1alpha1"
|
|
"github.com/kubeflow/trainer/v2/pkg/util/trainjob"
|
|
)
|
|
|
|
const (
|
|
TrainJobRuntimeRefKey = ".spec.runtimeRef.kind=trainingRuntime"
|
|
TrainJobClusterRuntimeRefKey = ".spec.runtimeRef.kind=clusterTrainingRuntime"
|
|
)
|
|
|
|
var (
|
|
TrainingRuntimeContainerRuntimeClassKey = ".trainingRuntimeSpec.jobSetTemplateSpec.replicatedJobs.podTemplateSpec.runtimeClassName"
|
|
ClusterTrainingRuntimeContainerRuntimeClassKey = ".clusterTrainingRuntimeSpec.jobSetTemplateSpec.replicatedJobs.podTemplateSpec.runtimeClassName"
|
|
ErrorCanNotSetupTrainingRuntimeRuntimeClassIndexer = errors.New("setting index on runtimeClass for TrainingRuntime")
|
|
ErrorCanNotSetupClusterTrainingRuntimeRuntimeClassIndexer = errors.New("setting index on runtimeClass for ClusterTrainingRuntime")
|
|
)
|
|
|
|
func IndexTrainingRuntimeContainerRuntimeClass(obj client.Object) []string {
|
|
runtime, ok := obj.(*trainer.TrainingRuntime)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
var runtimeClasses []string
|
|
for _, rJob := range runtime.Spec.Template.Spec.ReplicatedJobs {
|
|
if rJob.Template.Spec.Template.Spec.RuntimeClassName != nil {
|
|
runtimeClasses = append(runtimeClasses, *rJob.Template.Spec.Template.Spec.RuntimeClassName)
|
|
}
|
|
}
|
|
return runtimeClasses
|
|
}
|
|
|
|
func IndexClusterTrainingRuntimeContainerRuntimeClass(obj client.Object) []string {
|
|
clRuntime, ok := obj.(*trainer.ClusterTrainingRuntime)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
var runtimeClasses []string
|
|
for _, rJob := range clRuntime.Spec.Template.Spec.ReplicatedJobs {
|
|
if rJob.Template.Spec.Template.Spec.RuntimeClassName != nil {
|
|
runtimeClasses = append(runtimeClasses, *rJob.Template.Spec.Template.Spec.RuntimeClassName)
|
|
}
|
|
}
|
|
return runtimeClasses
|
|
}
|
|
|
|
func IndexTrainJobTrainingRuntime(obj client.Object) []string {
|
|
trainJob, ok := obj.(*trainer.TrainJob)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
if trainjob.RuntimeRefIsTrainingRuntime(trainJob.Spec.RuntimeRef) {
|
|
return []string{trainJob.Spec.RuntimeRef.Name}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func IndexTrainJobClusterTrainingRuntime(obj client.Object) []string {
|
|
trainJob, ok := obj.(*trainer.TrainJob)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
if ptr.Deref(trainJob.Spec.RuntimeRef.APIGroup, "") == trainer.GroupVersion.Group &&
|
|
ptr.Deref(trainJob.Spec.RuntimeRef.Kind, "") == trainer.ClusterTrainingRuntimeKind {
|
|
return []string{trainJob.Spec.RuntimeRef.Name}
|
|
}
|
|
return nil
|
|
}
|