#3277

gcu:code unzip

modules/grampus/grampus.go

@@ -27,10 +27,11 @@ const (
 
 	CodeArchiveName = "master.zip"
 
-	BucketRemote       = "grampus"
-	RemoteModelPath    = "/output/" + models.ModelSuffix
-	autoStopDurationMs = 4 * 60 * 60 * 1000
-	CommandGpuDebug    = "mkdir -p /dataset;%s! [ -x \"$(command -v jupyter)\" ] && pip install jupyterlab==3 -i https://pypi.tuna.tsinghua.edu.cn/simple;jupyter lab --ServerApp.shutdown_no_activity_timeout=%s --TerminalManager.cull_inactive_timeout=%s --TerminalManager.cull_interval=%s --MappingKernelManager.cull_idle_timeout=%s --MappingKernelManager.cull_interval=%s --MappingKernelManager.cull_connected=True --MappingKernelManager.cull_busy=True --no-browser --ip=0.0.0.0 --allow-root --notebook-dir='/code' --port=$OCTOPUS_NOTEBOOK_PORT --LabApp.token='' --LabApp.allow_origin='*' --LabApp.base_url=$OCTOPUS_NOTEBOOK_BASE_URL;"
+	BucketRemote        = "grampus"
+	RemoteModelPath     = "/output/" + models.ModelSuffix
+	autoStopDurationMs  = 4 * 60 * 60 * 1000
+	CommandGpuDebug     = "mkdir -p /dataset;%s! [ -x \"$(command -v jupyter)\" ] && pip install jupyterlab==3 -i https://pypi.tuna.tsinghua.edu.cn/simple;jupyter lab --ServerApp.shutdown_no_activity_timeout=%s --TerminalManager.cull_inactive_timeout=%s --TerminalManager.cull_interval=%s --MappingKernelManager.cull_idle_timeout=%s --MappingKernelManager.cull_interval=%s --MappingKernelManager.cull_connected=True --MappingKernelManager.cull_busy=True --no-browser --ip=0.0.0.0 --allow-root --notebook-dir='/code' --port=$OCTOPUS_NOTEBOOK_PORT --LabApp.token='' --LabApp.allow_origin='*' --LabApp.base_url=$OCTOPUS_NOTEBOOK_BASE_URL;"
+	CommandGrampusDebug = CommandGpuDebug + "unzip %s;rm %s;"
 )
 
 var (
@@ -189,18 +190,19 @@ func GenerateNotebookJob(ctx *context.Context, req *GenerateNotebookJobReq) (job
 				ContainerPath: cloudbrain.PretrainModelMountPath,
 			})
 		}
+		codeArchiveName := cloudbrain.DefaultBranchName + ".zip"
 		codeGrampus = models.GrampusDataset{
 			Name:          req.CodeName,
 			Bucket:        setting.Attachment.Minio.Bucket,
 			EndPoint:      setting.Attachment.Minio.Endpoint,
-			ObjectKey:     req.CodeStoragePath + cloudbrain.DefaultBranchName + ".zip",
+			ObjectKey:     req.CodeStoragePath + codeArchiveName,
 			ReadOnly:      false,
 			ContainerPath: cloudbrain.CodeMountPath,
 		}
 		if ProcessorTypeGCU == req.ProcessType {
 			imageUrl = ""
 		}
-		req.Command = fmt.Sprintf(CommandGpuDebug, cpCommand, setting.CullIdleTimeout, setting.CullIdleTimeout, setting.CullInterval, setting.CullIdleTimeout, setting.CullInterval)
+		req.Command = fmt.Sprintf(CommandGrampusDebug, cpCommand, setting.CullIdleTimeout, setting.CullIdleTimeout, setting.CullInterval, setting.CullIdleTimeout, setting.CullInterval, codeArchiveName, codeArchiveName)
 		log.Info("debug command:" + req.Command)
 
 	}