diff --git a/.buildkite/benchmarks/pipeline.yml b/.buildkite/benchmarks/pipeline.yml index f3e0423f63..3d67074b08 100644 --- a/.buildkite/benchmarks/pipeline.yml +++ b/.buildkite/benchmarks/pipeline.yml @@ -102,7 +102,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 4 + slurm_ntasks: 2 slurm_mem: 16GB - label: "GPU ClimaAtmos with diagnostic EDMF" @@ -115,7 +115,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 4 + slurm_ntasks: 2 slurm_mem: 16GB - label: "GPU AMIP with diagnostic EDMF" @@ -128,7 +128,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 4 + slurm_ntasks: 2 slurm_mem: 16GB - label: "GPU AMIP with diagnostic EDMF and IO" @@ -141,7 +141,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 4 + slurm_ntasks: 2 slurm_mem: 16GB - group: "Generate output table" diff --git a/experiments/ClimaEarth/user_io/benchmarks.jl b/experiments/ClimaEarth/user_io/benchmarks.jl index ff13225c67..e28f05beb7 100644 --- a/experiments/ClimaEarth/user_io/benchmarks.jl +++ b/experiments/ClimaEarth/user_io/benchmarks.jl @@ -177,15 +177,15 @@ run_info_atmos_diagedmf = get_run_info(parsed_args, "atmos_diagedmf") run_info_atmos = get_run_info(parsed_args, "atmos") # Set up info for PrettyTables.jl -headers = [build_id_str, "Horiz. res.: 30 elems", "CPU Run [64 processes]", "GPU Run [4 A100s]"] +headers = [build_id_str, "Horiz. res.: 30 elems", "CPU Run [64 processes]", "GPU Run [2 A100s]"] data = [ ["" "Vert. res.: 63 levels" "" ""] ["" "dt: 120secs" "" ""] ] # Append data to the table for each of the cases we want to compare -data = append_table_data(data, "Coupled", run_info_coupled...) -data = append_table_data(data, "Coupled with IO", run_info_coupled_io...) +data = append_table_data(data, "Coupled with diag. EDMF + IO", run_info_coupled_io...) +data = append_table_data(data, "Coupled with diag. EDMF", run_info_coupled...) data = append_table_data(data, "Atmos with diag. EDMF", run_info_atmos_diagedmf...) data = append_table_data(data, "Atmos without diag. EDMF", run_info_atmos...) @@ -196,5 +196,5 @@ table_output_dir = joinpath(output_dir, "compare_amip_climaatmos_$(cpu_job_id_co table_path = joinpath(table_output_dir, "table.txt") open(table_path, "w") do f # Output the table, including lines before and after the header - PrettyTables.pretty_table(f, data, header = headers, hlines = [0, 3, 6, 9, 12]) # TODO don't hardcode hlines + PrettyTables.pretty_table(f, data, header = headers, hlines = [0, 3, 6, 9, 12, 15]) end