Skip to content

Commit

Permalink
2 gpu ss sum before max [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
juliasloan25 committed Mar 8, 2024
1 parent 1f675c1 commit e8da583
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 39 deletions.
60 changes: 30 additions & 30 deletions .buildkite/gpu/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ steps:

- wait

# - group: "CHAP GPU strong scaling"
# steps:
- group: "CHAP GPU strong scaling"
steps:

# - label: "GPU AMIP CHAP - strong scaling - 1 GPU"
# key: "gpu_amip_chap"
Expand All @@ -56,20 +56,20 @@ steps:
# slurm_mem: 32G
# slurm_exclusive:

# - label: "GPU AMIP CHAP - strong scaling - 2 GPUs"
# key: "gpu_amip_chap_2process"
# command:
# - >
# srun --cpu-bind=threads --cpus-per-task=4
# julia --threads=3 --color=yes --project=experiments/AMIP experiments/AMIP/coupler_driver.jl
# --config_file $GPU_CONFIG_PATH/gpu_amip_chap_2process.yml
# artifact_paths: "gpu_amip_chap_2process/*"
# agents:
# slurm_gpus_per_task: 1
# slurm_cpus_per_task: 4
# slurm_ntasks: 2
# slurm_mem: 32G
# slurm_exclusive:
- label: "GPU AMIP CHAP - strong scaling - 2 GPUs"
key: "gpu_amip_chap_2process"
command:
- >
srun --cpu-bind=threads --cpus-per-task=4
julia --threads=3 --color=yes --project=experiments/AMIP experiments/AMIP/coupler_driver.jl
--config_file $GPU_CONFIG_PATH/gpu_amip_chap_2process.yml
artifact_paths: "gpu_amip_chap_2process/*"
agents:
slurm_gpus_per_task: 1
slurm_cpus_per_task: 4
slurm_ntasks: 2
slurm_mem: 32G
slurm_exclusive:

# - label: "GPU AMIP CHAP - strong scaling - 4 GPUs"
# key: "gpu_amip_chap_4process"
Expand All @@ -86,21 +86,21 @@ steps:
# slurm_mem: 32G
# slurm_exclusive:

- group: "CHAP GPU weak scaling"
steps:
# - group: "CHAP GPU weak scaling"
# steps:

- label: "GPU AMIP CHAP - weak scaling - 1 GPU"
key: "gpu_amip_chap_ws"
command:
- >
julia --threads=3 --color=yes --project=experiments/AMIP experiments/AMIP/coupler_driver.jl --config_file $GPU_CONFIG_PATH/gpu_amip_chap_ws.yml
artifact_paths: "gpu_amip_chap_ws/*"
agents:
slurm_gpus_per_task: 1
slurm_cpus_per_task: 4
slurm_ntasks: 1
slurm_mem: 32G
slurm_exclusive:
# - label: "GPU AMIP CHAP - weak scaling - 1 GPU"
# key: "gpu_amip_chap_ws"
# command:
# - >
# julia --threads=3 --color=yes --project=experiments/AMIP experiments/AMIP/coupler_driver.jl --config_file $GPU_CONFIG_PATH/gpu_amip_chap_ws.yml
# artifact_paths: "gpu_amip_chap_ws/*"
# agents:
# slurm_gpus_per_task: 1
# slurm_cpus_per_task: 4
# slurm_ntasks: 1
# slurm_mem: 32G
# slurm_exclusive:

# - label: "GPU AMIP CHAP - weak scaling - 2 GPUs"
# key: "gpu_amip_chap_ws_2process"
Expand Down
20 changes: 11 additions & 9 deletions src/Regridder.jl
Original file line number Diff line number Diff line change
Expand Up @@ -507,15 +507,17 @@ function update_surface_fractions!(cs::CoupledSimulation)
cs.surface_fractions.ice .= max.(min.(ice_d, FT(1) .- land_s), FT(0))
cs.surface_fractions.ocean .= max.(FT(1) .- (cs.surface_fractions.ice .+ land_s), FT(0))

# sf_sum = cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean
# if abs(minimum(sf_sum) - FT(1)) > eps(FT) || abs(maximum(sf_sum) - FT(1)) > eps(FT)
# @show cs.surface_fractions.ice
# @show cs.surface_fractions.land
# @show cs.surface_fractions.ocean
# @show cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean
# @show minimum(cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean)
# @show maximum(cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean)
# end
sf_sum = cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean
if abs(minimum(sf_sum) - FT(1)) > eps(FT) || abs(maximum(sf_sum) - FT(1)) > eps(FT)
@show minimum(FT(1) .- (cs.surface_fractions.ice .+ land_s))
@show maximum(FT(1) .- (cs.surface_fractions.ice .+ land_s))
# @show cs.surface_fractions.ice
# @show cs.surface_fractions.land
# @show cs.surface_fractions.ocean
# @show cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean
# @show minimum(cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean)
# @show maximum(cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean)
end
comms_ctx = axes(land_s).grid.topology.context
ClimaComms.barrier(comms_ctx)
@assert minimum(cs.surface_fractions.ice .+ cs.surface_fractions.land .+ cs.surface_fractions.ocean) FT(1)
Expand Down

0 comments on commit e8da583

Please sign in to comment.