Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typos for json and objective #242

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Fix typos for json and objective #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions examples/MinikubeDemo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,25 +110,25 @@ Spec:
Image: katib/mxnet-mnist-example
Worker Type: Default
Status:
Best Objctive Value: <nil>
Best Objective Value: <nil>
Conditon: Running
Early Stopping Parameter Id:
Studyid: qb397cc06d1f8302
Suggestion Parameter Id:
Trials:
Trialid: p18ee16163b85678
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: td08f74b9939350d
Trialid: pb1be3dbe53a5cb0
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: p2b23e25cce4092c
Trialid: m64209fe0867e91a
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: q6258c1ac98a00a5
Events: <none>
Expand Down Expand Up @@ -218,25 +218,25 @@ Spec:
Worker Template Path: /worker-template/gpuWorkerTemplate.yaml
Worker Type: Default
Status:
Best Objctive Value: <nil>
Best Objective Value: <nil>
Conditon: Running
Early Stopping Parameter Id:
Studyid: k549e927046f2136
Suggestion Parameter Id:
Trials:
Trialid: t721857cd426b68b
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: g07cba174ada521e
Trialid: f27c0ac1c6664533
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: h8d5062f2f1b8633
Trialid: v129109d1331a98e
Workeridlist:
Objctive Value: <nil>
Objective Value: <nil>
Conditon: Running
Workerid: x8f172a64645690e
```
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/operators/apis/studyjob/v1alpha1/studyjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ 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"`
}

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"`
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/operators/apis/studyjob/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions pkg/controller/studyjobcontroller/studyjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,35 +265,35 @@ 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
}
}
}
} else if instance.Spec.OptimizationType == katibv1alpha1.OptimizationTypeMaximize {
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
}
}
}
Expand Down Expand Up @@ -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 {
Expand Down