kubeflow
/
mpi-operator
mirror of https://github.com/kubeflow/mpi-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Discovery script for intel (#397) 

Slots are handled through an environment variable instead.
This commit is contained in:
Aldo Culquicondor 2021-08-11 16:19:01 -04:00 committed by GitHub
parent 990bf1c39d
commit b9dbbc5750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v2/pkg/controller/mpi_job_controller.go
View File

@ -1114,11 +1114,6 @@ func newConfigMap(mpiJob *kubeflow.MPIJob, workerReplicas int32, isGPULauncher b
// updateDiscoverHostsInConfigMap updates the ConfigMap if the content of `discover_hosts.sh` changes. // updateDiscoverHostsInConfigMap updates the ConfigMap if the content of `discover_hosts.sh` changes.
func updateDiscoverHostsInConfigMap(configMap *corev1.ConfigMap, mpiJob *kubeflow.MPIJob, runningPods []*corev1.Pod, isGPULauncher bool) { func updateDiscoverHostsInConfigMap(configMap *corev1.ConfigMap, mpiJob *kubeflow.MPIJob, runningPods []*corev1.Pod, isGPULauncher bool) {
slots := 1
if mpiJob.Spec.SlotsPerWorker != nil {
slots = int(*mpiJob.Spec.SlotsPerWorker)
}
// Sort the slice of Pods to make sure the order of entries in `discover_hosts.sh` is maintained. // Sort the slice of Pods to make sure the order of entries in `discover_hosts.sh` is maintained.
sort.Slice(runningPods, func(i, j int) bool { sort.Slice(runningPods, func(i, j int) bool {
return runningPods[i].Name < runningPods[j].Name return runningPods[i].Name < runningPods[j].Name
@ -1128,10 +1123,10 @@ func updateDiscoverHostsInConfigMap(configMap *corev1.ConfigMap, mpiJob *kubeflo
buffer.WriteString("#!/bin/sh\n") buffer.WriteString("#!/bin/sh\n")
workersService := mpiJob.Name + workerSuffix workersService := mpiJob.Name + workerSuffix
if isGPULauncher { if isGPULauncher {
buffer.WriteString(fmt.Sprintf("echo %s%s.%s:%d\n", mpiJob.Name, launcherSuffix, workersService, slots)) buffer.WriteString(fmt.Sprintf("echo %s%s.%s\n", mpiJob.Name, launcherSuffix, workersService))
} }
for _, p := range runningPods { for _, p := range runningPods {
buffer.WriteString(fmt.Sprintf("echo %s.%s:%d\n", p.Name, workersService, slots)) buffer.WriteString(fmt.Sprintf("echo %s.%s\n", p.Name, workersService))
} }
configMap.Data[discoverHostsScriptName] = buffer.String() configMap.Data[discoverHostsScriptName] = buffer.String()