Skip to content

Commit 36514ec

Browse files
Merge pull request #1 from RIKEN-RCCS/feature/SLURM_RC
added feature/SLURM_RC
2 parents b3640dc + 155051d commit 36514ec

6 files changed

Lines changed: 28 additions & 7 deletions

File tree

programs/qws/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ case "$system" in
1919
;;
2020
FugakuLN)
2121
make -j 2 fugaku_benchmark= omp=1 compiler=gnu arch=skylake rdma= mpi= powerapi=
22-
#echo "touch main (THIS IS a dummy executable to check CI jobs)"
23-
#touch main ############################# THIS IS a dummy executable to check CI jobs
2422
#gcc -v
2523
;;
24+
RC_GH200)
25+
echo "touch main (THIS IS a dummy executable to check CI jobs)"
26+
touch main ############################# THIS IS a dummy executable to check CI jobs
27+
;;
2628
*)
2729
echo "Unknown system: $system"
2830
exit 1

programs/qws/list.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
system,mode,queue_group,nodes,numproc_node,nthreads,elapse
2-
Fugaku,cross,small,1,4,12,0:10:00
3-
FugakuLN,native,small,1,1,1,0:10:00
4-
FugakuCN,native,small,1,4,12,0:10:00
5-
FugakuCN,native,small,2,4,12,0:10:00
2+
#Fugaku,cross,small,1,4,12,0:10:00
3+
#FugakuLN,native,small,1,1,1,0:10:00
4+
#FugakuCN,native,small,1,4,12,0:10:00
5+
#FugakuCN,native,small,2,4,12,0:10:00
6+
RC_GH200,native,dummy,1,1,12,0:10:00

programs/qws/run.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ case "$system" in
6565
tar -czf ../results/padata0.tgz ./pa
6666
#ls ../results/
6767
;;
68+
RC_GH200)
69+
echo FOM:11.22 FOM_version:dummy Exp:DummyFrom_qc-gh200 node_count:$nodes >> ../results/result
70+
;;
6871
*)
6972
echo "Unknown Running system: $system"
7073
exit 1

queue.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
queue,submit_cmd,template
22
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"
3+
SLURM_RC_GH200,sbatch,"-p qc-gh200 -t ${elapse} -N ${nodes} --ntasks-per-node=${numproc_node} --cpus-per-task=${nthreads}"
34
none,none,none

scripts/test_submit.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,19 @@ elapse="${cols[6]}"
4949
# --- 値を表示 ---
5050
echo "system=$system, mode=$mode, queue_group=$queue_group, nodes=$nodes, numproc_node=$numproc_node, nthreads=$nthreads, elapse=$elapse"
5151

52+
# --- 投入用スクリプト作成 ---
53+
echo bash programs/$code/run.sh $system $nodes > script.sh
54+
5255
# --- FugakuLN は submit テスト対象外 ---
5356
if [[ "$system" == "FugakuLN" ]]; then
5457
echo "Notice: system=$system → submit test will NOT be performed."
5558
exit 1
5659
fi
5760

5861

59-
echo bash programs/$code/run.sh $system $nodes > script.sh
6062

63+
# --- Fugaku or FugakuCN ---
64+
if [[ "$system" == "Fugaku" || "$system" == "FugakuCN" ]]; then
6165
echo pjsub -L rscunit=rscunit_ft01,rscgrp=$queue_group,node=$nodes,elapse=$elapse \
6266
--mpi max-proc-per-node=$numproc_node \
6367
-S -x PJM_LLIO_GFSCACHE=/vol0004:/vol0003 \
@@ -67,4 +71,13 @@ pjsub -L rscunit=rscunit_ft01,rscgrp=$queue_group,node=$nodes,elapse=$elapse \
6771
--mpi max-proc-per-node=$numproc_node \
6872
-S -x PJM_LLIO_GFSCACHE=/vol0004:/vol0003 \
6973
script.sh
74+
fi
75+
76+
# --- RC_GH200 ---
77+
if [[ "$system" == "RC_GH200" ]]; then
78+
echo sbatch -p qc-gh200 -N $nodes -t $elapse --ntasks-per-node=${numproc_node} --cpus-per-task=$nthreads \
79+
--wrap="bash programs/$code/run.sh $system $nodes"
80+
sbatch -p qc-gh200 -N $nodes -t $elapse --ntasks-per-node=${numproc_node} --cpus-per-task=$nthreads \
81+
--wrap="bash programs/${code}/run.sh $system $nodes"
82+
fi
7083

system.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Fugaku,fugaku_login1,build,none
33
Fugaku,fugaku_jacamar,run,FJ
44
FugakuLN,fugaku_login1,build_run,none
55
FugakuCN,fugaku_jacamar,build_run,FJ
6+
RC_GH200,cloud_jacamar,build_run,SLURM_RC_GH200

0 commit comments

Comments
 (0)