From 5db73c120a503d804eef219f7de867c511bd0221 Mon Sep 17 00:00:00 2001 From: Vinay Kakade Date: Fri, 22 Jun 2018 14:55:56 +0530 Subject: [PATCH 1/3] Fix broken client example --- examples/client-example.go | 18 +++++++++--------- examples/study-config.yml | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/client-example.go b/examples/client-example.go index e4bfde0b89c..d0cda04460a 100644 --- a/examples/client-example.go +++ b/examples/client-example.go @@ -52,7 +52,7 @@ func main() { } //Save or Update model on ModelDB SaveOrUpdateModel(c, getMetricsReply) - if isCompletedAllWorker(c, getMetricsReply.MetricsLogSets) { + if isCompletedAllWorker(c, studyId) { break } } @@ -221,14 +221,14 @@ func SaveOrUpdateModel(c api.ManagerClient, getMetricsReply *api.GetMetricsReply } func isCompletedAllWorker(c api.ManagerClient, ms []*api.MetricsLogSet) bool { - // ctx := context.Background() - // getWorkerRequest := &api.GetWorkersRequest{StudyId: studyId} - // getWorkerReply, err := c.GetWorkers(ctx, getWorkerRequest) - // if err != nil { - // log.Fatalf("GetWorker Error %v", err) - // } - for _, mls := range ms { - if mls.WorkerStatus != api.State_COMPLETED { + ctx := context.Background() + getWorkerRequest := &api.GetWorkersRequest{StudyId: studyId} + getWorkerReply, err := c.GetWorkers(ctx, getWorkerRequest) + if err != nil { + log.Fatalf("GetWorker Error %v", err) + } + for _, w := range getWorkerReply.Workers { + if w.Status != api.State_COMPLETED { return false } } diff --git a/examples/study-config.yml b/examples/study-config.yml index 707c93d425f..ade69c8a6cc 100644 --- a/examples/study-config.yml +++ b/examples/study-config.yml @@ -22,6 +22,4 @@ parameterconfigs: - adam - ftrl objectivevaluename: Validation-accuracy -metrics: -- accuracy From ff9fff5a15534381a83cd0b024b267f75be86f38 Mon Sep 17 00:00:00 2001 From: Vinay Kakade Date: Fri, 22 Jun 2018 15:06:33 +0530 Subject: [PATCH 2/3] Correct function signature --- examples/client-example.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/client-example.go b/examples/client-example.go index d0cda04460a..2ffb75404b0 100644 --- a/examples/client-example.go +++ b/examples/client-example.go @@ -220,7 +220,7 @@ func SaveOrUpdateModel(c api.ManagerClient, getMetricsReply *api.GetMetricsReply } } -func isCompletedAllWorker(c api.ManagerClient, ms []*api.MetricsLogSet) bool { +func isCompletedAllWorker(c api.ManagerClient, studyId string) bool { ctx := context.Background() getWorkerRequest := &api.GetWorkersRequest{StudyId: studyId} getWorkerReply, err := c.GetWorkers(ctx, getWorkerRequest) From 5343063f1ecab3eed932e23ea3ebac3535133f71 Mon Sep 17 00:00:00 2001 From: Vinay Kakade Date: Fri, 22 Jun 2018 15:13:39 +0530 Subject: [PATCH 3/3] Remove extra formatting --- examples/client-example.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/client-example.go b/examples/client-example.go index 2ffb75404b0..95a5936d30c 100644 --- a/examples/client-example.go +++ b/examples/client-example.go @@ -222,13 +222,13 @@ func SaveOrUpdateModel(c api.ManagerClient, getMetricsReply *api.GetMetricsReply func isCompletedAllWorker(c api.ManagerClient, studyId string) bool { ctx := context.Background() - getWorkerRequest := &api.GetWorkersRequest{StudyId: studyId} - getWorkerReply, err := c.GetWorkers(ctx, getWorkerRequest) - if err != nil { - log.Fatalf("GetWorker Error %v", err) - } - for _, w := range getWorkerReply.Workers { - if w.Status != api.State_COMPLETED { + getWorkerRequest := &api.GetWorkersRequest{StudyId: studyId} + getWorkerReply, err := c.GetWorkers(ctx, getWorkerRequest) + if err != nil { + log.Fatalf("GetWorker Error %v", err) + } + for _, w := range getWorkerReply.Workers { + if w.Status != api.State_COMPLETED { return false } }