for test

modules/grampus/grampus.go

@@ -19,14 +19,9 @@ const (
 	ProcessorTypeNPU = "npu.huawei.com/NPU"
 	ProcessorTypeGPU = "nvidia.com/gpu"
 
-	GpuWorkDir = "/tmp/"
+	GpuWorkDir = "/"
 	NpuWorkDir = "/cache/"
 
-	CommandPrepareScript = ";mkdir -p output;mkdir -p code;mkdir -p dataset;echo \"start loading script\";wget -q https://git.openi.org.cn/OpenIOSSG/script_for_grampus/archive/master.zip;" +
-		"echo \"finish loading script\";unzip -q master.zip;cd script_for_grampus;chmod 777 downloader_for_obs uploader_for_obs downloader_for_minio uploader_for_minio;"
-	//CommandPrepareScript = "pwd;cd /cache;mkdir -p output;mkdir -p code;mkdir -p dataset;echo \"start loading script\";wget -q https://git.openi.org.cn/OpenIOSSG/script_for_grampus/archive/master.zip;" +
-	//	"echo \"finish loading script\";unzip -q master.zip;cd script_for_grampus;chmod 777 downloader_for_obs uploader_for_obs downloader_for_minio uploader_for_minio;"
-
 	CodeArchiveName = "master.zip"
 )
 

modules/setting/setting.go

@@ -555,6 +555,7 @@ var (
 		Password      string
 		SpecialPools  string
 		C2NetSequence string
+		ScriptName string
 	}{}
 
 	C2NetInfos *C2NetSqInfos
@@ -1490,6 +1491,7 @@ func GetGrampusConfig() {
 	Grampus.UserName = sec.Key("USERNAME").MustString("")
 	Grampus.Password = sec.Key("PASSWORD").MustString("")
 	Grampus.SpecialPools = sec.Key("SPECIAL_POOL").MustString("")
+	Grampus.ScriptName = sec.Key("SCRIPT_NAME").MustString("")
 	Grampus.C2NetSequence = sec.Key("C2NET_SEQUENCE").MustString("{\"sequence\":[{\"id\":1,\"name\":\"cloudbrain_one\",\"content\":\"鹏城云脑一号\"},{\"id\":2,\"name\":\"cloudbrain_two\",\"content\":\"鹏城云脑二号\"},{\"id\":3,\"name\":\"beida\",\"content\":\"北大人工智能集群系统\"},{\"id\":4,\"name\":\"hefei\",\"content\":\"合肥类脑智能开放平台\"},{\"id\":5,\"name\":\"wuhan\",\"content\":\"武汉人工智能计算中心\"},{\"id\":6,\"name\":\"xian\",\"content\":\"西安未来人工智能计算中心\"},{\"id\":7,\"pclcci\":\"more\",\"content\":\"鹏城云计算所\"},{\"id\":8,\"name\":\"xuchang\",\"content\":\"中原人工智能计算中心\"},{\"id\":9,\"name\":\"chengdu\",\"content\":\"成都人工智能计算中心\"},{\"id\":10,\"name\":\"more\",\"content\":\"横琴先进智能计算中心\"},{\"id\":11,\"name\":\"more\",\"content\":\"国家超级计算济南中心\"}]}")
 	if Grampus.C2NetSequence != "" {
 		if err := json.Unmarshal([]byte(Grampus.C2NetSequence), &C2NetInfos); err != nil {

routers/repo/grampus.go

@@ -740,7 +740,10 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 		workDir = grampus.GpuWorkDir
 	}
 
-	command += "pwd;cd " + workDir + grampus.CommandPrepareScript
+	commandPrepareScript := ";mkdir -p output;mkdir -p code;mkdir -p dataset;mkdir -p model;chmod -R 777 output code dataset model;echo \"start loading script\";wget -q https://git.openi.org.cn/OpenIOSSG/" + setting.Grampus.ScriptName + "/archive/master.zip" +
+		";echo \"finish loading script\";unzip -q master.zip;cd " + setting.Grampus.ScriptName + ";chmod 777 downloader_for_obs uploader_for_obs downloader_for_minio uploader_for_minio;"
+
+	command += "pwd;cd " + workDir + commandPrepareScript
 	//download code & dataset
 	if processorType == grampus.ProcessorTypeNPU {
 		commandDownload := "./downloader_for_obs " + setting.Bucket + " " + codeRemotePath + " " + grampus.CodeArchiveName + " " + dataRemotePath + " '" + datasetName + "';"
@@ -750,10 +753,6 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 		command += commandDownload
 	}
 
-	//check download result
-	commandCheckRes := "bash -c \"[[ $? -eq 0 ]] && exit 0 || exit -1;\";"
-	command += commandCheckRes
-
 	//unzip code & dataset
 	toolUnzip := "unzip -q '"
 	if strings.HasSuffix(datasetName, ".tar.gz") {
@@ -762,10 +761,6 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 	commandUnzip := "cd " + workDir + "code;unzip -q master.zip;echo \"start to unzip dataset\";cd " + workDir + "dataset;" + toolUnzip + datasetName + "';"
 	command += commandUnzip
 
-	//check unzip result
-	commandCheckRes = "bash -c \"[[ $? -eq 0 ]] && exit 0 || exit -1;\";"
-	command += commandCheckRes
-
 	command += "echo \"unzip finished;start to exec code;\";"
 
 	//exec code
@@ -800,12 +795,12 @@ func generateCommand(repoName, processorType, codeRemotePath, dataRemotePath, bo
 		commandUpload := "cd " + workDir + "script_for_grampus/;./uploader_for_obs " + setting.Bucket + " " + outputRemotePath + " " + workDir + "output/;"
 		command += commandUpload
 	} else if processorType == grampus.ProcessorTypeGPU {
-		commandUpload := "cd " + workDir + "script_for_grampus/;./uploader_for_minio " + setting.Grampus.Env + " " + outputRemotePath + " " + workDir + "output/;"
+		commandUpload := "cd " + workDir + "script_for_grampus/;./uploader_for_minio " + setting.Grampus.Env + " " + outputRemotePath + " " + workDir + "model/;"
 		command += commandUpload
 	}
 
 	//check exec result
-	commandCheckRes = "bash -c \"[[ $result -eq 0 ]] && exit 0 || exit -1\""
+	commandCheckRes := "bash -c \"[[ $result -eq 0 ]] && exit 0 || exit -1\""
 	command += commandCheckRes
 
 	return command, nil