From fb62070664a8227494ba3535823d316885846def Mon Sep 17 00:00:00 2001 From: Masahiro Nakao Date: Sat, 27 Apr 2024 19:50:16 +0900 Subject: [PATCH] name change spot from free --- ABINIT_MP/submit.yml.erb | 2 +- ALAMODE/submit.yml.erb | 2 +- AkaiKKR/submit.yml.erb | 2 +- Desktop/submit.yml.erb | 2 +- FDS/submit.yml.erb | 2 +- FFVHC-ACE/submit.yml.erb | 2 +- FrontFlow/submit.yml.erb | 2 +- FrontISTR/submit.yml.erb | 2 +- GENESIS/submit.yml.erb | 2 +- GROMACS/submit.yml.erb | 2 +- Gaussian/submit.yml.erb | 2 +- HPhi/submit.yml.erb | 2 +- Jupyter/submit.yml.erb | 2 +- LAMMPS/submit.yml.erb | 2 +- MODYLAS/submit.yml.erb | 2 +- NTChem/submit.yml.erb | 2 +- OpenFOAM/submit.yml.erb | 2 +- OpenMX/submit.yml.erb | 2 +- PHASE0/submit.yml.erb | 2 +- Paraview/submit.yml.erb | 2 +- Quantum_Espresso/submit.yml.erb | 2 +- RStudio/submit.yml.erb | 2 +- SALMON/submit.yml.erb | 2 +- SCALE/submit.yml.erb | 2 +- SMASH/submit.yml.erb | 2 +- VSCode/submit.yml.erb | 2 +- braket/submit.yml.erb | 2 +- job_submitter/submit.yml.erb | 2 +- mVMC/submit.yml.erb | 2 +- misc/accounting.sh | 29 -------- misc/utils.rb | 113 +++++++++++++------------------- 31 files changed, 73 insertions(+), 127 deletions(-) diff --git a/ABINIT_MP/submit.yml.erb b/ABINIT_MP/submit.yml.erb index 4ec05a9..b7063a4 100644 --- a/ABINIT_MP/submit.yml.erb +++ b/ABINIT_MP/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/ALAMODE/submit.yml.erb b/ALAMODE/submit.yml.erb index 2eae00b..3ff822c 100644 --- a/ALAMODE/submit.yml.erb +++ b/ALAMODE/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/AkaiKKR/submit.yml.erb b/AkaiKKR/submit.yml.erb index eab2e21..8028f26 100644 --- a/AkaiKKR/submit.yml.erb +++ b/AkaiKKR/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) -%> --- script: diff --git a/Desktop/submit.yml.erb b/Desktop/submit.yml.erb index 804a23a..71db14e 100644 --- a/Desktop/submit.yml.erb +++ b/Desktop/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) diff --git a/FDS/submit.yml.erb b/FDS/submit.yml.erb index 2857e71..9b089bc 100644 --- a/FDS/submit.yml.erb +++ b/FDS/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/FFVHC-ACE/submit.yml.erb b/FFVHC-ACE/submit.yml.erb index 4dd66f1..c5c03cf 100644 --- a/FFVHC-ACE/submit.yml.erb +++ b/FFVHC-ACE/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/FrontFlow/submit.yml.erb b/FrontFlow/submit.yml.erb index 4dee6a6..f53aad4 100644 --- a/FrontFlow/submit.yml.erb +++ b/FrontFlow/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/FrontISTR/submit.yml.erb b/FrontISTR/submit.yml.erb index 818fb17..28f9df4 100644 --- a/FrontISTR/submit.yml.erb +++ b/FrontISTR/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/GENESIS/submit.yml.erb b/GENESIS/submit.yml.erb index 72000e9..17e2b2e 100644 --- a/GENESIS/submit.yml.erb +++ b/GENESIS/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/GROMACS/submit.yml.erb b/GROMACS/submit.yml.erb index a806c6f..1020d1c 100644 --- a/GROMACS/submit.yml.erb +++ b/GROMACS/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/Gaussian/submit.yml.erb b/Gaussian/submit.yml.erb index 9510307..e7f17a5 100644 --- a/Gaussian/submit.yml.erb +++ b/Gaussian/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) -%> --- script: diff --git a/HPhi/submit.yml.erb b/HPhi/submit.yml.erb index 0c664e3..a42c08a 100644 --- a/HPhi/submit.yml.erb +++ b/HPhi/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/Jupyter/submit.yml.erb b/Jupyter/submit.yml.erb index 22a077d..ee18ab2 100644 --- a/Jupyter/submit.yml.erb +++ b/Jupyter/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) diff --git a/LAMMPS/submit.yml.erb b/LAMMPS/submit.yml.erb index c77effe..b7962d3 100644 --- a/LAMMPS/submit.yml.erb +++ b/LAMMPS/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/MODYLAS/submit.yml.erb b/MODYLAS/submit.yml.erb index 991dfb7..538c7f3 100644 --- a/MODYLAS/submit.yml.erb +++ b/MODYLAS/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/NTChem/submit.yml.erb b/NTChem/submit.yml.erb index 1da7c8c..9e2e2d5 100644 --- a/NTChem/submit.yml.erb +++ b/NTChem/submit.yml.erb @@ -3,7 +3,7 @@ added_fugaku_queues = submit_added_fugaku_queues() added_options = (working_dir_type == "working_dir_sharedtmp")? "--llio sharedtmp-size=80Gi" : NOT_USED - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/OpenFOAM/submit.yml.erb b/OpenFOAM/submit.yml.erb index ad75342..2e9b541 100644 --- a/OpenFOAM/submit.yml.erb +++ b/OpenFOAM/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/OpenMX/submit.yml.erb b/OpenMX/submit.yml.erb index 755c0c5..c702e7f 100644 --- a/OpenMX/submit.yml.erb +++ b/OpenMX/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/PHASE0/submit.yml.erb b/PHASE0/submit.yml.erb index b4f01c5..898e033 100644 --- a/PHASE0/submit.yml.erb +++ b/PHASE0/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/Paraview/submit.yml.erb b/Paraview/submit.yml.erb index 8c8ac2d..0d577b5 100644 --- a/Paraview/submit.yml.erb +++ b/Paraview/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) memory = submit_memory(queue, gpu1_memory, gpu2_memory, mem1_memory, mem2_memory, reserved_memory) -%> diff --git a/Quantum_Espresso/submit.yml.erb b/Quantum_Espresso/submit.yml.erb index 26e1346..be66f6b 100644 --- a/Quantum_Espresso/submit.yml.erb +++ b/Quantum_Espresso/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/RStudio/submit.yml.erb b/RStudio/submit.yml.erb index 6745de4..149eca9 100644 --- a/RStudio/submit.yml.erb +++ b/RStudio/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) diff --git a/SALMON/submit.yml.erb b/SALMON/submit.yml.erb index aa2b079..3f0d8be 100644 --- a/SALMON/submit.yml.erb +++ b/SALMON/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/SCALE/submit.yml.erb b/SCALE/submit.yml.erb index 756848b..9acd075 100644 --- a/SCALE/submit.yml.erb +++ b/SCALE/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/SMASH/submit.yml.erb b/SMASH/submit.yml.erb index 8f5ee37..2af9368 100644 --- a/SMASH/submit.yml.erb +++ b/SMASH/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/VSCode/submit.yml.erb b/VSCode/submit.yml.erb index d3c03d5..47e3f13 100644 --- a/VSCode/submit.yml.erb +++ b/VSCode/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) diff --git a/braket/submit.yml.erb b/braket/submit.yml.erb index bdba45b..af66e31 100644 --- a/braket/submit.yml.erb +++ b/braket/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, NOT_USED, NOT_USED, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = submit_nodes(queue, fugaku_small_nodes, NOT_USED, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, NOT_USED, fugaku_cd_portal_procs, fugaku_pt_procs) -%> diff --git a/job_submitter/submit.yml.erb b/job_submitter/submit.yml.erb index 2679815..1439f35 100644 --- a/job_submitter/submit.yml.erb +++ b/job_submitter/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) nodes = submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) procs = submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) cores = submit_cores(queue, gpu1_cores, gpu2_cores, mem1_cores, mem2_cores, reserved_cores) diff --git a/mVMC/submit.yml.erb b/mVMC/submit.yml.erb index d94c068..28d62c6 100644 --- a/mVMC/submit.yml.erb +++ b/mVMC/submit.yml.erb @@ -2,7 +2,7 @@ require '/var/www/ood/apps/sys/ondemand_fugaku/misc/utils.rb' added_fugaku_queues = submit_added_fugaku_queues() - hours = submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) + hours = submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, NOT_USED, NOT_USED, NOT_USED) nodes = (exec_file == "vmc.out")? submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) : 1 procs = (exec_file == "vmc.out")? submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) : 1 -%> diff --git a/misc/accounting.sh b/misc/accounting.sh index cdaa5be..d62071c 100644 --- a/misc/accounting.sh +++ b/misc/accounting.sh @@ -15,7 +15,6 @@ FREE_QUEUE_TMP=${ACCOUNTING_DIR}/free_queue.tmp ACCOUNTJ="/usr/local/bin/accountj" ACCOUNTD="/usr/local/bin/accountd" PJSTATA="/usr/local/bin/pjstata" -CHKLOWPRIORITY="/usr/local/bin/chklowpriority" REMOTE_SSH="" [ "$HOSTNAME" != "fn06sv04" ] && REMOTE_SSH="ssh login" YEAR=$(date +%Y) @@ -197,34 +196,6 @@ mkdir -p ${GROUP_DIR} ${HOME_DIR} rm ${INODE_TMP} } & -#============================================================================== -# 低優先度キュー -#============================================================================== -{ - # グループが低優先度キューを利用しているかどうかを調べる - su - ktool -c "${REMOTE_SSH} ${CHKLOWPRIORITY} -a -c" | tr -d '"' | tail -n +2 > ${FREE_QUEUE_TMP} - - # 上コマンドが失敗した時、ファイルがない時、中身が空の時にスクリプトを終了する - if [ $? -ne 0 -o ! -e ${FREE_QUEUE_TMP} -o ! -s ${FREE_QUEUE_TMP} ]; then - rm -f ${LOCKFILE} ${FREE_QUEUE_TMP} - exit 1 - fi - - # ファイルを一般ユーザが閲覧できないようにする - chown root:root ${FREE_QUEUE_TMP} - chmod 600 ${FREE_QUEUE_TMP} - - while read -r line; do - group=`echo $line | awk -F, '{print $3}'` - FILE=${GROUP_DIR}/${group}/free_queue.dat - echo "$line" | awk -F, '{print $8}' > ${FILE} - chmod 640 ${FILE} - chown root:${group} ${FILE} - done < ${FREE_QUEUE_TMP} - - rm ${FREE_QUEUE_TMP} -} & - #============================================================================== # 終了処理 #============================================================================== diff --git a/misc/utils.rb b/misc/utils.rb index 32d9087..65d698c 100644 --- a/misc/utils.rb +++ b/misc/utils.rb @@ -47,21 +47,6 @@ def get_groups_fdirs() return "'[" + dirs.chop + "]'" end -# Since the code becomes complicated when checking whether the free queue is available for each group, -# the free queue will be displayed in the user's selection item if one group can use the free queue. -def check_free_queue() - `groups`.split.each do |g| - file = ACC_GROUP_DIR + g + "/free_queue.dat" - if File.exist?(file) - File.open(file, 'r') do |l| - return true if l.gets.chomp == "ON" - end - end - end - - return false -end - def output_queue(option, value, cluster, elmts) tmp = " - [ \"" + option + "\", \"" + value + "\", data-set-cluster: " + cluster + ",\n" @@ -96,13 +81,13 @@ def _form_hours(name, min = NOT_DEFINED, max = NOT_DEFINED) if name == "fugaku_small" min = 1 if min == NOT_DEFINED max = 72 if max == NOT_DEFINED - elsif name == "fugaku_small_free" + elsif name == "fugaku_spot_small" min = 1 if min == NOT_DEFINED max = 12 if max == NOT_DEFINED elsif name == "fugaku_large" min = 1 if min == NOT_DEFINED max = 24 if max == NOT_DEFINED - elsif name == "fugaku_large_free" + elsif name == "fugaku_spot_large" min = 1 if min == NOT_DEFINED max = 12 if max == NOT_DEFINED elsif name == "prepost1" @@ -323,17 +308,9 @@ def get_fugaku_pt_resource(group, w_commas = true) return -1 # for debug end -def check_fugaku_pt() - `groups`.split.each do |g| - return true if get_fugaku_pt_resource(g, false) > 0 - end - - return false -end - def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) - hide_elmts = ["fugaku-small-hours", "fugaku-small-nodes", "fugaku-small-procs", "fugaku-small-free-hours"] - hide_elmts += ["fugaku-large-hours", "fugaku-large-nodes", "fugaku-large-procs", "fugaku-large-free-hours"] + hide_elmts = ["fugaku-small-hours", "fugaku-small-nodes", "fugaku-small-procs", "fugaku-spot-small-hours"] + hide_elmts += ["fugaku-large-hours", "fugaku-large-nodes", "fugaku-large-procs", "fugaku-spot-large-hours"] hide_elmts += ["fugaku-cd-portal-hours", "fugaku-cd-portal-nodes", "fugaku-cd-portal-procs"] hide_elmts += ["fugaku-pt-hours", "fugaku-pt-nodes", "fugaku-pt-procs"] hide_elmts += ["fugaku-group", "fugaku-statistical-info", "fugaku-llio", "fugaku-mode"] @@ -347,9 +324,9 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) end show_elmts_small = ["fugaku-small-hours", "fugaku-small-nodes", "fugaku-small-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info"] - show_elmts_small_free = ["fugaku-small-free-hours", "fugaku-small-nodes", "fugaku-small-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info"] + show_elmts_spot_small = ["fugaku-spot-small-hours", "fugaku-small-nodes", "fugaku-small-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info"] show_elmts_large = ["fugaku-large-hours", "fugaku-large-nodes", "fugaku-large-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info", "fugaku-llio"] - show_elmts_large_free = ["fugaku-large-hours-free", "fugaku-large-nodes", "fugaku-large-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info", "fugaku-llio"] + show_elmts_spot_large = ["fugaku-spot-large-hours", "fugaku-large-nodes", "fugaku-large-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info", "fugaku-llio"] show_elmts_cd_portal = ["fugaku-cd-portal-hours", "fugaku-cd-portal-nodes", "fugaku-cd-portal-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info"] show_elmts_fugaku_pt = ["fugaku-pt-hours", "fugaku-pt-nodes", "fugaku-pt-procs", "fugaku-group", "fugaku-mode", "fugaku-statistical-info", "fugaku-llio"] show_elmts_gpu1 = ["prepost1-hours", "gpu1-cores", "gpu1-memory", "gpus-per-node"] @@ -370,14 +347,12 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) options: EOF - enable_free_queue = check_free_queue() - enable_cd_portal = check_cd_portal() - enable_fugaku_pt = check_fugaku_pt() + enable_cd_portal = check_cd_portal() if name == "fugaku_small_and_prepost" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue - $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) + $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) @@ -389,7 +364,7 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) $attr << output_queue("prepost-ondemand-reserved", "ondemand-reserved", "prepost", hide_elmts - show_elmts_reserverd) ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_nodes("fugaku_small") ret << _form_procs("fugaku_small") ret << _form_hours("fugaku_cd_portal") @@ -416,16 +391,16 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) ret << _form_fugaku_statistical_info() elsif name == "fugaku_small" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue - $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) + $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) end ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_nodes("fugaku_small") ret << _form_procs("fugaku_small") ret << _form_hours("fugaku_cd_portal") @@ -439,25 +414,25 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) ret << _form_fugaku_statistical_info() elsif name == "fugaku_single" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue - $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) + $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) end ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_hours("fugaku_pt") ret << _form_fugaku_threads("") if enable_fugaku_threads ret << _form_fugaku_mode() ret << _form_fugaku_statistical_info() elsif name == "fugaku_single_and_prepost" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue - $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) + $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) @@ -469,7 +444,7 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) $attr << output_queue("prepost-ondemand-reserved", "ondemand-reserved", "prepost", hide_elmts - show_elmts_reserverd) ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_hours("fugaku_cd_portal") ret << _form_hours("fugaku_pt") ret << _form_hours("prepost1") @@ -490,22 +465,22 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) ret << _form_fugaku_statistical_info() elsif name == "fugaku_small_and_large" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) $attr << output_queue("fugaku-large", "large", "fugaku", hide_elmts - show_elmts_large) - $attr << output_queue("fugaku-large-free", "large-free", "fugaku", hide_elmts - show_elmts_large_free) if enable_free_queue + $attr << output_queue("fugaku-spot-large", "spot-large", "fugaku", hide_elmts - show_elmts_spot_large) $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) end ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_nodes("fugaku_small") ret << _form_procs("fugaku_small") ret << _form_hours("fugaku_large") - ret << _form_hours("fugaku_large_free") + ret << _form_hours("fugaku_spot_large") ret << _form_nodes("fugaku_large") ret << _form_procs("fugaku_large") ret << _form_hours("fugaku_cd_portal") @@ -566,11 +541,11 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) ret << _form_memory("reserved", 8, 32) else name == "all" $attr << output_queue("fugaku-small", "small", "fugaku", hide_elmts - show_elmts_small) - $attr << output_queue("fugaku-small-free", "small-free", "fugaku", hide_elmts - show_elmts_small_free) if enable_free_queue + $attr << output_queue("fugaku-spot-small", "spot-small", "fugaku", hide_elmts - show_elmts_spot_small) $attr << output_queue("fugaku-large", "large", "fugaku", hide_elmts - show_elmts_large) - $attr << output_queue("fugaku-large-free", "large-free", "fugaku", hide_elmts - show_elmts_large_free) if enable_free_queue + $attr << output_queue("fugaku-spot-large", "spot-large", "fugaku", hide_elmts - show_elmts_spot_large) $attr << output_queue("fugaku-cd-portal", "cd-portal", "fugaku", hide_elmts - show_elmts_cd_portal) if enable_cd_portal - $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) if enable_fugaku_pt + $attr << output_queue("fugaku-f-pt", "f-pt", "fugaku", hide_elmts - show_elmts_fugaku_pt) added_fugaku_queues.each do |i| ii = i.gsub("_", "-") $attr << output_queue(i, i, "fugaku", hide_elmts - ["#{ii}-hours", "#{ii}-nodes", "#{ii}-procs"]) @@ -582,11 +557,11 @@ def form_queue(name, enable_fugaku_threads = true, added_fugaku_queues = []) $attr << output_queue("prepost-ondemand-reserved", "ondemand-reserved", "prepost", hide_elmts -show_elmts_reserverd) ret << form_fugaku_group() ret << _form_hours("fugaku_small") - ret << _form_hours("fugaku_small_free") + ret << _form_hours("fugaku_spot_small") ret << _form_nodes("fugaku_small") ret << _form_procs("fugaku_small") ret << _form_hours("fugaku_large") - ret << _form_hours("fugaku_large_free") + ret << _form_hours("fugaku_spot_large") ret << _form_nodes("fugaku_large") ret << _form_procs("fugaku_large") ret << _form_hours("fugaku_cd_portal") @@ -1243,13 +1218,13 @@ def submit_added_fugaku_queues(keys = []) return queues end -def submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_large_hours, fugaku_large_free_hours, +def submit_hours(queue, fugaku_small_hours, fugaku_spot_small_hours, fugaku_large_hours, fugaku_spot_large_hours, fugaku_cd_portal_hours, fugaku_pt_hours, prepost1_hours, prepost2_hours, reserved_hours) return fugaku_small_hours if queue == "small" - return fugaku_small_free_hours if queue == "small-free" + return fugaku_spot_small_hours if queue == "spot-small" return fugaku_large_hours if queue == "large" - return fugaku_large_free_hours if queue == "large-free" + return fugaku_spot_large_hours if queue == "spot-large" return fugaku_cd_portal_hours if queue == "cd-portal" return fugaku_pt_hours if queue == "f-pt" return prepost1_hours if queue == "gpu1" or queue == "mem1" @@ -1261,8 +1236,8 @@ def submit_hours(queue, fugaku_small_hours, fugaku_small_free_hours, fugaku_larg def submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal_nodes, fugaku_pt_nodes) - return fugaku_small_nodes if queue == "small" or queue == "small-free" - return fugaku_large_nodes if queue == "large" or queue == "large-free" + return fugaku_small_nodes if queue == "small" or queue == "spot-small" + return fugaku_large_nodes if queue == "large" or queue == "spot-large" return fugaku_cd_portal_nodes if queue == "cd-portal" return fugaku_pt_nodes if queue == "f-pt" @@ -1271,8 +1246,8 @@ def submit_nodes(queue, fugaku_small_nodes, fugaku_large_nodes, fugaku_cd_portal def submit_procs(queue, fugaku_small_procs, fugaku_large_procs, fugaku_cd_portal_procs, fugaku_pt_procs) - return fugaku_small_procs if queue == "small" or queue == "small-free" - return fugaku_large_procs if queue == "large" or queue == "large-free" + return fugaku_small_procs if queue == "small" or queue == "spot-small" + return fugaku_large_procs if queue == "large" or queue == "spot-large" return fugaku_cd_portal_procs if queue == "cd-portal" return fugaku_pt_procs if queue == "f-pt" @@ -1304,7 +1279,7 @@ def submit_memory(queue, gpu1_memory, gpu2_memory, mem1_memory, mem2_memory, res def _submit_native_fugaku(queue, hours, nodes, procs, fugaku_group, fugaku_mode, fugaku_statistical_info, fugaku_statistical_path, added_fugaku_queues, added_options) ret = " native:\n" - if queue == "small" or queue == "small-free" or queue == "large" or queue == "large-free" or queue == "cd-portal" or queue == "f-pt" + if queue == "small" or queue == "spot-small" or queue == "large" or queue == "spot-large" or queue == "cd-portal" or queue == "f-pt" ret << " - -L elapse=#{hours}:00:00,node=#{nodes},jobenv=singularity --mpi proc=#{procs}\n" else # For added_fugaku_queues # q1 = {"procs" => q1_procs, "nodes" => q1_nodes, "hours" => q1_hours} @@ -1360,7 +1335,7 @@ def _submit_native_prepost(queue, hours, cores, memory, nodelist) def submit_native(queue, hours, nodes, procs, cores, memory, fugaku_group, fugaku_mode, fugaku_statistical_info, fugaku_statistical_path, nodelist, added_fugaku_queues, added_options) - if queue == "small" or queue == "small-free" or queue == "large" or queue == "large-free" or queue == "cd-portal" or queue == "f-pt" or added_fugaku_queues != NOT_USED + if queue == "small" or queue == "spot-small" or queue == "large" or queue == "spot-large" or queue == "cd-portal" or queue == "f-pt" or added_fugaku_queues != NOT_USED return _submit_native_fugaku(queue, hours, nodes, procs, fugaku_group, fugaku_mode, fugaku_statistical_info, fugaku_statistical_path, added_fugaku_queues, added_options) else @@ -1468,7 +1443,7 @@ def submit_env(threads, app_name = "", version = "") end def submit_fugaku_llio_exec_file(queue, nodes, procs, exec_file) - return if queue != "large" and queue != "large-free" + return if queue != "large" and queue != "spot-large" if nodes.to_i >= LLIO_LBOUND_NODES or procs.to_i >= LLIO_LBOUND_PROCS return "/usr/bin/llio_transfer " + "`which " + exec_file + "`" @@ -1476,7 +1451,7 @@ def submit_fugaku_llio_exec_file(queue, nodes, procs, exec_file) end def submit_fugaku_llio(queue, flag, target) # target is an input file or a working directory - return if queue != "large" and queue != "large-free" + return if queue != "large" and queue != "spot-large" if flag == "input_file" return "/usr/bin/llio_transfer " + target