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 incorrect torch env population #1361

Merged
merged 1 commit into from
Aug 15, 2021
Merged

fix incorrect torch env population #1361

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
4 changes: 2 additions & 2 deletions pkg/controller.v1/pytorch/pytorch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
func SetPodEnv(obj interface{}, podTemplateSpec *corev1.PodTemplateSpec, rtype, index string) error {
pytorchjob, ok := obj.(*pytorchv1.PyTorchJob)
if !ok {
return fmt.Errorf("%+v is not a type of XGBoostJob", obj)
return fmt.Errorf("%+v is not a type of PyTorchJob", obj)
}

rank, err := strconv.Atoi(index)
Expand All @@ -29,7 +29,7 @@ func SetPodEnv(obj interface{}, podTemplateSpec *corev1.PodTemplateSpec, rtype,
}

masterAddr := genGeneralName(pytorchjob.Name, strings.ToLower(string(pytorchv1.PyTorchReplicaTypeMaster)), strconv.Itoa(0))
if rtype == string(pytorchv1.PyTorchReplicaTypeMaster) {
if rtype == strings.ToLower(string(pytorchv1.PyTorchReplicaTypeMaster)) {
if rank != 0 {
return fmt.Errorf("invalid config: There should be only a single master with index=0")
}
Expand Down
14 changes: 7 additions & 7 deletions pkg/controller.v1/pytorch/pytorchjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func (r *PyTorchJobReconciler) GetJobFromAPIClient(namespace, name string) (meta
err = clientReader.Get(context.Background(), types.NamespacedName{Namespace: namespace, Name: name}, job)
if err != nil {
if errors.IsNotFound(err) {
logrus.Error(err, "xgboost job not found", "namespace", namespace, "name", name)
logrus.Error(err, "pytorch job not found", "namespace", namespace, "name", name)
} else {
logrus.Error(err, "failed to get job from api-server", "namespace", namespace, "name", name)
}
Expand Down Expand Up @@ -327,12 +327,12 @@ func (r *PyTorchJobReconciler) UpdateJobStatus(job interface{}, replicas map[com
running := status.Active
failed := status.Failed

logrus.Infof("XGBoostJob=%s, ReplicaType=%s expected=%d, running=%d, succeeded=%d , failed=%d",
logrus.Infof("PyTorchJob=%s, ReplicaType=%s expected=%d, running=%d, succeeded=%d , failed=%d",
pytorchjob.Name, rtype, expected, running, succeeded, failed)

if rtype == commonv1.ReplicaType(pytorchv1.PyTorchReplicaTypeMaster) {
if running > 0 {
msg := fmt.Sprintf("XGBoostJob %s is running.", pytorchjob.Name)
msg := fmt.Sprintf("PyTorchJob %s is running.", pytorchjob.Name)
err := commonutil.UpdateJobConditions(jobStatus, commonv1.JobRunning, commonutil.JobRunningReason, msg)
if err != nil {
commonutil.LoggerForJob(pytorchjob).Infof("Append job condition error: %v", err)
Expand All @@ -341,7 +341,7 @@ func (r *PyTorchJobReconciler) UpdateJobStatus(job interface{}, replicas map[com
}
// when master is succeed, the job is finished.
if expected == 0 {
msg := fmt.Sprintf("XGBoostJob %s is successfully completed.", pytorchjob.Name)
msg := fmt.Sprintf("PyTorchJob %s is successfully completed.", pytorchjob.Name)
logrus.Info(msg)
r.Recorder.Event(pytorchjob, corev1.EventTypeNormal, commonutil.JobSucceededReason, msg)
if jobStatus.CompletionTime == nil {
Expand All @@ -358,15 +358,15 @@ func (r *PyTorchJobReconciler) UpdateJobStatus(job interface{}, replicas map[com
}
if failed > 0 {
if spec.RestartPolicy == commonv1.RestartPolicyExitCode {
msg := fmt.Sprintf("XGBoostJob %s is restarting because %d %s replica(s) failed.", pytorchjob.Name, failed, rtype)
msg := fmt.Sprintf("PyTorchJob %s is restarting because %d %s replica(s) failed.", pytorchjob.Name, failed, rtype)
r.Recorder.Event(pytorchjob, corev1.EventTypeWarning, commonutil.JobRestartingReason, msg)
err := commonutil.UpdateJobConditions(jobStatus, commonv1.JobRestarting, commonutil.JobRestartingReason, msg)
if err != nil {
commonutil.LoggerForJob(pytorchjob).Infof("Append job condition error: %v", err)
return err
}
} else {
msg := fmt.Sprintf("XGBoostJob %s is failed because %d %s replica(s) failed.", pytorchjob.Name, failed, rtype)
msg := fmt.Sprintf("PyTorchJob %s is failed because %d %s replica(s) failed.", pytorchjob.Name, failed, rtype)
r.Recorder.Event(pytorchjob, corev1.EventTypeNormal, commonutil.JobFailedReason, msg)
if pytorchjob.Status.CompletionTime == nil {
now := metav1.Now()
Expand All @@ -386,7 +386,7 @@ func (r *PyTorchJobReconciler) UpdateJobStatus(job interface{}, replicas map[com
commonutil.LoggerForJob(pytorchjob).Infof(msg)

if err := commonutil.UpdateJobConditions(jobStatus, commonv1.JobRunning, commonutil.JobRunningReason, msg); err != nil {
commonutil.LoggerForJob(pytorchjob).Error(err, "failed to update XGBoost Job conditions")
commonutil.LoggerForJob(pytorchjob).Error(err, "failed to update PyTorch Job conditions")
return err
}

Expand Down