diff --git a/.github/workflows/gitlab-manual-ci.yml b/.github/workflows/gitlab-manual-ci.yml index 84ac91f..6c73eb3 100644 --- a/.github/workflows/gitlab-manual-ci.yml +++ b/.github/workflows/gitlab-manual-ci.yml @@ -11,7 +11,7 @@ on: description: "BenchKit code filter, for example: qws,genesis" required: false system: - description: "System filter, for example: FugakuLN,MiyabiG" + description: "System filter, for example: Fugaku,MiyabiG" required: false app: description: "BenchPark app filter, for example: osu-micro-benchmarks" diff --git a/.github/workflows/result-server-tests.yml b/.github/workflows/result-server-tests.yml index 95244b3..a64b9e0 100644 --- a/.github/workflows/result-server-tests.yml +++ b/.github/workflows/result-server-tests.yml @@ -19,6 +19,7 @@ on: - "scripts/tests/test_send_estimate_artifacts.sh" - "scripts/tests/test_send_results_profile_data.sh" - "scripts/test_estimate_submit.sh" + - "programs/**/list.csv" - "programs/genesis/estimate.sh" - "programs/genesis/run.sh" - "programs/qws/estimate.sh" @@ -47,6 +48,7 @@ on: - "scripts/tests/test_send_estimate_artifacts.sh" - "scripts/tests/test_send_results_profile_data.sh" - "scripts/test_estimate_submit.sh" + - "programs/**/list.csv" - "programs/genesis/estimate.sh" - "programs/genesis/run.sh" - "programs/qws/estimate.sh" diff --git a/config/queue.csv b/config/queue.csv index 5e2068d..30d8c2d 100644 --- a/config/queue.csv +++ b/config/queue.csv @@ -1,5 +1,5 @@ queue,submit_cmd,template -SLURM_AI4SS,sbatch,"-p ${queue_group} -t ${elapse} -N ${nodes} --ntasks-per-node=${numproc_node} --cpus-per-task=${nthreads} --gpus-per-node=${numproc_node}" +SLURM_RIKYU,sbatch,"-p ${queue_group} -t ${elapse} -N ${nodes} --ntasks-per-node=${numproc_node} --cpus-per-task=${nthreads} --gpus-per-node=${numproc_node}" FJ,pjsub,"-L rscunit=rscunit_ft01,rscgrp=${queue_group},elapse=${elapse},node=${nodes} --mpi max-proc-per-node=${numproc_node} -x PJM_LLIO_GFSCACHE=/vol0002:/vol0003:/vol0004:/vol0005" PJM_GENKAI,pjsub,"-L rscgrp=${queue_group},elapse=${elapse},node=${nodes} --mpi proc=${proc}" SLURM_RC,sbatch,"-p ${queue_group} -t ${elapse} -N ${nodes} --ntasks-per-node=${numproc_node} --cpus-per-task=${nthreads}" diff --git a/config/system.csv b/config/system.csv index 81dad8c..9d2f860 100644 --- a/config/system.csv +++ b/config/system.csv @@ -1,7 +1,6 @@ system,mode,tag_build,tag_run,queue,queue_group -AI4SS,cross,ai4ss_login,ai4ss_jacamar,SLURM_AI4SS,1n1gpu +RIKYU,cross,ai4ss_login,ai4ss_jacamar,SLURM_RIKYU,1n1gpu Fugaku,cross,fugaku_login1,fugaku_jacamar,FJ,small -FugakuLN,native,,fugaku_login1,none,small FugakuCN,native,,fugaku_jacamar,FJ,small RC_GH200,native,,cloud_jacamar,SLURM_RC,qc-gh200 RC_DGXSP,native,,cloud_jacamar,SLURM_RC,ng-dgx-3h diff --git a/config/system_info.csv b/config/system_info.csv index 78e5821..c0bdad2 100644 --- a/config/system_info.csv +++ b/config/system_info.csv @@ -1,8 +1,7 @@ system,name,cpu_name,cpu_per_node,cpu_cores,gpu_name,gpu_per_node,memory,display_order -AI4SS,RIKEN AI4S Supercomputer,NVIDIA Grace CPU,2,72,NVIDIA B200,4,960GiB + 692.8GiB,1 +RIKYU,RIKYU,NVIDIA Grace CPU,2,72,NVIDIA B200,4,960GiB + 692.8GiB,1 Fugaku,Fugaku,A64FX,1,48,-,-,32GB,2 FugakuCN,FugakuCN,A64FX,1,48,-,-,32GB,3 -FugakuLN,FugakuLN,Intel(R) Xeon(R) Gold 6242 CPU @ 2.80GHz,2,16,-,-,96GB,4 MiyabiG,MiyabiG,NVIDIA Grace CPU,1,72,NVIDIA Hopper H100 GPU,1,120GB,5 MiyabiC,MiyabiC,Intel Xeon Max 9480,2,56,-,-,128GB,6 RC_GH200,RC_GH200,NVIDIA Grace CPU,1,72,NVIDIA Hopper H100 GPU,1,120GB,7 diff --git a/docs/ci.md b/docs/ci.md index 83b2e5f..4602c0c 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -69,7 +69,7 @@ The workflow accepts these inputs: |---|---|---| | `target_ref` | Branch, tag, or SHA in the upstream repository to test / upstreamリポジトリ内でテストするbranch、tag、SHA | `feature/my-change`, `ci/pr-123`, `develop` | | `code` | BenchKit program filter / BenchKitプログラムのフィルタ | `qws,genesis` | -| `system` | System filter used by BenchKit and BenchPark / BenchKitとBenchParkで使うsystemフィルタ | `FugakuLN,MiyabiG` | +| `system` | System filter used by BenchKit and BenchPark / BenchKitとBenchParkで使うsystemフィルタ | `Fugaku,MiyabiG` | | `app` | BenchPark application filter / BenchParkアプリケーションのフィルタ | `osu-micro-benchmarks` | | `benchpark` | Run the BenchPark path together with BenchKit / BenchKitとBenchParkの両方を実行 | `true` | | `park_only` | Run only the BenchPark path / BenchParkのみ実行 | `true` | diff --git a/docs/guides/add-app.md b/docs/guides/add-app.md index b2dabd4..e6090ce 100644 --- a/docs/guides/add-app.md +++ b/docs/guides/add-app.md @@ -82,8 +82,6 @@ MiyabiC,yes,1,1,112,0:10:00 RC_DGXSP,yes,1,1,20,0:10:00 RC_GENOA,yes,1,1,96,0:10:00 RC_FX700,yes,1,4,12,0:10:00 -# ログインノードでのテスト用 -FugakuLN,yes,1,1,1,0:10:00 ``` **パラメータ説明：** @@ -147,10 +145,6 @@ case "$system" in # A64FX向けネイティブコンパイル make -j 8 compiler=fujitsu_native mpi=1 ;; - FugakuLN) - # x86_64向けビルド（テスト用） - make -j 2 compiler=gnu arch=skylake mpi= - ;; MiyabiG) # Neoverse-N1向けビルド make -j 8 compiler=openmpi-gnu arch=skylake mpi=1 @@ -199,10 +193,6 @@ make -j 8 fugaku_benchmark= omp=1 compiler=fujitsu_native rdma= mpi=1 powerapi= ### ビルドテスト ```bash -# ログインノードでのビルドテスト -bash programs//build.sh FugakuLN -ls artifacts/ # 実行ファイルが生成されることを確認 - # A64FX向けビルド（Fugaku環境） bash programs//build.sh Fugaku ls artifacts/ # クロスコンパイル済み実行ファイルを確認 @@ -266,14 +256,6 @@ case "$system" in bk_emit_result --fom "$FOM" --fom-version v1.0 --exp test \ --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result ;; - FugakuLN) - # ログインノードでのテスト実行 - export OMP_NUM_THREADS=12 - ./main [args] > output - FOM=$(grep "performance" output | awk '{print $2}') - bk_emit_result --fom "$FOM" --fom-version v1.0 --exp test \ - --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result - ;; MiyabiG|MiyabiC) # MPI実行（Miyabi） mpirun -n $((nodes * numproc_node)) ./main [args] > output @@ -413,14 +395,14 @@ app 固有の GPU kernel window、短縮 input、module override、profiler over ## 6. ローカルテスト -### ログインノードでのテスト +### 手元環境でのスクリプト確認 ```bash -# ビルドテスト -bash programs//build.sh FugakuLN +# ビルドテスト（対象 system は実際に使う設定に合わせる） +bash programs//build.sh Fugaku ls artifacts/ # 実行テスト -bash programs//run.sh FugakuLN 1 +bash programs//run.sh Fugaku 1 4 12 cat results/result # FOM:値が含まれることを確認 ls results/ # 必要に応じてpadata*.tgzも確認 ``` @@ -473,14 +455,12 @@ Line# | Configuration ------|------------- H | system,enable,nodes,numproc_node,nthreads,elapse 1 | Fugaku,yes,1,4,12,0:10:00 - 2 | FugakuLN,yes,1,1,1,0:10:00 ``` ### 対応システム - **Fugaku/FugakuCN**: PJM（富岳） - **MiyabiG/MiyabiC**: PBS（Miyabi） - **RC_GH200/RC_DGXSP/RC_GENOA/RC_FX700**: SLURM（クラウド） -- **FugakuLN**: テスト専用（投入なし） **注意**: トークンを消費するプロジェクトでは、`groups`の第二要素が自動で選択されます。変更したい場合は`scripts/test_submit.sh`を編集してください。 @@ -501,7 +481,7 @@ git commit -m "Add new app - Implement build.sh for multiple systems - Add run.sh with proper FOM output - Configure list.csv for target systems -- Test completed on FugakuLN" +- Test completed on Fugaku" # プッシュ git push origin add- @@ -522,7 +502,6 @@ git push origin add- - 性能指標: [FOMの説明] ### テスト済み環境 -- [x] FugakuLN (ログインノード) - [x] Fugaku (バッチジョブ) - [ ] MiyabiG - [ ] MiyabiC diff --git a/programs/LQCD_dw_solver/build.sh b/programs/LQCD_dw_solver/build.sh index 620b1bf..88b776e 100644 --- a/programs/LQCD_dw_solver/build.sh +++ b/programs/LQCD_dw_solver/build.sh @@ -61,11 +61,12 @@ case "$system" in cd - cp $BIN ../artifacts ;; - FugakuLN) - echo "touch $BIN (THIS IS a dummy)" - mkdir -p benchmark/domainwall/ - touch $BIN - ;; + # FugakuLN retired; previous LN dummy build kept for reference. + # FugakuLN) + # echo "touch $BIN (THIS IS a dummy)" + # mkdir -p benchmark/domainwall/ + # touch $BIN + # ;; MiyabiC|AVX512) cp Makefile_simd_avx512 Makefile make -j 8 lib diff --git a/programs/LQCD_dw_solver/list.csv b/programs/LQCD_dw_solver/list.csv index d3393c5..3e6b6c9 100644 --- a/programs/LQCD_dw_solver/list.csv +++ b/programs/LQCD_dw_solver/list.csv @@ -1,6 +1,5 @@ system,enable,nodes,numproc_node,nthreads,elapse Fugaku,yes,1,4,12,0:10:00 Fugaku,yes,12,4,12,0:10:00 -FugakuLN,no,12,4,12,0:10:00 MiyabiG,yes,1,1,2,0:10:00 MiyabiC,no,1,2,56,0:10:00 diff --git a/programs/LQCD_dw_solver/run.sh b/programs/LQCD_dw_solver/run.sh index 4484f68..8ea9e98 100644 --- a/programs/LQCD_dw_solver/run.sh +++ b/programs/LQCD_dw_solver/run.sh @@ -113,10 +113,11 @@ case "$system" in ;; esac ;; - FugakuLN ) - echo 'dummy call for CB test: LQCD-dw-solver' - echo FOM: 123 : 456 > $RESULT - ;; + # FugakuLN retired; previous LN dummy run kept for reference. + # FugakuLN ) + # echo 'dummy call for CB test: LQCD-dw-solver' + # echo FOM: 123 : 456 > $RESULT + # ;; MiyabiG ) # openacc cat main_template.yaml |sed -e "s/xxx_lattice_size_xxx/32,8,8,12/" -e "s/xxx_grid_size_xxx/1,1,1,1/" -e "s/xxx_number_of_thread_xxx/2/" > main.yaml diff --git a/programs/genesis-nonbonded-kernels/build.sh b/programs/genesis-nonbonded-kernels/build.sh index 72b7e5f..f2ba37c 100644 --- a/programs/genesis-nonbonded-kernels/build.sh +++ b/programs/genesis-nonbonded-kernels/build.sh @@ -35,14 +35,15 @@ case "$system" in archopt="" ;; - FugakuLN) - . /vol0004/apps/oss/spack/share/spack/setup-env.sh - spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 - comp=gfortran - dir="normal_${comp}_omp_dir" - version="-v" - archopt="MARCH=native" - ;; + # FugakuLN retired; previous LN build kept for reference. + # FugakuLN) + # . /vol0004/apps/oss/spack/share/spack/setup-env.sh + # spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 + # comp=gfortran + # dir="normal_${comp}_omp_dir" + # version="-v" + # archopt="MARCH=native" + # ;; esac for i in "${!name_list[@]}"; do diff --git a/programs/genesis-nonbonded-kernels/list.csv b/programs/genesis-nonbonded-kernels/list.csv index 059d85e..7de2fcc 100644 --- a/programs/genesis-nonbonded-kernels/list.csv +++ b/programs/genesis-nonbonded-kernels/list.csv @@ -1,4 +1,3 @@ system,enable,nodes,numproc_node,nthreads,elapse Fugaku,yes,1,1,6,0:10:00 -FugakuLN,no,1,1,6,0:10:00 FugakuCN,no,1,1,6,0:10:00 diff --git a/programs/genesis-nonbonded-kernels/run.sh b/programs/genesis-nonbonded-kernels/run.sh index a9726a5..ddca35f 100644 --- a/programs/genesis-nonbonded-kernels/run.sh +++ b/programs/genesis-nonbonded-kernels/run.sh @@ -58,7 +58,8 @@ fi cd - > /dev/null case "$system" in - Fugaku|FugakuCN|FugakuLN) + # FugakuLN retired; previous LN run shared this branch. + Fugaku|FugakuCN) mkdir -p ${resultsdir} #total_fom=0.0 export PARALLEL=${nthreads} diff --git a/programs/genesis/build.sh b/programs/genesis/build.sh index ca7bebe..1ca958f 100644 --- a/programs/genesis/build.sh +++ b/programs/genesis/build.sh @@ -263,17 +263,18 @@ case "$system" in version="--version" ;; - FugakuLN) - . /vol0004/apps/oss/spack/share/spack/setup-env.sh - spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 - spack load /bnrldb2 # openmpi@4.1.6 linux-rhel8-cascadelake - spack load /on6q3ar # openblas@0.3.34 linux-rhel8-cascadelake / gcc@13.2.0 - version="-v" - FC=mpif90 - CC=mpicc - LAPACK_LIBS="-L/vol0004/apps/oss/spack-v0.21/opt/spack/linux-rhel8-cascadelake/gcc-13.2.0/openblas-0.3.24-on6q3arf3iucukiz4tfai26noq3kz4a7/lib/ -lopenblas" - CONFIG_ARGS=(--enable-mixed "LAPACK_LIBS=$LAPACK_LIBS") - ;; + # FugakuLN retired; previous LN build kept for reference. + # FugakuLN) + # . /vol0004/apps/oss/spack/share/spack/setup-env.sh + # spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 + # spack load /bnrldb2 # openmpi@4.1.6 linux-rhel8-cascadelake + # spack load /on6q3ar # openblas@0.3.34 linux-rhel8-cascadelake / gcc@13.2.0 + # version="-v" + # FC=mpif90 + # CC=mpicc + # LAPACK_LIBS="-L/vol0004/apps/oss/spack-v0.21/opt/spack/linux-rhel8-cascadelake/gcc-13.2.0/openblas-0.3.24-on6q3arf3iucukiz4tfai26noq3kz4a7/lib/ -lopenblas" + # CONFIG_ARGS=(--enable-mixed "LAPACK_LIBS=$LAPACK_LIBS") + # ;; MiyabiG) configure_genesis_gh200_gpu "$system" GENESIS_MIYABIG none diff --git a/programs/genesis/list.csv b/programs/genesis/list.csv index d25424d..3d4bb1b 100644 --- a/programs/genesis/list.csv +++ b/programs/genesis/list.csv @@ -1,6 +1,5 @@ system,enable,nodes,numproc_node,nthreads,elapse Fugaku,yes,2,4,12,0:10:00 -FugakuLN,no,1,8,2,0:10:00 FugakuCN,no,1,8,2,0:10:00 MiyabiG,yes,1,8,9,0:10:00 RC_GH200,yes,1,8,9,0:10:00 diff --git a/programs/genesis/run.sh b/programs/genesis/run.sh index 3c7b763..5d317b9 100644 --- a/programs/genesis/run.sh +++ b/programs/genesis/run.sh @@ -474,16 +474,17 @@ case "$system" in [[ -f ./stdout.1.0 ]] && cp ./stdout.1.0 ${output} [[ -f ./stderr.1.0 ]] && cp ./stderr.1.0 ${stderr} ;; - FugakuLN) - . /vol0004/apps/oss/spack/share/spack/setup-env.sh - export LD_LIBRARY_PATH=/vol0004/apps/oss/spack-v0.21/opt/spack/linux-rhel8-cascadelake/gcc-13.2.0/openblas-0.3.24-on6q3arf3iucukiz4tfai26noq3kz4a7/lib/:${LD_LIBRARY_PATH} - spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 - spack load /bnrldb2 # openmpi@4.1.6 linux-rhel8-cascadelake - spack load /on6q3ar # openblas@0.3.34 linux-rhel8-cascadelake / gcc@13.2.0 - mpi_cmd="mpirun -n ${numproc}" - export OMP_NUM_THREADS=${nthreads} - ${mpi_cmd} ./${binary} ${input}.sub 2>&1 | tee ${output} - ;; + # FugakuLN retired; previous LN run kept for reference. + # FugakuLN) + # . /vol0004/apps/oss/spack/share/spack/setup-env.sh + # export LD_LIBRARY_PATH=/vol0004/apps/oss/spack-v0.21/opt/spack/linux-rhel8-cascadelake/gcc-13.2.0/openblas-0.3.24-on6q3arf3iucukiz4tfai26noq3kz4a7/lib/:${LD_LIBRARY_PATH} + # spack load /77gzpid # gcc@13.2.0 linux-rhel8-skylake_avx512 + # spack load /bnrldb2 # openmpi@4.1.6 linux-rhel8-cascadelake + # spack load /on6q3ar # openblas@0.3.34 linux-rhel8-cascadelake / gcc@13.2.0 + # mpi_cmd="mpirun -n ${numproc}" + # export OMP_NUM_THREADS=${nthreads} + # ${mpi_cmd} ./${binary} ${input}.sub 2>&1 | tee ${output} + # ;; MiyabiG) run_genesis_gh200_gpu "$system" GENESIS_MIYABIG none ;; diff --git a/programs/qws/build.sh b/programs/qws/build.sh index c4fe60e..5c53a16 100644 --- a/programs/qws/build.sh +++ b/programs/qws/build.sh @@ -19,19 +19,20 @@ case "$system" in FugakuCN) make -j 8 fugaku_benchmark= omp=1 compiler=fujitsu_native rdma= mpi=1 powerapi= profiler=${qws_profiler_tool} ;; - FugakuLN) - # Private repository access check (CI connectivity test) - git clone --depth 1 --filter=blob:none --sparse https://${GHYN}@github.com/RIKEN-RCCS/FS_Benchmarks.git - ls FS_Benchmarks - cd FS_Benchmarks - git sparse-checkout set QWS - ls QWS - cd .. - # QWS build (dummy for LN) - make -j 2 fugaku_benchmark= omp=1 compiler=gnu arch=skylake rdma= mpi= powerapi= - #gcc -v - ;; - AI4SS) + # FugakuLN retired; previous LN smoke build kept for reference. + # FugakuLN) + # # Private repository access check (CI connectivity test) + # git clone --depth 1 --filter=blob:none --sparse https://${GHYN}@github.com/RIKEN-RCCS/FS_Benchmarks.git + # ls FS_Benchmarks + # cd FS_Benchmarks + # git sparse-checkout set QWS + # ls QWS + # cd .. + # # QWS build (dummy for LN) + # make -j 2 fugaku_benchmark= omp=1 compiler=gnu arch=skylake rdma= mpi= powerapi= + # #gcc -v + # ;; + RIKYU) module load nvhpc-hpcx/26.3 make -j 8 omp=1 compiler=nvhpc-hpcx arch=grace rdma= mpi=1 ;; diff --git a/programs/qws/list.csv b/programs/qws/list.csv index 67135da..348916e 100644 --- a/programs/qws/list.csv +++ b/programs/qws/list.csv @@ -1,7 +1,6 @@ system,enable,nodes,numproc_node,nthreads,elapse -AI4SS,yes,1,1,72,0:10:00 +RIKYU,yes,1,1,36,0:10:00 Fugaku,yes,1,4,12,0:10:00 -FugakuLN,yes,1,1,1,0:10:00 FugakuCN,no,1,4,12,0:10:00 FugakuCN,no,2,4,12,0:10:00 RC_GH200,yes,1,1,72,0:10:00 diff --git a/programs/qws/run.sh b/programs/qws/run.sh index f5655b2..c0af626 100644 --- a/programs/qws/run.sh +++ b/programs/qws/run.sh @@ -75,14 +75,15 @@ case "$system" in ;; esac ;; - FugakuLN) - echo 'dummy call for CI test: QWS program: ./main 32 6 4 3 1 1 1 1 -1 -1 6 50' - bk_emit_result --fom 123.56 --fom-version dummy --exp CheckingPrivateRepo --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result - emit_qws_dummy_padata ../results/padata0.tgz - ;; - AI4SS) + # FugakuLN retired; previous LN smoke run kept for reference. + # FugakuLN) + # echo 'dummy call for CI test: QWS program: ./main 32 6 4 3 1 1 1 1 -1 -1 6 50' + # bk_emit_result --fom 123.56 --fom-version dummy --exp CheckingPrivateRepo --nodes "$nodes" --numproc-node "$numproc_node" --nthreads "$nthreads" >> ../results/result + # emit_qws_dummy_padata ../results/padata0.tgz + # ;; + RIKYU) module load nvhpc-hpcx/26.3 - export OMP_NUM_THREADS=72 + export OMP_NUM_THREADS="$nthreads" export OMP_PLACES=cores export OMP_PROC_BIND=close mpirun --bind-to none -n 1 ./main 32 6 4 3 1 1 1 1 -1 -1 6 50 > CASE0 diff --git a/programs/scale-letkf/list.csv b/programs/scale-letkf/list.csv index a5bcf60..e51db30 100644 --- a/programs/scale-letkf/list.csv +++ b/programs/scale-letkf/list.csv @@ -2,7 +2,6 @@ system,enable,nodes,numproc_node,nthreads,elapse Fugaku,yes,3,4,12,1:00:00 Fugaku,yes,75,4,12,1:00:00 RC_GH200,no,1,4,1,1:00:00 -FugakuLN,no,1,1,1,0:10:00 FugakuCN,no,1,4,12,0:10:00 FugakuCN,no,2,4,12,0:10:00 MiyabiG,no,1,1,72,0:10:00 diff --git a/result_server/tests/test_portal_list_templates.py b/result_server/tests/test_portal_list_templates.py index f796a0f..fa8f255 100644 --- a/result_server/tests/test_portal_list_templates.py +++ b/result_server/tests/test_portal_list_templates.py @@ -354,18 +354,18 @@ def test_usage_report_node_hours_table_uses_explicit_column_widths(): "usage_report.html", result={ "apps": ["genesis"], - "systems": ["AI4SS", "Fugaku"], + "systems": ["RIKYU", "Fugaku"], "periods": ["2026-04", "2026-05"], "available_fiscal_years": [2026], "table": { "genesis": { - "AI4SS": {"2026-04": 0.0, "2026-05": 0.0}, + "RIKYU": {"2026-04": 0.0, "2026-05": 0.0}, "Fugaku": {"2026-04": 1.23, "2026-05": 0.0}, } }, "row_totals": {"genesis": {"2026-04": 1.23, "2026-05": 0.0}}, "col_totals": { - "AI4SS": {"2026-04": 0.0, "2026-05": 0.0}, + "RIKYU": {"2026-04": 0.0, "2026-05": 0.0}, "Fugaku": {"2026-04": 1.23, "2026-05": 0.0}, }, "grand_totals": {"2026-04": 1.23, "2026-05": 0.0}, diff --git a/scripts/estimation/common.sh b/scripts/estimation/common.sh index 15d5461..c991c15 100644 --- a/scripts/estimation/common.sh +++ b/scripts/estimation/common.sh @@ -749,7 +749,7 @@ _bk_system_line() { local system_name="${1:-}" case "$system_name" in - Fugaku|FugakuCN|FugakuLN) + Fugaku|FugakuCN) echo "Fugaku" ;; MiyabiG|MiyabiC) diff --git a/scripts/test_submit.sh b/scripts/test_submit.sh index 0ff1edf..c8835e5 100644 --- a/scripts/test_submit.sh +++ b/scripts/test_submit.sh @@ -100,10 +100,6 @@ echo bash programs/$code/run.sh $system $nodes $numproc_node $nthreads >> script # --- システム別ジョブ投入 --- case "$system" in - FugakuLN) - echo "Notice: system=$system → submit test will NOT be performed." - exit 1 - ;; Fugaku|FugakuCN) echo pjsub -L rscunit=rscunit_ft01,rscgrp=$queue_group,node=$nodes,elapse=$elapse \ --mpi max-proc-per-node=$numproc_node \ @@ -224,7 +220,7 @@ case "$system" in qsub -q $queue_group --group=jh260034 -T necmpi --venode=$proc \ -l elapstim_req=${elapse} -v OMP_NUM_THREADS=${nthreads} script.sh ;; - AI4SS) + RIKYU) echo sbatch -p $queue_group -N $nodes -t $elapse --ntasks-per-node=${numproc_node} --cpus-per-task=$nthreads --gpus-per-node=${numproc_node} \ --wrap="bash programs/$code/run.sh $system $nodes $numproc_node $nthreads" sbatch -p $queue_group -N $nodes -t $elapse --ntasks-per-node=${numproc_node} --cpus-per-task=$nthreads --gpus-per-node=${numproc_node} \ @@ -250,7 +246,7 @@ case "$system" in ;; *) echo "Error: Unknown system '$system'" - echo "Supported systems: AI4SS, Fugaku, FugakuCN, FugakuLN, GenkaiA, GenkaiB, GenkaiC, Odyssey, Aquarius, Pegasus, Sirius, TSUBAME4, Camphor3, SQUID_CPU, SQUID_GPU, SQUID_VECTOR, OCTOPUS, Grand_C, Grand_G, AOBA_A, AOBA_B, AOBA_S, RC_GH200, RC_DGXSP, RC_GENOA, RC_FX700, MiyabiC, MiyabiG" + echo "Supported systems: RIKYU, Fugaku, FugakuCN, GenkaiA, GenkaiB, GenkaiC, Odyssey, Aquarius, Pegasus, Sirius, TSUBAME4, Camphor3, SQUID_CPU, SQUID_GPU, SQUID_VECTOR, OCTOPUS, Grand_C, Grand_G, AOBA_A, AOBA_B, AOBA_S, RC_GH200, RC_DGXSP, RC_GENOA, RC_FX700, MiyabiC, MiyabiG" exit 1 ;; esac