5 Commits

7 changed files with 62 additions and 29 deletions

View File

@@ -19,21 +19,21 @@ configurations {
}
}
//repositories {
// mavenCentral()
//}
def repoUrl = System.getProperty("org.gradle.project.repoUrl")
?: System.getenv("ORG_GRADLE_PROJECT_repoUrl")
?: "http://172.16.4.56:18100/repository/maven-public/"
repositories {
maven {
url = uri(repoUrl)
allowInsecureProtocol = true
}
mavenCentral()
}
//def repoUrl = System.getProperty("org.gradle.project.repoUrl")
// ?: System.getenv("ORG_GRADLE_PROJECT_repoUrl")
// ?: "http://172.16.4.56:18100/repository/maven-public/"
//repositories {
// maven {
// url = uri(repoUrl)
// allowInsecureProtocol = true
// }
//}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-batch'
implementation 'org.springframework.boot:spring-boot-starter-jdbc'

View File

@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=http\://172.16.4.56:18100/repository/gradle-distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
#distributionUrl=http\://172.16.4.56:18100/repository/gradle-distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@@ -13,6 +13,7 @@ public class DockerProperties {
private String image;
private String user;
private String datasetVolume;
private String outputVolume;
private String imagesVolume;
private String inputRoot;
private String outputRoot;
@@ -20,4 +21,5 @@ public class DockerProperties {
private int overlapPct;
private List<String> trainValTestRatio;
private double keepEmptyRatio;
private double keepEmptyRatioVal;
}

View File

@@ -71,7 +71,7 @@ public class DockerRunnerService {
log.info("[Step 1/4] Docker 명령어 생성 중...");
List<String> command = buildCommand(resultUid);
log.info("[Step 1/4] Docker 명령어 생성 완료");
log.debug(" - 명령어: {}", String.join(" ", command));
log.info(" - 명령어: {}", String.join(" ", command));
try {
// Step 2: Docker 프로세스 시작
@@ -161,11 +161,16 @@ public class DockerRunnerService {
// 볼륨 마운트 (호스트:컨테이너)
cmd.add("-v");
cmd.add(dockerProperties.getDatasetVolume()); // 예: "/kamco-nfs/dataset:/dataset"
cmd.add(dockerProperties.getDatasetVolume());
log.debug(" - Dataset Volume: {}", dockerProperties.getDatasetVolume());
//output 마운트
cmd.add("-v");
cmd.add(dockerProperties.getImagesVolume()); // 예: "/kamco-nfs/images:/images"
cmd.add(dockerProperties.getOutputVolume());
log.debug(" - Output Volume: {}", dockerProperties.getOutputVolume());
cmd.add("-v");
cmd.add(dockerProperties.getImagesVolume());
log.debug(" - Images Volume: {}", dockerProperties.getImagesVolume());
// Entrypoint 및 이미지
@@ -179,11 +184,11 @@ public class DockerRunnerService {
// 입출력 폴더 설정
cmd.add("--labelling-folder");
cmd.add("request/" + resultUid);
cmd.add(resultUid);
log.debug(" - Labelling Folder: request/{}", resultUid);
cmd.add("--output-folder");
cmd.add("response/" + resultUid);
cmd.add(resultUid);
log.debug(" - Output Folder: response/{}", resultUid);
// 파이프라인 파라미터
@@ -209,6 +214,10 @@ public class DockerRunnerService {
cmd.add(String.valueOf(dockerProperties.getKeepEmptyRatio()));
log.debug(" - Keep Empty Ratio: {}", dockerProperties.getKeepEmptyRatio());
cmd.add("--keep_empty_ratio_val");
cmd.add(String.valueOf(dockerProperties.getKeepEmptyRatioVal()));
log.debug(" - Keep Empty Ratio Val: {}", dockerProperties.getKeepEmptyRatioVal());
log.debug("Docker 명령어 파라미터 구성 완료");
return cmd;
}

View File

@@ -12,3 +12,19 @@ spring:
training-data:
geojson-dir: /data/dataset
docker:
image: kamco-cd-dataset:latest
user: "1000:1000"
dataset-volume: /data/dataset/request:/data/labels:ro
output-volume: /data/dataset/response:/data/out
images-volume: /data/images:/kamco-nfs:ro
input-root: /data/labels
output-root: /data/out
patch-size: 512
overlap-pct: 50
train-val-test-ratio:
- "0.7"
- "0.2"
- "0.1"
keep-empty-ratio: 0.1
keep-empty-ratio-val: 0.3

View File

@@ -14,14 +14,18 @@ spring:
training-data:
geojson-dir: /data/dataset
docker:
dataset-volume: /data/dataset:/dataset
images-volume: /data/images:/kamco-nfs:ro
input-root: /dataset
output-root: /dataset
image: kamco-cd-dataset:latest
user: "1000:1000"
dataset-volume: /data/dataset/request:/data/labels:ro
output-volume: /data/dataset/response:/data/out
images-volume: /data/images:/data/images
input-root: /data/labels
output-root: /data/out
patch-size: 512
overlap-pct: 50
train-val-test-ratio:
- "0.7"
- "0.2"
- "0.1"
keep-empty-ratio: 0.1
keep-empty-ratio: 0.1
keep-empty-ratio-val: 0.3

View File

@@ -28,14 +28,16 @@ training-data:
docker:
image: kamco-cd-dataset:latest
user: "1000:1000"
dataset-volume: /data/dataset:/dataset
images-volume: /data/images:/kamco-nfs:ro
input-root: /dataset
output-root: /dataset
dataset-volume: /data/dataset:/data/labels:ro
output-volume: /data/dataset:/data/out
images-volume: /data/images:/data/images
input-root: /data/labels
output-root: /data/out
patch-size: 512
overlap-pct: 50
train-val-test-ratio:
- "0.7"
- "0.2"
- "0.1"
keep-empty-ratio: 0.1
keep-empty-ratio: 0.1
keep-empty-ratio-val: 0.3