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: 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 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/scripts/matrix_generate.sh b/scripts/matrix_generate.sh index 3a2742e..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: @@ -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: 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