update manifests

CliMA · Jun 17, 2024 · 4adfeb4 · 4adfeb4
1 parent 4da408f
commit 4adfeb4
Show file tree

Hide file tree

Showing 31 changed files with 1,099 additions and 352 deletions.
diff --git a/.buildkite/benchmarks/pipeline.yml b/.buildkite/benchmarks/pipeline.yml
@@ -48,6 +48,7 @@ steps:
         command: "srun julia --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $BENCHMARK_CONFIG_PATH/climaatmos.yml --job_id climaatmos"
         artifact_paths: "experiments/ClimaEarth/output/climaatmos/climaatmos_artifacts/*"
         env:
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
           CLIMACOMMS_DEVICE: "CPU"
         agents:
@@ -60,6 +61,7 @@ steps:
         command: "srun julia --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $BENCHMARK_CONFIG_PATH/climaatmos_diagedmf.yml --job_id climaatmos_diagedmf"
         artifact_paths: "experiments/ClimaEarth/output/climaatmos/climaatmos_diagedmf_artifacts/*"
         env:
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
           CLIMACOMMS_DEVICE: "CPU"
         agents:
@@ -72,6 +74,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $BENCHMARK_CONFIG_PATH/amip_diagedmf.yml --job_id amip_diagedmf"
         artifact_paths: "experiments/ClimaEarth/output/amip/amip_diagedmf_artifacts/*"
         env:
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
           CLIMACOMMS_DEVICE: "CPU"
         agents:
@@ -85,6 +88,9 @@ steps:
         key: "gpu_climaatmos"
         command: "srun julia --threads=3 --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $BENCHMARK_CONFIG_PATH/climaatmos.yml --job_id gpu_climaatmos"
         artifact_paths: "experiments/ClimaEarth/output/climaatmos/gpu_climaatmos_artifacts/*"
+        env:
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_gpus_per_task: 1
           slurm_cpus_per_task: 4
@@ -95,6 +101,9 @@ steps:
         key: "gpu_climaatmos_diagedmf"
         command: "srun julia --threads=3 --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $BENCHMARK_CONFIG_PATH/climaatmos_diagedmf.yml --job_id gpu_climaatmos_diagedmf"
         artifact_paths: "experiments/ClimaEarth/output/climaatmos/gpu_climaatmos_diagedmf_artifacts/*"
+        env:
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_gpus_per_task: 1
           slurm_cpus_per_task: 4
@@ -105,6 +114,9 @@ steps:
         key: "gpu_amip_diagedmf"
         command: "srun julia --threads=3 --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $BENCHMARK_CONFIG_PATH/amip_diagedmf.yml --job_id gpu_amip_diagedmf"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_diagedmf_artifacts/*"
+        env:
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_gpus_per_task: 1
           slurm_cpus_per_task: 4

diff --git a/.buildkite/hierarchies/pipeline.yml b/.buildkite/hierarchies/pipeline.yml
@@ -52,6 +52,8 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_dry_held_suarez.jl"
         artifact_paths:  "dry_held_suarez/dry_held_suarez/clima_atmos/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_mem: 20GB
@@ -62,6 +64,8 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_moist_held_suarez.jl"
         artifact_paths:  "moist_held_suarez/moist_held_suarez/clima_atmos/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_mem: 20GB
@@ -72,6 +76,8 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudless_aquaplanet.jl"
         artifact_paths:  "cloudless_aquaplanet/cloudless_aquaplanet/clima_atmos/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_mem: 20GB
@@ -82,6 +88,8 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudy_aquaplanet.jl"
         artifact_paths:  "cloudy_aquaplanet/cloudy_aquaplanet/clima_atmos/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_mem: 20GB
@@ -92,6 +100,8 @@ steps:
         command:
           - "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_cloudy_slabplanet.jl"
         artifact_paths:  "cloudy_slabplanet/cloudy_slabplanet/clima_atmos/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_mem: 20GB

diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
@@ -150,7 +150,7 @@ steps:
         artifact_paths: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean/*"
         env:
           BUILD_HISTORY_HANDLE: ""
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_ntasks_per_node: 16
           slurm_nodes: 4
@@ -162,7 +162,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_nocouple.yml --job_id slabplanet_aqua_target_nocouple"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet_aqua/slabplanet_aqua_target_nocouple_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -175,7 +175,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_aqua_target.yml --job_id slabplanet_aqua_target"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet_aqua/slabplanet_aqua_target_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -188,7 +188,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_evolve_ocn.yml --job_id slabplanet_aqua_target_evolve_ocn"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet_aqua/slabplanet_aqua_target_evolve_ocn_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -201,7 +201,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_target.yml --job_id slabplanet_target"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_target_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -214,7 +214,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_target_evolve_ocn.yml --job_id slabplanet_target_evolve_ocn"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/slabplanet_target_evolve_ocn_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -232,7 +232,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_target.yml --job_id amip_target"
         artifact_paths: "experiments/ClimaEarth/output/amip/amip_target_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -245,7 +245,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_target_topo.yml --job_id amip_target_topo"
         artifact_paths: "experiments/ClimaEarth/output/amip/amip_target_topo_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -258,7 +258,7 @@ steps:
         command: "srun julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/amip_target_topo_diagedmf_cpu.yml --job_id amip_target_topo_diagedmf_cpu"
         artifact_paths: "experiments/ClimaEarth/output/amip/amip_target_topo_diagedmf_cpu_artifacts/*"
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
           BUILD_HISTORY_HANDLE: ""
         agents:
           slurm_ntasks_per_node: 16
@@ -288,6 +288,7 @@ steps:
         timeout_in_minutes: 1440
         env:
           CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           queue: clima
           slurm_gpus_per_task: 1

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -83,7 +83,8 @@ steps:
         command: "srun julia --color=yes --project=test/ test/mpi_tests/regridder_mpi_tests.jl --config_file $CONFIG_PATH/regridder_mpi.yml"
         timeout_in_minutes: 20
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
           NPROCS: 2
         agents:
           slurm_ntasks: 2
@@ -94,7 +95,8 @@ steps:
         command: "srun julia --color=yes --project=test/ test/mpi_tests/bcreader_mpi_tests.jl --job_id bcreader_mpi"
         timeout_in_minutes: 20
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA" 
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -104,7 +106,8 @@ steps:
         command: "srun julia --color=yes --project=test/ test/mpi_tests/checkpointer_mpi_tests.jl --job_id checkpointer_mpi"
         timeout_in_minutes: 20
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -114,7 +117,8 @@ steps:
         command: "srun julia --color=yes --project=test/ test/utilities_tests.jl --job_id utilities_mpi"
         timeout_in_minutes: 20
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_CONTEXT: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -347,7 +351,8 @@ steps:
         artifact_paths: "experiments/ClimaEarth/output/amip/coarse_mpi_n2_artifacts/*"
         timeout_in_minutes: 240
         env:
-          CLIMACORE_DISTRIBUTED: "MPI"
+          CLIMACOMMS_DEVICE: "CUDA"
+          CLIMACOMMS_CONTEXT: "MPI"
         agents:
           slurm_ntasks: 2
           slurm_mem: 16GB
@@ -403,7 +408,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/*"
-
         agents:
           slurm_mem: 20GB
 
@@ -413,7 +417,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/*"
-
         agents:
           slurm_mem: 20GB
 
@@ -423,7 +426,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/*"
-
         agents:
           slurm_mem: 20GB
 
@@ -443,6 +445,8 @@ steps:
         key: "gpu_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 gpu_slabplanet_albedo_function"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/gpu_slabplanet_albedo_function_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -451,6 +455,8 @@ steps:
         key: "gpu_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 gpu_slabplanet_albedo_static_map"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/gpu_slabplanet_albedo_static_map_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -459,6 +465,8 @@ steps:
         key: "gpu_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 gpu_slabplanet_albedo_temporal_map"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/gpu_slabplanet_albedo_temporal_map_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -467,6 +475,8 @@ steps:
         key: "gpu_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 gpu_slabplanet_atmos_diags"
         artifact_paths: "experiments/ClimaEarth/output/slabplanet/gpu_slabplanet_atmos_diags_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -476,6 +486,8 @@ steps:
         key: "gpu_amip_albedo_function"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_albedo_function.yml --job_id gpu_amip_albedo_function"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_albedo_function_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -484,6 +496,8 @@ steps:
         key: "gpu_amip_target_topo_diagedmf_shortrun"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_target_topo_diagedmf_shortrun.yml --job_id gpu_amip_target_topo_diagedmf_shortrun"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_target_topo_diagedmf_shortrun_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -492,6 +506,8 @@ steps:
         key: "gpu_amip_albedo_static_map"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_albedo_static_map.yml --job_id gpu_amip_albedo_static_map"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_albedo_static_map_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1
@@ -500,6 +516,8 @@ steps:
         key: "gpu_amip_albedo_temporal_map"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/gpu_amip_albedo_temporal_map.yml --job_id gpu_amip_albedo_temporal_map"
         artifact_paths: "experiments/ClimaEarth/output/amip/gpu_amip_albedo_temporal_map_artifacts/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_mem: 20GB
           slurm_gpus: 1

diff --git a/Project.toml b/Project.toml
@@ -22,7 +22,7 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 
 [compat]
 CUDA = "5"
-ClimaComms = "0.5.6"
+ClimaComms = "0.5.6, 0.6"
 ClimaCore = "0.14.6"
 ClimaCoreTempestRemap = "0.3"
 Dates = "1"