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

Fix incorrect TensorBoard images. #1109

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Fix incorrect TensorBoard images. #1109

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
2 changes: 1 addition & 1 deletion charts/cron-tfjob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ tfjob:
imagePullPolicy: Always

useTensorboard: false
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/kube-ai/tensorflow:1.5.0-devel
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel
tensorboardImagePullpolicy: Always
tensorboardServiceType: NodePort
tensorboardResources: {}
Expand Down
2 changes: 1 addition & 1 deletion charts/etjob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ shmSize: 2Gi
privileged: false

useTensorboard: false
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/tensorflow-samples/tensorflow:1.5.0-devel
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel
tensorboardImagePullpolicy: Always
tensorboardServiceType: NodePort

Expand Down
2 changes: 1 addition & 1 deletion charts/mpijob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ shmSize: 2Gi
privileged: false

useTensorboard: false
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.5.0-devel
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel
tensorboardImagePullpolicy: Always
tensorboardServiceType: NodePort

Expand Down
2 changes: 1 addition & 1 deletion charts/pytorchjob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5
privileged: false

useTensorboard: false
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/kube-ai/tensorflow:1.5.0-devel
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel
tensorboardImagePullpolicy: Always
tensorboardServiceType: NodePort

Expand Down
2 changes: 1 addition & 1 deletion charts/tfjob/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5
imagePullPolicy: Always

useTensorboard: false
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/kube-ai/tensorflow:1.5.0-devel
tensorboardImage: registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel
tensorboardImagePullpolicy: Always
tensorboardServiceType: NodePort
tensorboardResources: {}
Expand Down
3 changes: 1 addition & 2 deletions pkg/apis/training/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ var DefaultCommonSubmitArgs = types.CommonSubmitArgs{
}

var DefaultSubmitTensorboardArgs = types.SubmitTensorboardArgs{
TensorboardImage: "registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel",
TrainingLogdir: "/training_logs",
TrainingLogdir: "/training_logs",
}
6 changes: 3 additions & 3 deletions pkg/apis/types/submit_tfjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ type SubmitTFJobArgs struct {

// SubmitTensorboardArgs is used to store tensorborad information
type SubmitTensorboardArgs struct {
UseTensorboard bool `yaml:"useTensorboard"` // --tensorboard
TensorboardImage string `yaml:"tensorboardImage"` // --tensorboardImage
TrainingLogdir string `yaml:"trainingLogdir"` // --logdir
UseTensorboard bool `yaml:"useTensorboard"` // --tensorboard
TensorboardImage string `yaml:"tensorboardImage,omitempty"` // --tensorboardImage
TrainingLogdir string `yaml:"trainingLogdir"` // --logdir
HostLogPath string `yaml:"hostLogPath"`
IsLocalLogging bool `yaml:"isLocalLogging"`
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/argsbuilder/submit_tensorboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ func (s *SubmitTensorboardArgsBuilder) AddCommandFlags(command *cobra.Command) {
s.subBuilders[name].AddCommandFlags(command)
}
command.Flags().BoolVar(&s.args.UseTensorboard, "tensorboard", false, "enable tensorboard")
command.Flags().StringVar(&s.args.TensorboardImage, "tensorboardImage", "registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel", "the docker image for tensorboard")
command.Flags().StringVar(&s.args.TensorboardImage, "tensorboardImage", "", "the docker image for tensorboard")
_ = command.Flags().MarkDeprecated("tensorboardImage", "please use --tensorboard-image instead")
command.Flags().StringVar(&s.args.TensorboardImage, "tensorboard-image", "registry.cn-zhangjiakou.aliyuncs.com/acs/tensorflow:1.12.0-devel", "the docker image for tensorboard")
command.Flags().StringVar(&s.args.TensorboardImage, "tensorboard-image", "", "the docker image for tensorboard")
command.Flags().StringVar(&s.args.TrainingLogdir, "logdir", "/training_logs", "the training logs dir, default is /training_logs")
}

Expand Down
Loading