Refactor to move go files to the first directory.

.github/actions/brain-test/action.yml

@@ -7,4 +7,4 @@ runs:
   args:
     - "/bin/bash"
     - "-c"
-    - "cd dlrover/go/brain/pkg && go test ./..."
+    - "cd go/brain/pkg && go test ./..."

.github/actions/go-master-test/action.yml

@@ -11,4 +11,4 @@ runs:
 wget -q https://go.dev/dl/go1.23.4.linux-amd64.tar.gz && \
 tar -C /usr/local -xzf go1.23.4.linux-amd64.tar.gz && \
 go install github.com/onsi/ginkgo/v2/[email protected] &&
-cd dlrover/go/master && ginkgo -v ./..."
+cd go/master && ginkgo -v ./..."

.github/actions/operator-test/action.yml

@@ -7,4 +7,4 @@ runs:
   args:
     - "/bin/bash"
     - "-c"
-    - "cd dlrover/go/operator && go test ./..."
+    - "cd go/operator && go test ./..."

.gitignore

@@ -38,7 +38,7 @@ share/python-wheels/
 *.egg
 MANIFEST
 *.ckpt
-dlrover/go/operator/bin/
+go/operator/bin/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
         entry: bash ./scripts/codestyle/clang_format.hook -i
         language: system
         files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx|proto)$
-        exclude: dlrover/go/brain/vendor
+        exclude: go/brain/vendor
   - repo: local
     hooks:
       - id: cpplint-cpp-source
@@ -38,20 +38,20 @@ repos:
         entry: bash ./scripts/codestyle/cpplint_precommit.hook
         language: system
         files: \.(c|cc|cxx|cpp|cu|h|hpp|hxx)$
-        exclude: dlrover/go/brain/vendor
+        exclude: go/brain/vendor
   - repo: https://github.com/dnephin/pre-commit-golang.git
     rev: v0.3.3
     hooks:
       - id: go-fmt
-        exclude: dlrover/go/brain/vendor
+        exclude: go/brain/vendor
       - id: go-lint
-        exclude: dlrover/go/brain/vendor
+        exclude: go/brain/vendor
       - id: no-go-testing
   - repo: https://github.com/gruntwork-io/pre-commit
     rev: v0.1.8
     hooks:
       - id: shellcheck
-        exclude: dlrover/go/brain/vendor
+        exclude: go/brain/vendor
         files: \.(sh)$
   - repo: local
     hooks:

dlrover/go/brain/go.mod → go/brain/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang/glog v1.0.0
 	github.com/golang/protobuf v1.5.2
-	github.com/intelligent-machine-learning/easydl/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9
+	github.com/intelligent-machine-learning/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/net v0.4.0
 	google.golang.org/grpc v1.51.0

dlrover/go/brain/go.sum → go/brain/go.sum

@@ -275,8 +275,8 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/intelligent-machine-learning/easydl/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9 h1:K3ClltLxvZfrfAZ4HsrluAK/7lag81L/vDrCCk5lUjk=
-github.com/intelligent-machine-learning/easydl/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9/go.mod h1:N3KDezonC4927+EZuYkeJzhjL4hTwMBPytUFsGPiud8=
+github.com/intelligent-machine-learning/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9 h1:K3ClltLxvZfrfAZ4HsrluAK/7lag81L/vDrCCk5lUjk=
+github.com/intelligent-machine-learning/dlrover/go/operator v0.0.0-20221220215741-7f4cde713fd9/go.mod h1:N3KDezonC4927+EZuYkeJzhjL4hTwMBPytUFsGPiud8=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=

dlrover/go/brain/pkg/platform/k8s/implementation/watchhandler/elasticjob_handler.go → go/brain/pkg/platform/k8s/implementation/watchhandler/elasticjob_handler.go

@@ -14,18 +14,19 @@
 package watchhandler
 
 import (
+	"time"
+
 	log "github.com/golang/glog"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/common"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/config"
 	datastoreapi "github.com/intelligent-machine-learning/easydl/brain/pkg/datastore/api"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/datastore/recorder/mysql"
 	k8scommon "github.com/intelligent-machine-learning/easydl/brain/pkg/platform/k8s/common"
 	handlerutils "github.com/intelligent-machine-learning/easydl/brain/pkg/platform/k8s/implementation/watchhandler/utils"
 	watchercommon "github.com/intelligent-machine-learning/easydl/brain/pkg/platform/k8s/watcher/common"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"time"
 )
 
 const (

dlrover/go/brain/pkg/platform/k8s/watcher/manager.go → go/brain/pkg/platform/k8s/watcher/manager.go

@@ -16,16 +16,17 @@ package watcher
 import (
 	"context"
 	"fmt"
+	"sync"
+
 	log "github.com/golang/glog"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/common"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/config"
 	"github.com/intelligent-machine-learning/easydl/brain/pkg/datastore"
 	handlerimpl "github.com/intelligent-machine-learning/easydl/brain/pkg/platform/k8s/implementation/watchhandler"
 	watchercommon "github.com/intelligent-machine-learning/easydl/brain/pkg/platform/k8s/watcher/common"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
 	"k8s.io/client-go/kubernetes"
 	k8smanager "sigs.k8s.io/controller-runtime/pkg/manager"
-	"sync"
 )
 
 const (

dlrover/go/operator/PROJECT → go/operator/PROJECT

@@ -2,7 +2,7 @@ domain: iml.github.io
 layout:
 - go.kubebuilder.io/v3
 projectName: operator
-repo: github.com/intelligent-machine-learning/easydl/dlrover/go/operator
+repo: github.com/intelligent-machine-learning/dlrover/go/operator
 resources:
 - api:
     crdVersion: v1
@@ -11,6 +11,6 @@ resources:
   domain: iml.github.io
   group: elastic
   kind: ElasticJob
-  path: github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1
+  path: github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1
   version: v1alpha1
 version: "3"

dlrover/go/operator/api/v1alpha1/elasticjob_types.go → go/operator/api/v1alpha1/elasticjob_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

dlrover/go/operator/api/v1alpha1/scaleplan_types.go → go/operator/api/v1alpha1/scaleplan_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

dlrover/go/operator/go.mod → go/operator/go.mod

@@ -1,4 +1,4 @@
-module github.com/intelligent-machine-learning/easydl/dlrover/go/operator
+module github.com/intelligent-machine-learning/dlrover/go/operator
 
 go 1.18
 

dlrover/go/operator/main.go → go/operator/main.go

@@ -31,9 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	"github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers"
-	_ "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers/training"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	"github.com/intelligent-machine-learning/dlrover/go/operator/pkg/controllers"
+	_ "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/controllers/training"
 	//+kubebuilder:scaffold:imports
 )
 

dlrover/go/operator/pkg/common/condition.go → go/operator/pkg/common/condition.go

@@ -14,8 +14,8 @@
 package common
 
 import (
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	apiv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	apiv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

dlrover/go/operator/pkg/common/resource.go → go/operator/pkg/common/resource.go

@@ -18,9 +18,10 @@ package common
 
 import (
 	"context"
+
 	"github.com/golang/glog"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	logger "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

dlrover/go/operator/pkg/common/resource_test.go → go/operator/pkg/common/resource_test.go

@@ -14,11 +14,12 @@
 package common
 
 import (
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
+	"testing"
+
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"testing"
 )
 
 func newTestJob() *elasticv1alpha1.ElasticJob {

dlrover/go/operator/pkg/controllers/elasticjob_controller.go → go/operator/pkg/controllers/elasticjob_controller.go

@@ -33,10 +33,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	common "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
-	master "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers/master"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	common "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
+	master "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/controllers/master"
 )
 
 const (

dlrover/go/operator/pkg/controllers/master/master.go → go/operator/pkg/controllers/master/master.go

@@ -16,16 +16,17 @@ package master
 import (
 	"context"
 	"fmt"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	common "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	"strconv"
+
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	common "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	logger "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime_client "sigs.k8s.io/controller-runtime/pkg/client"
-	"strconv"
 )
 
 const (

dlrover/go/operator/pkg/controllers/master/master_test.go → go/operator/pkg/controllers/master/master_test.go

@@ -14,13 +14,14 @@
 package master
 
 import (
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	"strings"
+	"testing"
+
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"strings"
-	"testing"
 )
 
 func TestCreateMasterPod(t *testing.T) {

dlrover/go/operator/pkg/controllers/scaleplan_controller.go → go/operator/pkg/controllers/scaleplan_controller.go

@@ -34,9 +34,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	common "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	common "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 )
 
 const (

dlrover/go/operator/pkg/controllers/suite_test.go → go/operator/pkg/controllers/suite_test.go

@@ -28,7 +28,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

dlrover/go/operator/pkg/controllers/training/task.go → go/operator/pkg/controllers/training/task.go

@@ -16,18 +16,19 @@ package training
 import (
 	"context"
 	"fmt"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	common "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
-	master "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/controllers/master"
-	logger "github.com/sirupsen/logrus"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	runtime_client "sigs.k8s.io/controller-runtime/pkg/client"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	common "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
+	master "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/controllers/master"
+	logger "github.com/sirupsen/logrus"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	runtime_client "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (

dlrover/go/operator/pkg/controllers/training/task_test.go → go/operator/pkg/controllers/training/task_test.go

@@ -15,15 +15,16 @@ package training
 
 import (
 	"encoding/json"
-	elasticv1alpha1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/api/v1alpha1"
-	common "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+	"testing"
+
+	elasticv1alpha1 "github.com/intelligent-machine-learning/dlrover/go/operator/api/v1alpha1"
+	common "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common"
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime_client "sigs.k8s.io/controller-runtime/pkg/client"
-	"testing"
 )
 
 func newTestJob() *elasticv1alpha1.ElasticJob {

dlrover/go/operator/pkg/controllers/training/tf_cluster.go → go/operator/pkg/controllers/training/tf_cluster.go

@@ -15,7 +15,8 @@ package training
 
 import (
 	"encoding/json"
-	commonv1 "github.com/intelligent-machine-learning/easydl/dlrover/go/operator/pkg/common/api/v1"
+
+	commonv1 "github.com/intelligent-machine-learning/dlrover/go/operator/pkg/common/api/v1"
 	logger "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 )