Browse Source

实验模型导出元数据记录指标修改

dev-lhz
chenzhihang 1 year ago
parent
commit
3cd11e2c45
3 changed files with 7 additions and 7 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java
  2. +4
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
  3. +2
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java View File

@@ -13,7 +13,7 @@ public class TrainTaskDepency implements Serializable {
//实例id
private Integer insId;
//节点Id
private String taskId;
private Long workflowId;

private Integer experimentId;
}

+ 4
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java View File

@@ -296,7 +296,7 @@ public class ExperimentServiceImpl implements ExperimentService {
ExperimentIns insert = experimentInsService.insert(experimentIns);
//插入到模型依赖关系表
if (dependendcy != null && trainInfo != null) {
insertModelDependencyNew(dependendcy, trainInfo, output, insert.getMetricRecord(), insert.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam());
insertModelDependencyNew(dependendcy, trainInfo, output, insert.getMetricRecord(), insert.getId(), workflow.getId(), experiment.getId(), experiment.getName(), experiment.getGlobalParam());
}

Map<String, Object> datasetDependendcy = (Map<String, Object>) converMap2.get("dataset_dependency");
@@ -401,7 +401,7 @@ public class ExperimentServiceImpl implements ExperimentService {
//训练数据集
modelDependency.setTrainDataset(JsonUtils.objectToJson(datasetsList));
TrainTaskDepency trainTaskDepency = new TrainTaskDepency();
trainTaskDepency.setTaskId(sourceTaskId);
// trainTaskDepency.setTaskId(sourceTaskId);
trainTaskDepency.setInsId(experimentInsId);
trainTaskDepency.setName(experimentName);
//训练任务
@@ -490,7 +490,7 @@ public class ExperimentServiceImpl implements ExperimentService {

}

private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, String metricRecord, Integer experimentInsId, Integer experimentId, String experimentName, String globalParam) {
private void insertModelDependencyNew(Map<String, Object> dependendcy, Map<String, Object> trainInfo, Map<String, Object> output, String metricRecord, Integer experimentInsId, Long workflowId, Integer experimentId, String experimentName, String globalParam) {
Iterator<Map.Entry<String, Object>> dependendcyIterator = dependendcy.entrySet().iterator();
Map<String, Object> modelTrain = (Map<String, Object>) trainInfo.get("model_train");
Map<String, Object> modelEvaluate = (Map<String, Object>) trainInfo.get("model_evaluate");
@@ -570,7 +570,7 @@ public class ExperimentServiceImpl implements ExperimentService {
}
//训练任务
TrainTaskDepency trainTask = new TrainTaskDepency();
trainTask.setTaskId(sourceTaskId);
trainTask.setWorkflowId(workflowId);
trainTask.setInsId(experimentInsId);
trainTask.setName(experimentName);
trainTask.setExperimentId(experimentId);


+ 2
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java View File

@@ -41,8 +41,8 @@ public class ModelMetaVo implements Serializable {
@ApiModelProperty(value = "训练镜像")
private String image;

@ApiModelProperty(value = "训练代码")
private String code;
// @ApiModelProperty(value = "训练代码")
// private String code;

@ApiModelProperty(value = "模型来源")
private String modelSource;


Loading…
Cancel
Save