diff --git a/examples/MinikubeDemo.md b/examples/MinikubeDemo.md index 1620ca3f180..d1200a4058e 100644 --- a/examples/MinikubeDemo.md +++ b/examples/MinikubeDemo.md @@ -110,7 +110,7 @@ Spec: Image: katib/mxnet-mnist-example Worker Type: Default Status: - Best Objctive Value: + Best Objective Value: Conditon: Running Early Stopping Parameter Id: Studyid: qb397cc06d1f8302 @@ -118,17 +118,17 @@ Status: Trials: Trialid: p18ee16163b85678 Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: td08f74b9939350d Trialid: pb1be3dbe53a5cb0 Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: p2b23e25cce4092c Trialid: m64209fe0867e91a Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: q6258c1ac98a00a5 Events: @@ -218,7 +218,7 @@ Spec: Worker Template Path: /worker-template/gpuWorkerTemplate.yaml Worker Type: Default Status: - Best Objctive Value: + Best Objective Value: Conditon: Running Early Stopping Parameter Id: Studyid: k549e927046f2136 @@ -226,17 +226,17 @@ Status: Trials: Trialid: t721857cd426b68b Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: g07cba174ada521e Trialid: f27c0ac1c6664533 Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: h8d5062f2f1b8633 Trialid: v129109d1331a98e Workeridlist: - Objctive Value: + Objective Value: Conditon: Running Workerid: x8f172a64645690e ``` diff --git a/pkg/api/operators/apis/studyjob/v1alpha1/studyjob_types.go b/pkg/api/operators/apis/studyjob/v1alpha1/studyjob_types.go index 62c7eb73943..84d9731170f 100644 --- a/pkg/api/operators/apis/studyjob/v1alpha1/studyjob_types.go +++ b/pkg/api/operators/apis/studyjob/v1alpha1/studyjob_types.go @@ -62,7 +62,7 @@ type StudyJobStatus struct { SuggestionParameterID string `json:"suggestionParameterId"` EarlyStoppingParameterID string `json:"earlyStoppingParameterId"` Trials []TrialSet `json:"trials,omitempty"` - BestObjctiveValue *float64 `jsob:"bestObjctiveValue,omitempty"` + BestObjectiveValue *float64 `json:"bestObjectiveValue,omitempty"` SuggestionCount int `json:"suggestionCount,omitempty"` } @@ -70,7 +70,7 @@ type WorkerCondition struct { WorkerID string `json:"workerid,omitempty"` Kind string `json:"kind,omitempty"` Condition Condition `json:"conditon,omitempty"` - ObjctiveValue *float64 `jsob:"objctiveValue,omitempty"` + ObjectiveValue *float64 `json:"objectiveValue,omitempty"` StartTime metav1.Time `json:"startTime,omitempty"` CompletionTime metav1.Time `json:"completionTime,omitempty"` } diff --git a/pkg/api/operators/apis/studyjob/v1alpha1/zz_generated.deepcopy.go b/pkg/api/operators/apis/studyjob/v1alpha1/zz_generated.deepcopy.go index 9cd11eef4e3..64a6e231e2d 100644 --- a/pkg/api/operators/apis/studyjob/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/api/operators/apis/studyjob/v1alpha1/zz_generated.deepcopy.go @@ -269,8 +269,8 @@ func (in *StudyJobStatus) DeepCopyInto(out *StudyJobStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.BestObjctiveValue != nil { - in, out := &in.BestObjctiveValue, &out.BestObjctiveValue + if in.BestObjectiveValue != nil { + in, out := &in.BestObjectiveValue, &out.BestObjectiveValue *out = new(float64) **out = **in } @@ -334,8 +334,8 @@ func (in *TrialSet) DeepCopy() *TrialSet { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *WorkerCondition) DeepCopyInto(out *WorkerCondition) { *out = *in - if in.ObjctiveValue != nil { - in, out := &in.ObjctiveValue, &out.ObjctiveValue + if in.ObjectiveValue != nil { + in, out := &in.ObjectiveValue, &out.ObjectiveValue *out = new(float64) **out = **in } diff --git a/pkg/controller/studyjobcontroller/studyjob_controller.go b/pkg/controller/studyjobcontroller/studyjob_controller.go index 53bea115c6b..e0161e3ff43 100644 --- a/pkg/controller/studyjobcontroller/studyjob_controller.go +++ b/pkg/controller/studyjobcontroller/studyjob_controller.go @@ -265,17 +265,17 @@ func (r *ReconcileStudyJobController) checkGoal(instance *katibv1alpha1.StudyJob if curValue < *instance.Spec.OptimizationGoal { goal = true } - if instance.Status.BestObjctiveValue != nil { - if *instance.Status.BestObjctiveValue > curValue { - instance.Status.BestObjctiveValue = &curValue + if instance.Status.BestObjectiveValue != nil { + if *instance.Status.BestObjectiveValue > curValue { + instance.Status.BestObjectiveValue = &curValue } } else { - instance.Status.BestObjctiveValue = &curValue + instance.Status.BestObjectiveValue = &curValue } for i := range instance.Status.Trials { for j := range instance.Status.Trials[i].WorkerList { if instance.Status.Trials[i].WorkerList[j].WorkerID == mls.WorkerId { - instance.Status.Trials[i].WorkerList[j].ObjctiveValue = &curValue + instance.Status.Trials[i].WorkerList[j].ObjectiveValue = &curValue } } } @@ -283,17 +283,17 @@ func (r *ReconcileStudyJobController) checkGoal(instance *katibv1alpha1.StudyJob if curValue > *instance.Spec.OptimizationGoal { goal = true } - if instance.Status.BestObjctiveValue != nil { - if *instance.Status.BestObjctiveValue < curValue { - instance.Status.BestObjctiveValue = &curValue + if instance.Status.BestObjectiveValue != nil { + if *instance.Status.BestObjectiveValue < curValue { + instance.Status.BestObjectiveValue = &curValue } } else { - instance.Status.BestObjctiveValue = &curValue + instance.Status.BestObjectiveValue = &curValue } for i := range instance.Status.Trials { for j := range instance.Status.Trials[i].WorkerList { if instance.Status.Trials[i].WorkerList[j].WorkerID == mls.WorkerId { - instance.Status.Trials[i].WorkerList[j].ObjctiveValue = &curValue + instance.Status.Trials[i].WorkerList[j].ObjectiveValue = &curValue } } } @@ -381,7 +381,7 @@ func (r *ReconcileStudyJobController) checkStatus(instance *katibv1alpha1.StudyJ for i, t := range instance.Status.Trials { for j, w := range t.WorkerList { if w.Condition == katibv1alpha1.ConditionCompleted || w.Condition == katibv1alpha1.ConditionFailed { - if w.ObjctiveValue == nil && w.Condition == katibv1alpha1.ConditionCompleted { + if w.ObjectiveValue == nil && w.Condition == katibv1alpha1.ConditionCompleted { cwids = append(cwids, w.WorkerID) } switch w.Kind {