Skip to content

Reorganize Go codebase #3628

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

Merged
un-def merged 1 commit into from
Mar 3, 2026
Merged

Reorganize Go codebase #3628

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 runner/cmd/runner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v3"

"github.com/dstackai/dstack/runner/consts"
"github.com/dstackai/dstack/runner/internal/executor"
linuxuser "github.com/dstackai/dstack/runner/internal/linux/user"
"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/consts"
"github.com/dstackai/dstack/runner/internal/common/log"
"github.com/dstackai/dstack/runner/internal/runner/api"
"github.com/dstackai/dstack/runner/internal/ssh"
"github.com/dstackai/dstack/runner/internal/runner/executor"
linuxuser "github.com/dstackai/dstack/runner/internal/runner/linux/user"
"github.com/dstackai/dstack/runner/internal/runner/ssh"
)

// Version is a build-time variable. The value is overridden by ldflags.
Expand Down
8 changes: 4 additions & 4 deletions runner/cmd/shim/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v3"

"github.com/dstackai/dstack/runner/consts"
"github.com/dstackai/dstack/runner/internal/common"
"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/consts"
"github.com/dstackai/dstack/runner/internal/common/gpu"
"github.com/dstackai/dstack/runner/internal/common/log"
"github.com/dstackai/dstack/runner/internal/shim"
"github.com/dstackai/dstack/runner/internal/shim/api"
"github.com/dstackai/dstack/runner/internal/shim/components"
Expand Down Expand Up @@ -236,7 +236,7 @@ func start(ctx context.Context, args shim.CLIArgs, serviceMode bool) (err error)
var dcgmExporter *dcgm.DCGMExporter
var dcgmWrapper dcgm.DCGMWrapperInterface

if common.GetGpuVendor() == common.GpuVendorNvidia {
if gpu.GetGpuVendor() == gpu.GpuVendorNvidia {
dcgmExporterPath, err := dcgm.GetDCGMExporterExecPath(ctx)
if err == nil {
interval := time.Duration(args.DCGMExporter.Interval * int(time.Millisecond))
Expand Down
2 changes: 1 addition & 1 deletion runner/internal/api/common.go → runner/internal/common/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/golang/gddo/httputil/header"

"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/log"
)

type Error struct {
Expand Down
0 runner/consts/consts.go → runner/internal/common/consts/consts.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion runner/internal/common/gpu.go → runner/internal/common/gpu/gpu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package gpu

import (
"errors"
Expand Down
67 changes: 0 additions & 67 deletions runner/internal/common/interpolator.go
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions runner/internal/common/interpolator_test.go
View file
Open in desktop

This file was deleted.

0 runner/internal/log/log.go → runner/internal/common/log/log.go
View file
Open in desktop
File renamed without changes.
11 changes: 0 additions & 11 deletions runner/internal/common/string.go
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions runner/internal/types/types.go → runner/internal/common/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,3 @@ const (
TerminationReasonTerminatedByServer TerminationReason = "terminated_by_server"
TerminationReasonMaxDurationExceeded TerminationReason = "max_duration_exceeded"
)

type JobState string

const (
JobStateDone JobState = "done"
JobStateFailed JobState = "failed"
JobStateRunning JobState = "running"
JobStateTerminated JobState = "terminated"
JobStateTerminating JobState = "terminating"
)
4 changes: 2 additions & 2 deletions runner/internal/common/utils.go → runner/internal/common/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package utils

import (
"context"
Expand All @@ -7,7 +7,7 @@ import (
"path"
"slices"

"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/log"
)

func PathExists(pth string) (bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion runner/internal/common/utils_test.go → runner/internal/common/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package utils

import (
"context"
Expand Down
8 changes: 4 additions & 4 deletions runner/internal/runner/api/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"net/http"
"strconv"

"github.com/dstackai/dstack/runner/internal/api"
"github.com/dstackai/dstack/runner/internal/executor"
"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/schemas"
"github.com/dstackai/dstack/runner/internal/common/api"
"github.com/dstackai/dstack/runner/internal/common/log"
"github.com/dstackai/dstack/runner/internal/runner/executor"
"github.com/dstackai/dstack/runner/internal/runner/schemas"
)

// TODO: set some reasonable value; (optional) make configurable
Expand Down
8 changes: 4 additions & 4 deletions runner/internal/runner/api/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
_ "net/http/pprof"
"time"

"github.com/dstackai/dstack/runner/internal/api"
"github.com/dstackai/dstack/runner/internal/executor"
"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/metrics"
"github.com/dstackai/dstack/runner/internal/common/api"
"github.com/dstackai/dstack/runner/internal/common/log"
"github.com/dstackai/dstack/runner/internal/runner/executor"
"github.com/dstackai/dstack/runner/internal/runner/metrics"
)

type Server struct {
Expand Down
2 changes: 1 addition & 1 deletion runner/internal/runner/api/ws.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/gorilla/websocket"

"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/log"
)

type logsWsRequestParams struct {
Expand Down
2 changes: 1 addition & 1 deletion runner/internal/connections/connections.go → ...nternal/runner/connections/connections.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/prometheus/procfs"

"github.com/dstackai/dstack/runner/internal/log"
"github.com/dstackai/dstack/runner/internal/common/log"
)

const connStateEstablished = 1
Expand Down
0 .../internal/connections/connections_test.go → ...al/runner/connections/connections_test.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions runner/internal/executor/base.go → runner/internal/runner/executor/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"io"

"github.com/dstackai/dstack/runner/internal/schemas"
"github.com/dstackai/dstack/runner/internal/types"
"github.com/dstackai/dstack/runner/internal/common/types"
"github.com/dstackai/dstack/runner/internal/runner/schemas"
)

type Executor interface {
Expand All @@ -15,10 +15,10 @@ type Executor interface {
GetJobInfo(ctx context.Context) (username string, workingDir string, err error)
Run(ctx context.Context) error
SetJob(job schemas.SubmitBody)
SetJobState(ctx context.Context, state types.JobState)
SetJobState(ctx context.Context, state schemas.JobState)
SetJobStateWithTerminationReason(
ctx context.Context,
state types.JobState,
state schemas.JobState,
terminationReason types.TerminationReason,
terminationMessage string,
)
Expand Down
0 runner/internal/executor/env.go → runner/internal/runner/executor/env.go
View file
Open in desktop
File renamed without changes.
0 runner/internal/executor/env_test.go → runner/internal/runner/executor/env_test.go
View file
Open in desktop
File renamed without changes.
Loading