Browse Source

Merge pull request #185 from JimmyYang20/fl

FL: fix nil pointer bug in GM
tags/v0.4.0
KubeEdge Bot GitHub 4 years ago
parent
commit
bb4f651179
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
  1. +8
    -4
      pkg/globalmanager/controllers/federatedlearning/federatedlearningjob.go

+ 8
- 4
pkg/globalmanager/controllers/federatedlearning/federatedlearningjob.go View File

@@ -543,8 +543,10 @@ func (c *Controller) createPod(job *sednav1.FederatedLearningJob) (active int32,
c.addWorkerMount(&aggWorkerParam, model.Spec.URL, "MODEL_URL", c.addWorkerMount(&aggWorkerParam, model.Spec.URL, "MODEL_URL",
modelSecret, true) modelSecret, true)


c.addWorkerMount(&aggWorkerParam, pretrainedModel.Spec.URL, "PRETRAINED_MODEL_URL",
pretrainedModelSecret, true)
if pretrainedModel != nil {
c.addWorkerMount(&aggWorkerParam, pretrainedModel.Spec.URL, "PRETRAINED_MODEL_URL",
pretrainedModelSecret, true)
}


// create aggpod based on configured parameters // create aggpod based on configured parameters
_, err = runtime.CreatePodWithTemplate(c.kubeClient, job, &aggWorker.Template, &aggWorkerParam) _, err = runtime.CreatePodWithTemplate(c.kubeClient, job, &aggWorker.Template, &aggWorkerParam)
@@ -575,8 +577,10 @@ func (c *Controller) createPod(job *sednav1.FederatedLearningJob) (active int32,


c.addWorkerMount(&workerParam, model.Spec.URL, "MODEL_URL", modelSecret, true) c.addWorkerMount(&workerParam, model.Spec.URL, "MODEL_URL", modelSecret, true)


c.addWorkerMount(&workerParam, pretrainedModel.Spec.URL, "PRETRAINED_MODEL_URL",
pretrainedModelSecret, true)
if pretrainedModel != nil {
c.addWorkerMount(&workerParam, pretrainedModel.Spec.URL, "PRETRAINED_MODEL_URL",
pretrainedModelSecret, true)
}


datasetName := trainingWorker.Dataset.Name datasetName := trainingWorker.Dataset.Name
dataset, datasetSecret, err := c.getDatasetAndItsSecret(ctx, job.Namespace, datasetName) dataset, datasetSecret, err := c.getDatasetAndItsSecret(ctx, job.Namespace, datasetName)


Loading…
Cancel
Save