From 547005cf34fa20ddfe87b70e486dffd9943178d5 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Sat, 20 Sep 2025 00:31:32 +0900 Subject: [PATCH 01/10] ci filtering --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b213758..121e139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,14 @@ stages: - generate - trigger +variables: + code: "" + system: "" + generate_matrix: stage: generate script: - - bash ./scripts/matrix_generate.sh + - bash ./scripts/matrix_generate.sh code=$code system=$system tags: - general artifacts: From 90e5aaf5854404fde90812a026ba6349fa8597d3 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 11 Nov 2025 17:23:49 +0900 Subject: [PATCH 02/10] added system MiyabiG and test --- programs/qws/build.sh | 4 ++++ programs/qws/list.csv | 3 ++- programs/qws/run.sh | 6 ++++++ queue.csv | 1 + system.csv | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/qws/build.sh b/programs/qws/build.sh index 6587436..68cd12f 100644 --- a/programs/qws/build.sh +++ b/programs/qws/build.sh @@ -25,6 +25,10 @@ case "$system" in echo "touch main (THIS IS a dummy executable to check CI jobs)" touch main ############################# THIS IS a dummy executable to check CI jobs ;; + MiyabiG) + ### QWSはNeoverse版やGPU版はないので汎用版としてとりあえずarch=skylakeを指定している + make -j 8 fugaku_benchmark= omp=1 compiler=openmpi-gnu arch=skylake rdma= mpi=1 powerapi= + ;; *) echo "Unknown system: $system" exit 1 diff --git a/programs/qws/list.csv b/programs/qws/list.csv index 7d35399..ffbdbd4 100644 --- a/programs/qws/list.csv +++ b/programs/qws/list.csv @@ -3,4 +3,5 @@ system,mode,queue_group,nodes,numproc_node,nthreads,elapse #FugakuLN,native,small,1,1,1,0:10:00 #FugakuCN,native,small,1,4,12,0:10:00 #FugakuCN,native,small,2,4,12,0:10:00 -RC_GH200,native,dummy,1,1,12,0:10:00 +#RC_GH200,native,dummy,1,1,12,0:10:00 +MiyabiG,cross,debug-g,1,1,1,0:10:00 diff --git a/programs/qws/run.sh b/programs/qws/run.sh index 57a46bc..4be09f4 100644 --- a/programs/qws/run.sh +++ b/programs/qws/run.sh @@ -75,6 +75,12 @@ case "$system" in echo FOM:11.22 FOM_version:dummy_qc-gh200 Exp:confidential_TeamE node_count:$nodes confidential:TeamE>> ../results/result echo FOM:11.22 FOM_version:dummy_qc-gh200 Exp:confidential_TeamF node_count:$nodes confidential:TeamF>> ../results/result ;; + MiyabiG) + mpirun -n 1 ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0 + ./check.sh CASE0 data/CASE0 + FOM=$(grep etime CASE0 | awk 'NR==2{printf("%5.3f\n",$5)}') + echo FOM:$FOM FOM_version:DDSolverJacobi Exp:CASE0 node_count:$nodes >> ../results/result + ;; *) echo "Unknown Running system: $system" exit 1 diff --git a/queue.csv b/queue.csv index b4cb7b8..edceeab 100644 --- a/queue.csv +++ b/queue.csv @@ -1,4 +1,5 @@ queue,submit_cmd,template FJ,pjsub,"-L rscunit=rscunit_ft01,rscgrp=${queue_group},elapse=${elapse},node=${nodes} --mpi max-proc-per-node=${numproc_node} -x PJM_LLIO_GFSCACHE=/vol0004" SLURM_RC_GH200,sbatch,"-p qc-gh200 -t ${elapse} -N ${nodes} --ntasks-per-node=${numproc_node} --cpus-per-task=${nthreads}" +PBS_MiyabiG,qsub,"-q ${queue_group} -l select=${nodes} -l walltime=${elapse} -W group_list=gq49" none,none,none diff --git a/system.csv b/system.csv index 970ac74..fd64a02 100644 --- a/system.csv +++ b/system.csv @@ -4,3 +4,5 @@ Fugaku,fugaku_jacamar,run,FJ FugakuLN,fugaku_login1,build_run,none FugakuCN,fugaku_jacamar,build_run,FJ RC_GH200,cloud_jacamar,build_run,SLURM_RC_GH200 +MiyabiG,miyabi_g_login,build,none +MiyabiG,miyabi_g_jacamar,run,PBS_MiyabiG From 691cad581014baf8deeac331cb0adaffbb2543d8 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Wed, 12 Nov 2025 23:22:59 +0900 Subject: [PATCH 03/10] changed CI/CD tag for send_resut from general to fncx-curl-jq --- scripts/matrix_generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index 3a2742e..f19b88d 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -137,7 +137,7 @@ ${job_prefix}_build_run: ${job_prefix}_send_results: stage: send_results needs: [\"${job_prefix}_build_run\"] - tags: [general] + tags: [fncx-curl-jq] environment: name: \$CI_COMMIT_BRANCH script: From 7d79375d8d7ae834f9a228e656d6641796d998c9 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Wed, 12 Nov 2025 23:30:32 +0900 Subject: [PATCH 04/10] ONE more changed CI/CD tag for send_resut from general to fncx-curl-jq --- scripts/matrix_generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index f19b88d..f0d3bd6 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -98,7 +98,7 @@ ${job_prefix}_run: ${job_prefix}_send_results: stage: send_results needs: [\"${job_prefix}_run\"] - tags: [general] + tags: [fncx-curl-jq] environment: name: \$CI_COMMIT_BRANCH script: From 8027a3596f678698a02719758d656285d4775352 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 18 Nov 2025 16:30:58 +0900 Subject: [PATCH 05/10] fixing list.csv for genesis and queue.csv for MiyabiG --- programs/genesis-nonbonded-kernels/list.csv | 2 +- programs/genesis/list.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/genesis-nonbonded-kernels/list.csv b/programs/genesis-nonbonded-kernels/list.csv index 33225bd..1cb608a 100644 --- a/programs/genesis-nonbonded-kernels/list.csv +++ b/programs/genesis-nonbonded-kernels/list.csv @@ -1,4 +1,4 @@ system,mode,queue_group,nodes,numproc_node,nthreads,elapse Fugaku,cross,small,1,1,6,0:10:00 -FugakuLN,native,small,1,1,6,0:10:00 +#FugakuLN,native,small,1,1,6,0:10:00 FugakuCN,native,small,1,1,6,0:10:00 diff --git a/programs/genesis/list.csv b/programs/genesis/list.csv index dd66024..8744662 100644 --- a/programs/genesis/list.csv +++ b/programs/genesis/list.csv @@ -1,4 +1,4 @@ system,mode,queue_group,nodes,numproc_node,nthreads,elapse Fugaku,cross,small,2,4,12,0:10:00 -FugakuLN,native,small,1,8,2,0:10:00 +#FugakuLN,native,small,1,8,2,0:10:00 #FugakuCN,native,small,1,8,2,0:10:00 From 323cafa0134fd4e90b307f389510ee87a49c2f43 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 18 Nov 2025 17:00:43 +0900 Subject: [PATCH 06/10] checking CI reuslts place for Jacamar-CI PBS --- scripts/matrix_generate.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index f0d3bd6..e1742a6 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -90,6 +90,9 @@ ${job_prefix}_run: - echo \"[RUN] $program on $system\" - bash $program_path/run.sh $system $nodes ${numproc_node} ${nthreads} - bash scripts/result.sh $program $system + - pwd + - ls + - ls -l results artifacts: paths: - results/ From 69b42401c5044613323586de0240df5055393089 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 18 Nov 2025 21:34:07 +0900 Subject: [PATCH 07/10] testing PBS --- scripts/matrix_generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index e1742a6..6652ae2 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -93,6 +93,7 @@ ${job_prefix}_run: - pwd - ls - ls -l results + - env artifacts: paths: - results/ From 59ef5042e2a3e7d9a692772bf021045b3ceaad2c Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 18 Nov 2025 22:20:11 +0900 Subject: [PATCH 08/10] testing PBS --- scripts/matrix_generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index 6652ae2..af2f9c3 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -94,6 +94,8 @@ ${job_prefix}_run: - ls - ls -l results - env + - mkdir -p \$RUNNER_TEMP_PROJECT_DIR/results/ + - cp -r \$CI_PROJECT_DIR/results/* \$RUNNER_TEMP_PROJECT_DIR/results/ artifacts: paths: - results/ From 922d513ba2b226c0de0490ee506c1e41a441f44d Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Tue, 18 Nov 2025 22:28:11 +0900 Subject: [PATCH 09/10] testing PBS --- scripts/matrix_generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index af2f9c3..a9e62b8 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -93,6 +93,7 @@ ${job_prefix}_run: - pwd - ls - ls -l results + - sync - env - mkdir -p \$RUNNER_TEMP_PROJECT_DIR/results/ - cp -r \$CI_PROJECT_DIR/results/* \$RUNNER_TEMP_PROJECT_DIR/results/ From d0215da42e4f566a34bd520e84edd6abc2c69a04 Mon Sep 17 00:00:00 2001 From: yoshifuminakamura Date: Wed, 19 Nov 2025 08:02:54 +0900 Subject: [PATCH 10/10] removed printing to check artifact problem on PBS file sync --- scripts/matrix_generate.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index a9e62b8..f0d3bd6 100644 --- a/scripts/matrix_generate.sh +++ b/scripts/matrix_generate.sh @@ -90,13 +90,6 @@ ${job_prefix}_run: - echo \"[RUN] $program on $system\" - bash $program_path/run.sh $system $nodes ${numproc_node} ${nthreads} - bash scripts/result.sh $program $system - - pwd - - ls - - ls -l results - - sync - - env - - mkdir -p \$RUNNER_TEMP_PROJECT_DIR/results/ - - cp -r \$CI_PROJECT_DIR/results/* \$RUNNER_TEMP_PROJECT_DIR/results/ artifacts: paths: - results/