#3277

gcu:create notebook

models/cloudbrain.go

@@ -35,6 +35,7 @@ const (
 const (
 	NPUResource = "NPU"
 	GPUResource = "CPU/GPU"
+	GCUResource = "GCU"
 	AllResource = "all"
 
 	//notebook storage category
@@ -134,6 +135,7 @@ const (
 	//ComputeResource
 	GPU = "GPU"
 	NPU = "NPU"
+	GCU = "GCU"
 )
 
 type Cloudbrain struct {
@@ -205,7 +207,7 @@ type Cloudbrain struct {
 	BenchmarkTypeRankLink string      `xorm:"-"`
 	StartTime             timeutil.TimeStamp
 	EndTime               timeutil.TimeStamp
-	Cleared               bool   `xorm:"DEFAULT false"`
+	Cleared               bool           `xorm:"DEFAULT false"`
 	Spec                  *Specification `xorm:"-"`
 }
 
@@ -2589,8 +2591,14 @@ func GetDatasetInfo(uuidStr string, grampusType ...string) (map[string]DatasetIn
 		if len(grampusType) > 0 {
 			if grampusType[0] == GPU {
 				dataLocalPath = setting.Attachment.Minio.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID
-			} else {
+			} else if grampusType[0] == NPU {
 				dataLocalPath = setting.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID + "/"
+			} else if grampusType[0] == GCU {
+				if attach.Type == TypeCloudBrainOne {
+					dataLocalPath = setting.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID + "/"
+				} else {
+					dataLocalPath = setting.Attachment.Minio.BasePath + path.Join(attach.UUID[0:1], attach.UUID[1:2]) + "/" + attach.UUID
+				}
 			}
 
 		} else {

modules/grampus/grampus.go

@@ -18,6 +18,7 @@ const (
 
 	ProcessorTypeNPU = "npu.huawei.com/NPU"
 	ProcessorTypeGPU = "nvidia.com/gpu"
+	ProcessorTypeGCU = "enflame-tech.com/gcu"
 
 	GpuWorkDir              = "/tmp/"
 	NpuWorkDir              = "/cache/"

routers/repo/grampus.go

@@ -53,6 +53,8 @@ const (
 	//NPU
 	tplGrampusNotebookNPUNew base.TplName = "repo/grampus/notebook/npu/new"
 	tplGrampusTrainJobNPUNew base.TplName = "repo/grampus/trainjob/npu/new"
+	//GCU
+	tplGrampusNotebookGCUNew base.TplName = "repo/grampus/notebook/gcu/new"
 )
 
 func GrampusNotebookNew(ctx *context.Context) {
@@ -61,6 +63,8 @@ func GrampusNotebookNew(ctx *context.Context) {
 	processType := grampus.ProcessorTypeGPU
 	if notebookType == 1 {
 		processType = grampus.ProcessorTypeNPU
+	} else if notebookType == 2 {
+		processType = grampus.ProcessorTypeGCU
 	}
 	err := grampusNotebookNewDataPrepare(ctx, processType)
 	if err != nil {
@@ -69,8 +73,10 @@ func GrampusNotebookNew(ctx *context.Context) {
 	}
 	if processType == grampus.ProcessorTypeGPU {
 		ctx.HTML(http.StatusOK, tplGrampusNotebookGPUNew)
-	} else {
+	} else if processType == grampus.ProcessorTypeNPU {
 		ctx.HTML(http.StatusOK, tplGrampusNotebookNPUNew)
+	} else if processType == grampus.ProcessorTypeGCU {
+		ctx.HTML(http.StatusOK, tplGrampusNotebookGCUNew)
 	}
 
 }
@@ -118,6 +124,12 @@ func GrampusNotebookCreate(ctx *context.Context, form auth.CreateGrampusNotebook
 		computeSource = models.NPUResource
 		computeSourceSimple = models.NPU
 		codeStoragePath = grampus.JobPath + jobName + modelarts.CodePath
+	} else if form.Type == 2 {
+		tpl = tplGrampusNotebookGCUNew
+		processType = grampus.ProcessorTypeGCU
+		computeSource = models.GCUResource
+		computeSourceSimple = models.GCU
+		codeStoragePath = grampus.JobPath + jobName + modelarts.CodePath
 	}
 
 	lock := redis_lock.NewDistributeLock(redis_key.CloudbrainBindingJobNameKey(fmt.Sprint(repo.ID), string(models.JobTypeDebug), displayJobName))
@@ -295,7 +307,7 @@ func grampusNotebookNewDataPrepare(ctx *context.Context, processType string) err
 	ctx.Data["display_job_name"] = displayJobName
 
 	//get valid images
-	if processType == grampus.ProcessorTypeNPU {
+	if processType == grampus.ProcessorTypeNPU || processType == grampus.ProcessorTypeGCU {
 		images, err := grampus.GetImages(processType, string(models.JobTypeDebug))
 		if err != nil {
 			log.Error("GetImages failed:", err.Error())
@@ -311,6 +323,10 @@ func grampusNotebookNewDataPrepare(ctx *context.Context, processType string) err
 		computeResourceSimple = models.NPU
 		datasetType = models.TypeCloudBrainTwo
 		computeResource = models.NPUResource
+	} else if processType == grampus.ProcessorTypeGCU {
+		computeResourceSimple = models.GCU
+		datasetType = models.TypeCloudBrainAll
+		computeResource = models.GCUResource
 	}
 
 	prepareGrampusSpecs(ctx, computeResourceSimple, models.JobTypeDebug)