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.

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

Rename packages and move dlk dir #10

Merged
merged 2 commits into from
Apr 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ docker build -t ${PREFIX}vizier-core -f manager/Dockerfile .
docker build -t ${PREFIX}suggestion-random -f suggestion/random/Dockerfile .
docker build -t ${PREFIX}suggestion-grid -f suggestion/grid/Dockerfile .
docker build -t ${PREFIX}suggestion-hyperband -f suggestion/hyperband/Dockerfile .
docker build -t ${PREFIX}dlk-manager -f vendor/github.com/osrg/dlk/build/Dockerfile vendor/github.com/osrg/dlk
docker build -t ${PREFIX}dlk-manager -f dlk/Dockerfile .
docker build -t ${PREFIX}katib-frontend -f manager/modeldb/Dockerfile .
docker build -t ${PREFIX}katib-cli -f cli/Dockerfile .
mkdir -p bin
docker run --name katib-cli -itd ${PREFIX}katib-cli sh
docker cp katib-cli:/go/src/github.com/mlkube/katib/cli/katib-cli bin/katib-cli
docker cp katib-cli:/go/src/github.com/kubeflow/hp-tuning/cli/katib-cli bin/katib-cli
docker rm -f katib-cli
6 changes: 3 additions & 3 deletions cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN : && \
go get google.golang.org/grpc && \
go get gopkg.in/yaml.v2 && \
:
ADD api $GOPATH/src/github.com/mlkube/katib/api
ADD cli $GOPATH/src/github.com/mlkube/katib/cli
WORKDIR $GOPATH/src/github.com/mlkube/katib/cli
ADD api $GOPATH/src/github.com/kubeflow/hp-tuning/api
ADD cli $GOPATH/src/github.com/kubeflow/hp-tuning/cli
WORKDIR $GOPATH/src/github.com/kubeflow/hp-tuning/cli
RUN go build -o katib-cli
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"google.golang.org/grpc"

pb "github.com/mlkube/katib/api"
pb "github.com/kubeflow/hp-tuning/api"
)

var server = flag.String("s", "127.0.0.1:6789", "server address")
Expand Down
2 changes: 1 addition & 1 deletion db/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"time"

api "github.com/mlkube/katib/api"
api "github.com/kubeflow/hp-tuning/api"

_ "github.com/go-sql-driver/mysql"
)
Expand Down
2 changes: 1 addition & 1 deletion db/interface_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"
"testing"

api "github.com/mlkube/katib/api"
api "github.com/kubeflow/hp-tuning/api"

_ "github.com/go-sql-driver/mysql"
)
Expand Down
2 changes: 1 addition & 1 deletion db/test/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"fmt"
"github.com/mlkube/katib/db"
"github.com/kubeflow/hp-tuning/db"
"os"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ go get github.com/labstack/echo && \
go get github.com/sirupsen/logrus && \
:

ADD . /root/go-workspace/src/github.com/osrg/dlk
RUN mkdir /root/go-workspace/src/github.com/osrg/dlk/bin
WORKDIR /root/go-workspace/src/github.com/osrg/dlk
ADD dlk /root/go-workspace/src/github.com/kubeflow/hp-tuning/dlk
RUN mkdir -p /root/go-workspace/src/github.com/kubeflow/hp-tuning/dlk/bin
WORKDIR /root/go-workspace/src/github.com/kubeflow/hp-tuning/dlk
RUN go build -o bin/dlkmanager ./dlkmanager
RUN go build -o bin/dlkctl ./dlkctl
ENV PATH $PATH:/root/go-workspace/src/github.com/osrg/dlk/bin
ENV PATH $PATH:/root/go-workspace/src/github.com/kubeflow/hp-tuning/dlk/bin
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"net/http"
"os"

"github.com/osrg/dlk/dlkctl/utils"
"github.com/kubeflow/hp-tuning/dlk/dlkctl/utils"
"github.com/spf13/cobra"
)

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"os"
"sort"

"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"

"github.com/osrg/dlk/dlkctl/utils"
"github.com/kubeflow/hp-tuning/dlk/dlkctl/utils"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"net/http"
"os"

"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"

"github.com/osrg/dlk/dlkctl/utils"
"github.com/kubeflow/hp-tuning/dlk/dlkctl/utils"
"github.com/spf13/cobra"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"os"
"time"

"github.com/osrg/dlk/dlkctl/utils"
"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/dlk/dlkctl/utils"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"
"github.com/spf13/cobra"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strings"
"time"

"github.com/osrg/dlk/dlkctl/utils"
"github.com/osrg/dlk/dlkmanager/api"
"github.com/kubeflow/hp-tuning/dlk/dlkctl/utils"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/api"

"github.com/spf13/cobra"
)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"
"github.com/labstack/echo"
"github.com/osrg/dlk/dlkmanager/datastore"
lgr "github.com/sirupsen/logrus"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/labstack/echo" // Web server framework for REST API
"github.com/osrg/dlk/dlkmanager/configs"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/configs"
"github.com/labstack/echo" // Web server framework for REST API
lgr "github.com/sirupsen/logrus" // logging framework
"github.com/spf13/cobra"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"
"time"

"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"
"github.com/labstack/echo"
"github.com/osrg/dlk/dlkmanager/datastore"
lgr "github.com/sirupsen/logrus"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/osrg/dlk/dlkmanager/api"
"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/api"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"

lgr "github.com/sirupsen/logrus"
batchv1 "k8s.io/api/batch/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"path/filepath"
"time"

"github.com/osrg/dlk/dlkmanager/configs"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/configs"

"github.com/osrg/dlk/dlkmanager/api"
"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/api"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion earlystopping/earlyStoppingService.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package earlystopping

import (
// "fmt"
"github.com/mlkube/katib/api"
"github.com/kubeflow/hp-tuning/api"
"sort"
// "strconv"
)
Expand Down
12 changes: 6 additions & 6 deletions manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ RUN : && \
:
RUN apt update && apt install -y python python-pip
RUN pip install modeldb
ADD api $GOPATH/src/github.com/mlkube/katib/api
ADD db $GOPATH/src/github.com/mlkube/katib/db
ADD manager $GOPATH/src/github.com/mlkube/katib/manager
ADD vendor $GOPATH/src/github.com/mlkube/katib/vendor
ADD earlystopping $GOPATH/src/github.com/mlkube/katib/earlystopping
ADD api $GOPATH/src/github.com/kubeflow/hp-tuning/api
ADD db $GOPATH/src/github.com/kubeflow/hp-tuning/db
ADD manager $GOPATH/src/github.com/kubeflow/hp-tuning/manager
ADD dlk $GOPATH/src/github.com/kubeflow/hp-tuning/dlk
ADD earlystopping $GOPATH/src/github.com/kubeflow/hp-tuning/earlystopping
ADD conf /conf
ADD manager/wrap.sh /wrap.sh
RUN chmod 755 /wrap.sh
WORKDIR $GOPATH/src/github.com/mlkube/katib/manager
WORKDIR $GOPATH/src/github.com/kubeflow/hp-tuning/manager
RUN go build -o vizier-manager
14 changes: 7 additions & 7 deletions manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ import (
"os"
"time"

"github.com/mlkube/katib/manager/worker_interface"
dlkwif "github.com/mlkube/katib/manager/worker_interface/dlk"
k8swif "github.com/mlkube/katib/manager/worker_interface/kubernetes"
nvdwif "github.com/mlkube/katib/manager/worker_interface/nvdocker"
"github.com/kubeflow/hp-tuning/manager/worker_interface"
dlkwif "github.com/kubeflow/hp-tuning/manager/worker_interface/dlk"
k8swif "github.com/kubeflow/hp-tuning/manager/worker_interface/kubernetes"
nvdwif "github.com/kubeflow/hp-tuning/manager/worker_interface/nvdocker"

tbif "github.com/mlkube/katib/manager/visualise/tensorboard"
tbif "github.com/kubeflow/hp-tuning/manager/visualise/tensorboard"

"google.golang.org/grpc"
"google.golang.org/grpc/reflection"

vdb "github.com/mlkube/katib/db"
vdb "github.com/kubeflow/hp-tuning/db"
batchv1 "k8s.io/api/batch/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

pb "github.com/mlkube/katib/api"
pb "github.com/kubeflow/hp-tuning/api"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions manager/visualise/tensorboard/tensorboardIF.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package tensorboard
import (
"bytes"
"fmt"
"github.com/mlkube/katib/api"
vdb "github.com/mlkube/katib/db"
"github.com/kubeflow/hp-tuning/api"
vdb "github.com/kubeflow/hp-tuning/db"
"io/ioutil"
apiv1 "k8s.io/api/core/v1"
exbeatav1 "k8s.io/api/extensions/v1beta1"
Expand Down
10 changes: 5 additions & 5 deletions manager/worker_interface/dlk/dlk.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/mlkube/katib/api"
"github.com/mlkube/katib/db"
"github.com/mlkube/katib/manager/modeldb"
dlkapi "github.com/osrg/dlk/dlkmanager/api"
"github.com/osrg/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/api"
"github.com/kubeflow/hp-tuning/db"
dlkapi "github.com/kubeflow/hp-tuning/dlk/dlkmanager/api"
"github.com/kubeflow/hp-tuning/dlk/dlkmanager/datastore"
"github.com/kubeflow/hp-tuning/manager/modeldb"
"io/ioutil"
"log"
"net/http"
Expand Down
6 changes: 3 additions & 3 deletions manager/worker_interface/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"bytes"
"errors"
"fmt"
"github.com/mlkube/katib/api"
"github.com/mlkube/katib/db"
"github.com/mlkube/katib/earlystopping"
"github.com/kubeflow/hp-tuning/api"
"github.com/kubeflow/hp-tuning/db"
"github.com/kubeflow/hp-tuning/earlystopping"
"io/ioutil"
batchv1 "k8s.io/api/batch/v1"
apiv1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions manager/worker_interface/nvdocker/nvidia-docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
dclient "github.com/docker/docker/client"
"github.com/mlkube/katib/api"
"github.com/mlkube/katib/db"
"github.com/mlkube/katib/manager/modeldb"
"github.com/kubeflow/hp-tuning/api"
"github.com/kubeflow/hp-tuning/db"
"github.com/kubeflow/hp-tuning/manager/modeldb"
"io"
"io/ioutil"
"log"
Expand Down
2 changes: 1 addition & 1 deletion manager/worker_interface/worker_interface.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package worker_interface

import (
"github.com/mlkube/katib/api"
"github.com/kubeflow/hp-tuning/api"
)

type WorkerInterface interface {
Expand Down
10 changes: 5 additions & 5 deletions suggestion/grid/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ FROM golang
RUN : && \
go get google.golang.org/grpc && \
:
ADD api $GOPATH/src/github.com/mlkube/katib/api
ADD db $GOPATH/src/github.com/mlkube/katib/db
ADD manager $GOPATH/src/github.com/mlkube/katib/manager
ADD suggestion $GOPATH/src/github.com/mlkube/katib/suggestion
WORKDIR $GOPATH/src/github.com/mlkube/katib/suggestion/grid
ADD api $GOPATH/src/github.com/kubeflow/hp-tuning/api
ADD db $GOPATH/src/github.com/kubeflow/hp-tuning/db
ADD manager $GOPATH/src/github.com/kubeflow/hp-tuning/manager
ADD suggestion $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion
WORKDIR $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion/grid
RUN go build -o grid
2 changes: 1 addition & 1 deletion suggestion/grid/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"
"fmt"
"github.com/mlkube/katib/api"
"github.com/kubeflow/hp-tuning/api"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
"log"
Expand Down
10 changes: 5 additions & 5 deletions suggestion/hyperband/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ FROM golang
RUN : && \
go get google.golang.org/grpc && \
:
ADD api $GOPATH/src/github.com/mlkube/katib/api
ADD db $GOPATH/src/github.com/mlkube/katib/db
ADD manager $GOPATH/src/github.com/mlkube/katib/manager
ADD suggestion $GOPATH/src/github.com/mlkube/katib/suggestion
WORKDIR $GOPATH/src/github.com/mlkube/katib/suggestion/hyperband
ADD api $GOPATH/src/github.com/kubeflow/hp-tuning/api
ADD db $GOPATH/src/github.com/kubeflow/hp-tuning/db
ADD manager $GOPATH/src/github.com/kubeflow/hp-tuning/manager
ADD suggestion $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion
WORKDIR $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion/hyperband
RUN go build -o hyperband
4 changes: 2 additions & 2 deletions suggestion/hyperband/hyperband.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"crypto/rand"
"fmt"
"github.com/mlkube/katib/api"
"github.com/mlkube/katib/suggestion"
"github.com/kubeflow/hp-tuning/api"
"github.com/kubeflow/hp-tuning/suggestion"
"log"
"math"
"sort"
Expand Down
2 changes: 1 addition & 1 deletion suggestion/hyperband/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
pb "github.com/mlkube/katib/api"
pb "github.com/kubeflow/hp-tuning/api"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
"log"
Expand Down
10 changes: 5 additions & 5 deletions suggestion/random/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ FROM golang
RUN : && \
go get google.golang.org/grpc && \
:
ADD api $GOPATH/src/github.com/mlkube/katib/api
ADD db $GOPATH/src/github.com/mlkube/katib/db
ADD manager $GOPATH/src/github.com/mlkube/katib/manager
ADD suggestion $GOPATH/src/github.com/mlkube/katib/suggestion
WORKDIR $GOPATH/src/github.com/mlkube/katib/suggestion/random
ADD api $GOPATH/src/github.com/kubeflow/hp-tuning/api
ADD db $GOPATH/src/github.com/kubeflow/hp-tuning/db
ADD manager $GOPATH/src/github.com/kubeflow/hp-tuning/manager
ADD suggestion $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion
WORKDIR $GOPATH/src/github.com/kubeflow/hp-tuning/suggestion/random
RUN go build -o random
4 changes: 2 additions & 2 deletions suggestion/random/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
pb "github.com/mlkube/katib/api"
"github.com/mlkube/katib/suggestion"
pb "github.com/kubeflow/hp-tuning/api"
"github.com/kubeflow/hp-tuning/suggestion"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
"log"
Expand Down
Loading