| @@ -192,9 +192,9 @@ public class AimServiceImpl implements AimService { | |||||
| //解析指标 | //解析指标 | ||||
| Map<String, Object> metricValue = JacksonUtil.parseJSONStr2Map(experimentIns.getMetricValue()); | Map<String, Object> metricValue = JacksonUtil.parseJSONStr2Map(experimentIns.getMetricValue()); | ||||
| if (isTrain) { | if (isTrain) { | ||||
| setMetricValue("train",metricValue,aimRunInfo); | |||||
| setMetricValue("train", metricValue, aimRunInfo); | |||||
| } else { | } else { | ||||
| setMetricValue("evaluate",metricValue,aimRunInfo); | |||||
| setMetricValue("evaluate", metricValue, aimRunInfo); | |||||
| } | } | ||||
| aimRunInfoList.add(aimRunInfo); | aimRunInfoList.add(aimRunInfo); | ||||
| } | } | ||||
| @@ -307,7 +307,7 @@ public class AimServiceImpl implements AimService { | |||||
| return datasetList; | return datasetList; | ||||
| } | } | ||||
| private void setMetricValue(String isTrain, Map<String, Object> metricValue, InsMetricInfoVo aimRunInfo){ | |||||
| private void setMetricValue(String isTrain, Map<String, Object> metricValue, InsMetricInfoVo aimRunInfo) { | |||||
| Map<String, Object> metricValues = (Map<String, Object>) metricValue.get(isTrain); | Map<String, Object> metricValues = (Map<String, Object>) metricValue.get(isTrain); | ||||
| HashMap<String, Object> metrics = new HashMap<>(); | HashMap<String, Object> metrics = new HashMap<>(); | ||||
| @@ -654,7 +654,7 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| try { | try { | ||||
| dvcUtils.dvcInit(rootPath); | dvcUtils.dvcInit(rootPath); | ||||
| // 配置远程S3地址 | // 配置远程S3地址 | ||||
| String s3Path = "management-platform-files/" + ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName + "/" + branchName; | |||||
| String s3Path = "data/mini-model-management-platform-files/" + ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName + "/" + branchName; | |||||
| dvcUtils.dvcRemoteAdd(rootPath, s3Path); | dvcUtils.dvcRemoteAdd(rootPath, s3Path); | ||||
| dvcUtils.dvcConfigS3Credentials(rootPath, endpoint); | dvcUtils.dvcConfigS3Credentials(rootPath, endpoint); | ||||
| dvcUtils.dvcConfigS3Credentials2(rootPath, accessKeyId); | dvcUtils.dvcConfigS3Credentials2(rootPath, accessKeyId); | ||||
| @@ -826,7 +826,7 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| } | } | ||||
| // 配置远程S3地址 | // 配置远程S3地址 | ||||
| String s3Path = "management-platform-files/" + ci4sUsername + "/model/" + modelsVo.getId() + "/" + repositoryName + "/" + branchName; | |||||
| String s3Path = "data/mini-model-management-platform-files/" + ci4sUsername + "/model/" + modelsVo.getId() + "/" + repositoryName + "/" + branchName; | |||||
| dvcUtils.dvcRemoteAdd(rootPath, s3Path); | dvcUtils.dvcRemoteAdd(rootPath, s3Path); | ||||
| dvcUtils.dvcConfigS3Credentials(rootPath, endpoint); | dvcUtils.dvcConfigS3Credentials(rootPath, endpoint); | ||||
| dvcUtils.dvcConfigS3Credentials2(rootPath, accessKeyId); | dvcUtils.dvcConfigS3Credentials2(rootPath, accessKeyId); | ||||
| @@ -123,7 +123,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| // 命令行操作 git clone 项目地址 | // 命令行操作 git clone 项目地址 | ||||
| dvcUtils.gitClone(localPath, projectUrl, branchName, gitLinkUsername, gitLinkPassword); | dvcUtils.gitClone(localPath, projectUrl, branchName, gitLinkUsername, gitLinkPassword); | ||||
| String s3Path = "management-platform-files" + "/" + relatePath + "/" + branchName; | |||||
| String s3Path = "data/mini-model-management-platform-files" + "/" + relatePath + "/" + branchName; | |||||
| //干掉目标文件夹 | //干掉目标文件夹 | ||||
| dvcUtils.deleteDirectory(datasetPath); | dvcUtils.deleteDirectory(datasetPath); | ||||
| dvcUtils.moveFiles(sourcePath, datasetPath); | dvcUtils.moveFiles(sourcePath, datasetPath); | ||||
| @@ -216,7 +216,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| dvcUtils.dvcCheckout(localPath); | dvcUtils.dvcCheckout(localPath); | ||||
| // 准备数据 | // 准备数据 | ||||
| String s3Path = "management-platform-files" + "/" + relatePath + "/" + branchName; | |||||
| String s3Path = "data/mini-model-management-platform-files" + "/" + relatePath + "/" + branchName; | |||||
| //干掉目标文件夹 | //干掉目标文件夹 | ||||
| dvcUtils.deleteDirectory(datasetPath); | dvcUtils.deleteDirectory(datasetPath); | ||||