Format codes

dlrover/go/operator/api/v1alpha1/scaleplan_types.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
  commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+ corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -41,7 +42,7 @@ type ScaleSpec struct {
  CreatePods []PodMeta `json:"createPods,omitempty"`
 
  // RemovePods are Pods to be removed
- RemovePods []string `json:"removePods,omitempty"`
+ RemovePods []PodMeta `json:"removePods,omitempty"`
 
  // MigratePods are Pods to be migrated to other Pods with the new resource.
  MigratePods []PodMeta `json:"migratePods,omitempty"`
@@ -62,17 +63,7 @@ type ReplicaResourceSpec struct {
  Replicas int `json:"replicas,omitempty"`
 
  // Resource defines the resource of each replica
- Resource ResourceSpec `json:"resource,omitempty"`
-}
-
-// ResourceSpec specifies the resources of a repalica
-type ResourceSpec struct {
- // CPU is the requested CPU cores of a replica
- CPU string `json:"cpu,omitempty"`
- // Memory is the requested memory (MB) of a replica
- Memory string `json:"memory,omitempty"`
- // GPU is the requested GPU of a replica
- GPU string `json:"gpu,omitempty"`
+ Resource corev1.ResourceList `json:"resource,omitempty"`
 }
 
 // PodMeta specifies the meta of a Pod.
@@ -84,7 +75,7 @@ type PodMeta struct {
  ID int `json:"id,omitempty"`
 
  // Type is the type of the Pod
- Type string `json:"type,omitempty"`
+ Type commonv1.ReplicaType `json:"type,omitempty"`
 
  // RankIndex is the index of the Pod
  RankIndex int `json:"randIndex,omitempty"`
@@ -93,7 +84,7 @@ type PodMeta struct {
  Service string `json:"service,omitempty"`
 
  // Resource defines the resource of each replica
- Resource ResourceSpec `json:"resource,omitempty"`
+ Resource corev1.ResourceList `json:"resource,omitempty"`
 }
 
 // ScalePlanStatus defines the observed state of ElasticJob

dlrover/go/operator/main.go

@@ -33,7 +33,7 @@ import (
 
  elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
  "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers"
- _ "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers/psstrategy"
+ _ "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers/training"
  //+kubebuilder:scaffold:imports
 )
 

dlrover/go/operator/pkg/common/resource.go

@@ -36,14 +36,16 @@ const (
  LabelReplicaTypeKey = "replica-type"
  // LabelReplicaIndexKey is the key of ReplicaIndex in labels
  LabelReplicaIndexKey = "replica-index"
+ // LabelRankIndexKey is the key of rankIndex.
+ LabelRankIndexKey = "rank-index"
 )
 
 // ReplicaManagers contains the manager for each ReplicaType
 var ReplicaManagers = make(map[commonv1.ReplicaType]ReplicaManager)
 
 // ReplicaManager manage pods of ReplicaType
 type ReplicaManager interface {
- ReconcilePods(client runtime_client.Client, job *elasticv1alpha1.ElasticJob, resourceSpec *elasticv1alpha1.ReplicaResourceSpec) error
+ ReconcilePods(client runtime_client.Client, job *elasticv1alpha1.ElasticJob, scalePlan *elasticv1alpha1.ScalePlan) error
 
  SyncJobState(client runtime_client.Client, job *elasticv1alpha1.ElasticJob) error
 

dlrover/go/operator/pkg/controllers/elasticjob_controller.go

@@ -211,10 +211,9 @@ func (r *ElasticJobReconciler) getJobScalePlan(job *elasticv1alpha1.ElasticJob)
 }
 
 func (r *ElasticJobReconciler) executeScaling(job *elasticv1alpha1.ElasticJob, scalePlan *elasticv1alpha1.ScalePlan) error {
- for replicaType, resourceSpec := range scalePlan.Spec.ReplicaResourceSpecs {
- logger.Infof("Replica %s, resource %v", replicaType, resourceSpec)
+ for replicaType := range scalePlan.Spec.ReplicaResourceSpecs {
  replicaManager := common.ReplicaManagers[replicaType]
- err := replicaManager.ReconcilePods(r.Client, job, &resourceSpec)
+ err := replicaManager.ReconcilePods(r.Client, job, scalePlan)
  if err != nil {
  r.Recorder.Eventf(
  job,

dlrover/go/operator/pkg/controllers/master/master.go

@@ -96,7 +96,7 @@ func (m *Manager) newJobMaster(
 func (m *Manager) ReconcilePods(
  client runtime_client.Client,
  job *elasticv1alpha1.ElasticJob,
- resourceSpec *elasticv1alpha1.ReplicaResourceSpec,
+ scalePlan *elasticv1alpha1.ScalePlan,
 ) error {
  masterPod := m.newJobMaster(job, initMasterIndex)
  err := client.Create(context.Background(), masterPod)