Skip to content

Commit

Permalink
feat: remove trainer and model
Browse files Browse the repository at this point in the history
Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
gaius-qi committed Aug 27, 2024
1 parent b5b2f39 commit e0e9654
Show file tree
Hide file tree
Showing 61 changed files with 26 additions and 5,637 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
module: ["manager", "scheduler", "dfdaemon", "trainer"]
module: ["manager", "scheduler", "dfdaemon"]
include:
- module: manager
platforms: linux/amd64,linux/arm64
- module: scheduler
platforms: linux/amd64,linux/arm64
- module: dfdaemon
platforms: linux/amd64,linux/arm64
- module: trainer
platforms: linux/amd64,linux/arm64
timeout-minutes: 120
steps:
- name: Check out code
Expand Down
20 changes: 0 additions & 20 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,26 +109,6 @@ builds:
env:
- CGO_ENABLED=0

- main: ./cmd/trainer
id: trainer
binary: trainer
goos:
- linux
- darwin
goarch:
- amd64
- arm64
ldflags:
- -X d7y.io/dragonfly/v2/version.Major={{ .Major }}
- -X d7y.io/dragonfly/v2/version.Minor={{ .Minor }}
- -X d7y.io/dragonfly/v2/version.GitVersion={{ .Tag }}
- -X d7y.io/dragonfly/v2/version.GitCommit={{ .ShortCommit }}
- -X d7y.io/dragonfly/v2/version.BuildTime={{ .Date }}
- -X "d7y.io/dragonfly/v2/version.Gotags=none"
- -X "d7y.io/dragonfly/v2/version.Gogcflags=none"
env:
- CGO_ENABLED=0

archives:
- name_template: "dragonfly-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
format: tar.gz
Expand Down
42 changes: 4 additions & 38 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ build-dirs:
.PHONY: build-dirs

# Build dragonfly.
docker-build: docker-build-dfdaemon docker-build-scheduler docker-build-manager docker-build-trainer
docker-build: docker-build-dfdaemon docker-build-scheduler docker-build-manager
@echo "Build image done."
.PHONY: docker-build

# Push dragonfly images.
docker-push: docker-push-dfdaemon docker-push-scheduler docker-push-manager docker-build-trainer
docker-push: docker-push-dfdaemon docker-push-scheduler docker-push-manager
@echo "Push image done."
.PHONY: docker-push

Expand All @@ -61,12 +61,6 @@ docker-build-manager:
./hack/docker-build.sh manager
.PHONY: docker-build-manager

# Build trainer image.
docker-build-trainer:
@echo "Begin to use docker build trainer image."
./hack/docker-build.sh trainer
.PHONY: docker-build-trainer

# Build testing tools image.
docker-build-testing-tools: build-dirs
@echo "Begin to testing tools image."
Expand All @@ -91,14 +85,8 @@ docker-push-manager: docker-build-manager
./hack/docker-push.sh manager
.PHONY: docker-push-manager

# Push trainer image.
docker-push-trainer: docker-build-trainer
@echo "Begin to push trainer docker image."
./hack/docker-push.sh trainer
.PHONY: docker-push-trainer

# Build dragonfly.
build: build-manager build-scheduler build-trainer build-dfget build-dfcache build-dfstore
build: build-manager build-scheduler build-dfget build-dfcache build-dfstore
.PHONY: build

# Build dfget.
Expand Down Expand Up @@ -161,12 +149,6 @@ build-manager-console: build-dirs
./hack/build.sh manager-console
.PHONY: build-manager-console

# Build trainer.
build-trainer: build-dirs
@echo "Begin to build trainer."
./hack/build.sh trainer
.PHONY: build-trainer

# Install dfget.
install-dfget:
@echo "Begin to install dfget."
Expand All @@ -185,12 +167,6 @@ install-manager:
./hack/install.sh install manager
.PHONY: install-manager

# Install trainer.
install-trainer:
@echo "Begin to install trainer."
./hack/install.sh install trainer
.PHONY: install-trainer

# Build rpm dfget.
build-rpm-dfget: build-linux-dfget
@echo "Begin to build rpm dfget."
Expand Down Expand Up @@ -373,7 +349,7 @@ clean-e2e-test:
.PHONY: clean-e2e-test

# Kind load dragonfly.
kind-load: kind-load-scheduler kind-load-dfdaemon kind-load-manager kind-load-trainer kind-load-testing-tools
kind-load: kind-load-scheduler kind-load-dfdaemon kind-load-manager kind-load-testing-tools
@echo "Kind load image done."
.PHONY: kind-load

Expand All @@ -392,11 +368,6 @@ kind-load-manager:
@./hack/kind-load.sh manager
.PHONY: kind-load-manager

# Run kind load docker trainer.
kind-load-trainer:
@./hack/kind-load.sh trainer
.PHONY: kind-load-trainer

# Run kind load docker testing tools.
kind-load-testing-tools:
@./hack/kind-load.sh no-content-length
Expand Down Expand Up @@ -441,11 +412,9 @@ help:
@echo "make docker-build-dfdaemon build dfdaemon image"
@echo "make docker-build-scheduler build scheduler image"
@echo "make docker-build-manager build manager image"
@echo "make docker-build-trainer build trainer image"
@echo "make docker-push-dfdaemon push dfdaemon image"
@echo "make docker-push-scheduler push scheduler image"
@echo "make docker-push-manager push manager image"
@echo "make docker-push-trainer push trainer image"
@echo "make build build dragonfly"
@echo "make build-dfget build dfget"
@echo "make build-linux-dfget build linux dfget"
Expand All @@ -457,13 +426,11 @@ help:
@echo "make build-manager build manager"
@echo "make build-manager-server build manager server"
@echo "make build-manager-console build manager console"
@echo "make build-trainer build trainer"
@echo "make build-e2e-sha256sum build sha256sum test tool"
@echo "make build-e2e-download-grpc-test build download grpc test tool"
@echo "make install-dfget install dfget"
@echo "make install-scheduler install scheduler"
@echo "make install-manager install manager"
@echo "make install-trainer install trainer"
@echo "make build-rpm-dfget build rpm dfget"
@echo "make build-rpm-dfcache build rpm dfcache"
@echo "make build-rpm-dfstore build rpm dfstore"
Expand All @@ -485,7 +452,6 @@ help:
@echo "make kind-load-scheduler kind load scheduler docker image"
@echo "make kind-load-dfdaemon kind load dfdaemon docker image"
@echo "make kind-load-manager kind load manager docker image"
@echo "make kind-load-trainer kind load trainer docker image"
@echo "make kind-load-testing-tools kind load testing tools docker image"
@echo "make lint run code lint"
@echo "make markdownlint run markdown lint"
Expand Down
40 changes: 0 additions & 40 deletions build/images/trainer/Dockerfile

This file was deleted.

125 changes: 0 additions & 125 deletions cmd/trainer/cmd/root.go

This file was deleted.

23 changes: 0 additions & 23 deletions cmd/trainer/main.go

This file was deleted.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2
go 1.21

require (
d7y.io/api/v2 v2.0.148
d7y.io/api/v2 v2.0.154
github.com/MysteriousPotato/go-lockable v1.0.0
github.com/RichardKnop/machinery v1.10.8
github.com/Showmax/go-fqdn v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
d7y.io/api/v2 v2.0.148 h1:11waj+EuaHdx95Fkr3hXJJckNGw9Hu5U0ohtCbpIirw=
d7y.io/api/v2 v2.0.148/go.mod h1:hyEaaIglThVWRHODk2yHN/tpa1L+/nPgdQFwPsL6fNc=
d7y.io/api/v2 v2.0.154 h1:IBCV+c1PYFIWyE/Otj5AsFGi5+s7TWcujOpzDTt1P5c=
d7y.io/api/v2 v2.0.154/go.mod h1:hyEaaIglThVWRHODk2yHN/tpa1L+/nPgdQFwPsL6fNc=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
Expand Down
Loading

0 comments on commit e0e9654

Please sign in to comment.