Skip to content

Commit 45b6825

Browse files
Fix [park-send] mode and JSON format
[park-send] - Prevent BenchKit jobs from running in [park-send] mode - Added [park-send] control to generate_matrix and trigger_child_pipeline - Fixed JSON format to include all required BenchKit fields - Added cpu_name, gpu_name, gpus_per_node, uname, cpu_cores fields - Should resolve 403 error from result server
1 parent 919212b commit 45b6825

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ generate_matrix:
7575
when: never # park_onlyモードでは無効
7676
- if: '$CI_COMMIT_MESSAGE =~ /\[park-only\]/'
7777
when: never # [park-only]コミットメッセージでは無効
78+
- if: '$CI_COMMIT_MESSAGE =~ /\[park-send\]/'
79+
when: never # [park-send]コミットメッセージでは無効
7880
- changes:
7981
- ".gitlab-ci.yml"
8082
- ".github/workflows/*.yml"
@@ -106,6 +108,8 @@ trigger_child_pipeline:
106108
when: never # park_onlyモードでは無効
107109
- if: '$CI_COMMIT_MESSAGE =~ /\[park-only\]/'
108110
when: never # [park-only]コミットメッセージでは無効
111+
- if: '$CI_COMMIT_MESSAGE =~ /\[park-send\]/'
112+
when: never # [park-send]コミットメッセージでは無効
109113
- changes:
110114
- ".gitlab-ci.yml"
111115
- ".github/workflows/*.yml"

scripts/convert_benchpark_results.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,20 @@ def convert_to_benchkit_format(parsed_result, system, app):
199199
fom_key = list(metrics.keys())[0]
200200
fom_value = str(metrics[fom_key])
201201

202-
# BenchKit形式のJSON構造
202+
# BenchKit形式のJSON構造(必須フィールドを追加)
203203
result = {
204204
"code": f"benchpark-{app}",
205205
"system": system,
206206
"FOM": fom_value,
207207
"FOM_version": experiment_name,
208208
"Exp": workload,
209+
"cpu_name": "-",
210+
"gpu_name": "-",
209211
"node_count": "1",
210212
"cpus_per_node": str(mpi_processes),
213+
"gpus_per_node": "0",
214+
"uname": "-",
215+
"cpu_cores": "0",
211216
"description": "dummy",
212217
"confidential": "null"
213218
}

0 commit comments

Comments
 (0)