containerName 생성 변경
This commit is contained in:
@@ -135,7 +135,8 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom {
|
|||||||
modelHyperParamEntity.saturationRange,
|
modelHyperParamEntity.saturationRange,
|
||||||
modelHyperParamEntity.hueDelta,
|
modelHyperParamEntity.hueDelta,
|
||||||
Expressions.nullExpression(Integer.class),
|
Expressions.nullExpression(Integer.class),
|
||||||
Expressions.nullExpression(String.class)))
|
Expressions.nullExpression(String.class),
|
||||||
|
modelHyperParamEntity.uuid))
|
||||||
.from(modelMasterEntity)
|
.from(modelMasterEntity)
|
||||||
.leftJoin(modelHyperParamEntity)
|
.leftJoin(modelHyperParamEntity)
|
||||||
.on(modelHyperParamEntity.id.eq(modelMasterEntity.hyperParamId))
|
.on(modelHyperParamEntity.id.eq(modelMasterEntity.hyperParamId))
|
||||||
|
|||||||
@@ -82,11 +82,17 @@ public class TrainRunRequest {
|
|||||||
private Integer timeoutSeconds;
|
private Integer timeoutSeconds;
|
||||||
private String resumeFrom;
|
private String resumeFrom;
|
||||||
|
|
||||||
|
private UUID uuid;
|
||||||
|
|
||||||
public String getDatasetFolder() {
|
public String getDatasetFolder() {
|
||||||
return String.valueOf(datasetFolder);
|
return String.valueOf(this.datasetFolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOutputFolder() {
|
public String getOutputFolder() {
|
||||||
return String.valueOf(outputFolder);
|
return String.valueOf(this.outputFolder);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUuid() {
|
||||||
|
return String.valueOf(this.uuid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class TestJobService {
|
|||||||
|
|
||||||
Map<String, Object> params = new java.util.LinkedHashMap<>();
|
Map<String, Object> params = new java.util.LinkedHashMap<>();
|
||||||
params.put("jobType", "EVAL");
|
params.put("jobType", "EVAL");
|
||||||
params.put("uuid", uuid);
|
params.put("uuid", String.valueOf(uuid));
|
||||||
params.put("epoch", epoch);
|
params.put("epoch", epoch);
|
||||||
|
|
||||||
int nextAttemptNo = modelTrainJobCoreService.findMaxAttemptNo(modelId) + 1;
|
int nextAttemptNo = modelTrainJobCoreService.findMaxAttemptNo(modelId) + 1;
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ public class TrainJobService {
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, Object> paramsMap = objectMapper.convertValue(trainRunRequest, Map.class);
|
Map<String, Object> paramsMap = objectMapper.convertValue(trainRunRequest, Map.class);
|
||||||
paramsMap.put("jobType", "TRAIN");
|
paramsMap.put("jobType", "TRAIN");
|
||||||
|
paramsMap.put("uuid", trainRunRequest.getUuid());
|
||||||
|
|
||||||
Long jobId =
|
Long jobId =
|
||||||
modelTrainJobCoreService.createQueuedJob(
|
modelTrainJobCoreService.createQueuedJob(
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class TrainJobWorker {
|
|||||||
|
|
||||||
boolean isEval = "EVAL".equals(jobType);
|
boolean isEval = "EVAL".equals(jobType);
|
||||||
|
|
||||||
String containerName = (isEval ? "eval-" : "train-") + jobId;
|
String containerName = (isEval ? "eval-" : "train-") + jobId + "-" + params.get("uuid");
|
||||||
|
|
||||||
modelTrainJobCoreService.markRunning(jobId, containerName, null, "TRAIN_WORKER");
|
modelTrainJobCoreService.markRunning(jobId, containerName, null, "TRAIN_WORKER");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user