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

worker: Rename worker_interface to worker #70

Merged
merged 1 commit into from
Apr 26, 2018
Merged

worker: Rename worker_interface to worker #70

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
10 changes: 5 additions & 5 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
kdb "github.com/kubeflow/katib/pkg/db"
"github.com/kubeflow/katib/pkg/manager/modelstore"
tbif "github.com/kubeflow/katib/pkg/manager/visualise/tensorboard"
"github.com/kubeflow/katib/pkg/manager/worker_interface"
dlkwif "github.com/kubeflow/katib/pkg/manager/worker_interface/dlk"
k8swif "github.com/kubeflow/katib/pkg/manager/worker_interface/kubernetes"
nvdwif "github.com/kubeflow/katib/pkg/manager/worker_interface/nvdocker"
"github.com/kubeflow/katib/pkg/manager/worker"
dlkwif "github.com/kubeflow/katib/pkg/manager/worker/dlk"
k8swif "github.com/kubeflow/katib/pkg/manager/worker/kubernetes"
nvdwif "github.com/kubeflow/katib/pkg/manager/worker/nvdocker"

"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
Expand All @@ -42,7 +42,7 @@ type studyCh struct {
addMetricsCh chan string
}
type server struct {
wIF worker_interface.WorkerInterface
wIF worker.Interface
msIf modelstore.ModelStore
StudyChList map[string]studyCh
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/manager/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestCreateStudy(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
mockDB := mockdb.NewMockVizierDBInterface(ctrl)
mockWif := mockworker.NewMockWorkerInterface(ctrl)
mockWif := mockworker.NewMockInterface(ctrl)
mockModelStore := mockmodelstore.NewMockModelStore(ctrl)
sid := "teststudy"
sc := &api.StudyConfig{
Expand Down Expand Up @@ -62,7 +62,7 @@ func TestGetStudies(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
mockDB := mockdb.NewMockVizierDBInterface(ctrl)
mockWif := mockworker.NewMockWorkerInterface(ctrl)
mockWif := mockworker.NewMockInterface(ctrl)
mockModelStore := mockmodelstore.NewMockModelStore(ctrl)
sid := []string{"teststudy1", "teststudy2"}
s := &server{
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/worker_interface/dlk/dlk.go → pkg/manager/worker/dlk/dlk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/kubeflow/katib/pkg/db"
dlkapi "github.com/kubeflow/katib/dlk/dlkmanager/api"
"github.com/kubeflow/katib/dlk/dlkmanager/datastore"
wIF "github.com/kubeflow/katib/pkg/manager/worker_interface"
wIF "github.com/kubeflow/katib/pkg/manager/worker"
"io/ioutil"
"log"
"net/http"
Expand Down
7 changes: 4 additions & 3 deletions ...ager/worker_interface/worker_interface.go → pkg/manager/worker/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package worker_interface
package worker

import (
"errors"
"fmt"
"time"

"github.com/kubeflow/katib/pkg/api"
"github.com/kubeflow/katib/pkg/db"
"time"
)

type WorkerInterface interface {
type Interface interface {
IsTrialComplete(studyId string, tID string) (bool, error)
GetTrialObjValue(studyId string, tID string, objname string) (string, error)
GetTrialEvLogs(studyId string, tID string, metrics []string, sinceTime string) ([]*api.EvaluationLog, error)
Expand Down
2 changes: 1 addition & 1 deletion ...worker_interface/kubernetes/kubernetes.go → pkg/manager/worker/kubernetes/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/kubeflow/katib/pkg/api"
"github.com/kubeflow/katib/pkg/db"
"github.com/kubeflow/katib/pkg/earlystopping"
wIF "github.com/kubeflow/katib/pkg/manager/worker_interface"
wIF "github.com/kubeflow/katib/pkg/manager/worker"
)

type KubernetesWorkerInterface struct {
Expand Down
2 changes: 1 addition & 1 deletion ...orker_interface/nvdocker/nvidia-docker.go → pkg/manager/worker/nvdocker/nvidia-docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
dclient "github.com/docker/docker/client"
"github.com/kubeflow/katib/pkg/api"
"github.com/kubeflow/katib/pkg/db"
wIF "github.com/kubeflow/katib/pkg/manager/worker_interface"
wIF "github.com/kubeflow/katib/pkg/manager/worker"
"io"
"io/ioutil"
"log"
Expand Down
78 changes: 39 additions & 39 deletions pkg/mock/worker/worker.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions scripts/mockgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ echo "Generating SuggestionClient..."
mockgen -package mock -destination pkg/mock/api/suggestion.go github.com/kubeflow/katib/pkg/api SuggestionClient
echo "Generating VizierDBInterface..."
mockgen -package mock -destination pkg/mock/db/db.go github.com/kubeflow/katib/pkg/db VizierDBInterface
echo "Generating WorkerInterface..."
mockgen -package mock -destination pkg/mock/worker/worker.go github.com/kubeflow/katib/pkg/manager/worker_interface WorkerInterface
echo "Generating worker interface..."
mockgen -package mock -destination pkg/mock/worker/worker.go github.com/kubeflow/katib/pkg/manager/worker Interface
echo "Generating ModelStore..."
mockgen -package mock -destination pkg/mock/modelstore/modelstore.go github.com/kubeflow/katib/pkg/manager/modelstore ModelStore
cd - > /dev/null