WIP

CliMA · Jun 17, 2024 · 9a240a7 · 9a240a7
1 parent 5b7edcd
commit 9a240a7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 76 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -84,7 +84,6 @@ steps:
         timeout_in_minutes: 20
         env:
           CLIMACOMMS_CONTEXT: "MPI"
-          CLIMACORE_DISTRIBUTED: "MPI"
           NPROCS: 2
         agents:
           slurm_ntasks: 2
@@ -96,7 +95,6 @@ steps:
         timeout_in_minutes: 20
         env:
           CLIMACOMMS_CONTEXT: "MPI"
-          CLIMACORE_DISTRIBUTED: "MPI"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -107,7 +105,6 @@ steps:
         timeout_in_minutes: 20
         env:
           CLIMACOMMS_CONTEXT: "MPI"
-          CLIMACORE_DISTRIBUTED: "MPI"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -118,25 +115,20 @@ steps:
         timeout_in_minutes: 20
         env:
           CLIMACOMMS_CONTEXT: "MPI"
-          CLIMACORE_DISTRIBUTED: "MPI"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
 
       - label: "Perf flame graph diff tests"
         command: "julia --color=yes --project=perf/ perf/flame_test.jl --job_id flame_perf_target"
         timeout_in_minutes: 5
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 16GB
 
   - group: "GPU: unit tests and global bucket"
     steps:
       - label: "GPU runtests"
         command: "julia --color=yes --project=test/ test/runtests.jl"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_ntasks: 1
           slurm_gres: "gpu:1"
@@ -159,89 +151,69 @@ steps:
         key: "slabplanet_default"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_default.yml --job_id slabplanet_default"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_default_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: dry, no radiation"
         key: "slabplanet_dry_norad"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_dry_norad.yml --job_id slabplanet_dry_norad"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_dry_norad_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: default with Float32"
         key: "slabplanet_ft32"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_ft32.yml --job_id slabplanet_ft32"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_ft32_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: partitioned turbulent fluxes"
         key: "slabplanet_partitioned_fluxes"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_partitioned_fluxes.yml --job_id slabplanet_partitioned_fluxes"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_partitioned_fluxes_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: non-monotonous surface remap"
         key: "slabplanet_nonmono"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_nonmono.yml --job_id slabplanet_nonmono"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_nonmono_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from static map"
         key: "slabplanet_albedo_static_map"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_albedo_static_map.yml --job_id slabplanet_albedo_static_map"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_albedo_static_map_artifacts/total_energy*.png"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from temporal map"
         key: "slabplanet_albedo_temporal_map"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_albedo_temporal_map.yml --job_id slabplanet_albedo_temporal_map"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_albedo_temporal_map_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: albedo from function"
         key: "slabplanet_albedo_function"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_albedo_function.yml --job_id slabplanet_albedo_function"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_albedo_function_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: eisenman sea ice"
         key: "slabplanet_eisenman"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_eisenman.yml --job_id slabplanet_eisenman"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet_eisenman/slabplanet_eisenman_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Slabplanet: extra atmos diagnostics"
         key: "slabplanet_atmos_diags"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_atmos_diags.yml --job_id slabplanet_atmos_diags"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_atmos_diags_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -258,7 +230,6 @@ steps:
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/default_unthreaded.yml --job_id default_unthreaded"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/default_unthreaded_artifacts/*"
         env:
-          CLIMACOMMS_CONTEXT: "MPI"
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -268,16 +239,12 @@ steps:
       - label: ":rocket: Slabplanet: default (unthreaded) - flame graph and allocation tests"
         command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_default_unthreaded.yml --job_id perf_default_unthreaded"
         artifact_paths: "perf/output/perf_default_unthreaded/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: ":rocket: Slabplanet: default (unthreaded) - flame graph diff"
         command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_default_unthreaded.yml --job_id perf_diff_default_unthreaded"
         artifact_paths: "perf/output/perf_diff_default_unthreaded/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -288,16 +255,12 @@ steps:
       - label: "sea_breeze"
         command: "julia --color=yes --project=experiments/ClimaCore/sea_breeze experiments/ClimaCore/sea_breeze/run.jl"
         artifact_paths: "experiments/ClimaCore/sea_breeze/output/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "heat-diffusion"
         command: "julia --color=yes --project=experiments/ClimaCore/ experiments/ClimaCore/heat-diffusion/run.jl"
         artifact_paths: "experiments/ClimaCore/output/heat-diffusion_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -306,16 +269,12 @@ steps:
       - label: "Moist earth with slab surface - default: monin gray no_sponge idealinsol freq_dt_cpl"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/default_mono.yml --job_id default_mono"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/default_mono_artifacts/total_energy*.png"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Moist earth with slab surface - notmono: monin gray no_sponge idealinsol freq_dt_cpl notmono"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/default_notmono.yml --job_id default_notmono"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/default_notmono_artifacts/total_energy*.png"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -326,16 +285,12 @@ steps:
       - label: "Moist earth with slab surface - test: bulk allsky sponge realinsol infreq_dt_cpl"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/target_params_in_slab_test2.yml --job_id target_params_in_slab_test2"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/target_params_in_slab_test2_artifacts/total_energy*.png"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: "Moist earth with slab surface - test: monin gray sponge realinsol infreq_dt_cpl"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/target_params_in_slab_test3.yml --job_id target_params_in_slab_test3"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/target_params_in_slab_test3_artifacts/total_energy*.png"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -348,8 +303,6 @@ steps:
         key: "target_amip_albedo_function"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/target_amip_albedo_function.yml --job_id target_amip_albedo_function"
         artifact_paths: "experiments/ClimaEarth/output/amip/target_amip_albedo_function_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -358,7 +311,6 @@ steps:
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/coarse_single_ft64_hourly_checkpoints.yml --job_id coarse_single_ft64_hourly_checkpoints"
         artifact_paths: "experiments/ClimaEarth/output/amip/coarse_single_ft64_hourly_checkpoints_artifacts/*"
         env:
-          CLIMACOMMS_CONTEXT: "MPI"
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -370,7 +322,6 @@ steps:
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/coarse_single_ft64_hourly_checkpoints_co2.yml --job_id coarse_single_ft64_hourly_checkpoints_co2"
         artifact_paths: "experiments/ClimaEarth/output/amip/coarse_single_ft64_hourly_checkpoints_co2_artifacts/*"
         env:
-          CLIMACOMMS_CONTEXT: "MPI"
           FLAME_PLOT: ""
           BUILD_HISTORY_HANDLE: ""
         agents:
@@ -380,17 +331,13 @@ steps:
       - label: "AMIP - Float64 test"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/coarse_single_ft64.yml --job_id coarse_single_ft64"
         artifact_paths: "experiments/ClimaEarth/output/amip/coarse_single_ft64_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_ntasks: 1
           slurm_mem: 20GB
 
       - label: "AMIP - Float32 test"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/coarse_single_ft32.yml --job_id coarse_single_ft32"
         artifact_paths: "experiments/ClimaEarth/output/amip/coarse_single_ft32_artifacts/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_ntasks: 1
           slurm_mem: 20GB
@@ -401,7 +348,6 @@ steps:
         timeout_in_minutes: 240
         env:
           CLIMACOMMS_CONTEXT: "MPI"
-          CLIMACORE_DISTRIBUTED: "MPI"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -413,7 +359,6 @@ steps:
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/target_amip_n1_shortrun.yml --job_id target_amip_n1_shortrun"
         artifact_paths: "experiments/ClimaEarth/output/amip/target_amip_n1_shortrun_artifacts/*"
         env:
-          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_mem: 20GB
@@ -423,16 +368,12 @@ steps:
       - label: ":rocket: flame graph and allocation tests: perf_coarse_single_ft64"
         command: "julia --color=yes --project=perf perf/flame.jl --config_file $PERF_CONFIG_PATH/perf_coarse_single_ft64.yml --job_id perf_coarse_single_ft64"
         artifact_paths: "perf/output/perf_coarse_single_ft64/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
       - label: ":rocket: performance: flame graph diff: perf_diff_coarse_single_ft64"
         command: "julia --color=yes --project=perf perf/flame_diff.jl --config_file $PERF_CONFIG_PATH/perf_diff_coarse_single_ft64.yml --job_id perf_diff_coarse_single_ft64"
         artifact_paths: "perf/output/perf_diff_coarse_single_ft64/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -444,8 +385,6 @@ steps:
           - sed 's/t_end = "1000days"/t_end = "1days"/' experiments/ClimaEarth/run_dry_held_suarez.jl > experiments/ClimaEarth/run_dry_held_suarez_short.jl
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_dry_held_suarez_short.jl"
         artifact_paths:  "dry_held_suarez/dry_held_suarez/clima_atmos/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -455,8 +394,6 @@ steps:
           - sed 's/t_end = "1000days"/t_end = "1days"/' experiments/ClimaEarth/run_moist_held_suarez.jl > experiments/ClimaEarth/run_moist_held_suarez_short.jl
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_moist_held_suarez_short.jl"
         artifact_paths:  "moist_held_suarez/moist_held_suarez/clima_atmos/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -466,8 +403,6 @@ steps:
           - sed 's/t_end = "1000days"/t_end = "1days"/' experiments/ClimaEarth/run_cloudless_aquaplanet.jl > experiments/ClimaEarth/run_cloudless_aquaplanet_short.jl
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudless_aquaplanet_short.jl"
         artifact_paths:  "cloudless_aquaplanet/cloudless_aquaplanet/clima_atmos/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -477,8 +412,6 @@ steps:
           - sed 's/t_end = "1000days"/t_end = "1days"/' experiments/ClimaEarth/run_cloudy_aquaplanet.jl > experiments/ClimaEarth/run_cloudy_aquaplanet_short.jl
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudy_aquaplanet_short.jl"
         artifact_paths:  "cloudy_aquaplanet/cloudy_aquaplanet/clima_atmos/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -488,8 +421,6 @@ steps:
           - sed 's/t_end = "1000days"/t_end = "1days"/' experiments/ClimaEarth/run_cloudy_slabplanet.jl > experiments/ClimaEarth/run_cloudy_slabplanet_short.jl
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudy_slabplanet_short.jl"
         artifact_paths:  "cloudy_slabplanet/cloudy_slabplanet/clima_atmos/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 
@@ -499,8 +430,6 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/hierarchy/climate_plots.jl"
         artifact_paths:  "paper_figs/*"
-        env:
-          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_mem: 20GB
 

diff --git a/experiments/ClimaEarth/run_cloudy_aquaplanet.jl b/experiments/ClimaEarth/run_cloudy_aquaplanet.jl
@@ -17,9 +17,9 @@ import Dates
 import YAML
 
 # ## ClimaESM packages
-import ClimaAtmos as CA
 import ClimaComms
 @static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
+import ClimaAtmos as CA
 import ClimaCore as CC
 
 # ## Coupler specific imports

diff --git a/experiments/ClimaEarth/run_cloudy_slabplanet.jl b/experiments/ClimaEarth/run_cloudy_slabplanet.jl
@@ -17,8 +17,9 @@ import Dates
 import YAML
 
 # ## ClimaESM packages
-import ClimaAtmos as CA
 import ClimaComms
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
+import ClimaAtmos as CA
 import ClimaCore as CC
 
 # ## Coupler specific imports

diff --git a/experiments/ClimaEarth/run_dry_held_suarez.jl b/experiments/ClimaEarth/run_dry_held_suarez.jl
@@ -19,10 +19,10 @@ using Dates
 import YAML
 
 ## ClimaESM packages
-import ClimaAtmos as CA
-import ClimaCore
 using ClimaComms
 @static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
+import ClimaAtmos as CA
+import ClimaCore
 
 ## Coupler specific imports
 import ClimaCoupler

diff --git a/experiments/ClimaEarth/run_moist_held_suarez.jl b/experiments/ClimaEarth/run_moist_held_suarez.jl
@@ -20,8 +20,9 @@ import Dates
 import YAML
 
 # ## ClimaESM packages
-import ClimaAtmos as CA
 import ClimaComms
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
+import ClimaAtmos as CA
 import ClimaCore as CC
 
 # ## Coupler specific imports