From 53d8bb40e15bd441fe9576244478fcdb222a51f8 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Tue, 19 Mar 2024 17:56:10 -0700 Subject: [PATCH 1/3] add coupler output summary table --- .buildkite/benchmarks/README.md | 47 ++ .buildkite/benchmarks/pipeline.yml | 108 +++ .buildkite/longruns/pipeline.yml | 7 +- .buildkite/pipeline.yml | 5 +- Project.toml | 2 + config/benchmark_configs/amip_diagedmf.yml | 16 + .../benchmark_configs/climaatmos_diagedmf.yml | 30 + .../benchmark_configs/gpu_amip_diagedmf.yml | 16 + .../gpu_climaatmos_diagedmf.yml | 30 + .../coarse_mpi_n2.yml | 0 .../coarse_single_ft32.yml | 0 .../coarse_single_ft64.yml | 0 .../coarse_single_ft64_hourly_checkpoints.yml | 0 ...rse_single_ft64_hourly_checkpoints_co2.yml | 0 ...single_ft64_hourly_checkpoints_restart.yml | 0 .../default_mono.yml | 0 .../default_notmono.yml | 0 .../default_unthreaded.yml | 0 .../gpu_amip_albedo_function.yml | 0 .../gpu_amip_albedo_static_map.yml | 0 .../gpu_amip_albedo_temporal_map.yml | 0 ...gpu_amip_target_topo_diagedmf_shortrun.yml | 0 .../gpu_slabplanet_albedo_function.yml | 0 .../gpu_slabplanet_albedo_static_map.yml | 0 .../gpu_slabplanet_albedo_temporal_map.yml | 0 .../interactive_debug.yml | 0 .../regridder_mpi.yml | 0 .../slabplanet_albedo_function.yml | 0 .../slabplanet_albedo_static_map.yml | 0 .../slabplanet_albedo_temporal_map.yml | 0 .../slabplanet_atmos_diags.yml | 0 .../slabplanet_default.yml | 0 .../slabplanet_dry_norad.yml | 0 .../slabplanet_eisenman.yml | 0 .../slabplanet_ft32.yml | 0 .../slabplanet_nonmono.yml | 0 .../slabplanet_partitioned_fluxes.yml | 0 .../target_amip_albedo_function.yml | 0 .../target_amip_n1_shortrun.yml | 0 .../target_params_in_slab_test2.yml | 0 .../target_params_in_slab_test3.yml | 0 ...arget.yml => gpu_longrun_amip_dyamond.yml} | 4 +- experiments/AMIP/Manifest.toml | 4 +- experiments/AMIP/coupler_driver.jl | 55 +- experiments/AMIP/user_io/benchmarks.jl | 156 ++++ experiments/ClimaCore/Manifest.toml | 573 +++------------ experiments/ClimaCore/Project.toml | 4 +- .../ClimaCore/sea_breeze/Manifest.toml | 695 +++++------------- perf/Manifest.toml | 220 +++--- perf/flame.jl | 2 +- perf/flame_diff.jl | 2 +- src/Utilities.jl | 19 + test/Project.toml | 2 + .../climaatmos_standalone/atmos_driver.jl | 71 +- test/mpi_tests/local_checks.sh | 2 +- toml/diagnostic_edmfx_box.toml | 20 + 56 files changed, 955 insertions(+), 1135 deletions(-) create mode 100644 .buildkite/benchmarks/README.md create mode 100644 .buildkite/benchmarks/pipeline.yml create mode 100644 config/benchmark_configs/amip_diagedmf.yml create mode 100644 config/benchmark_configs/climaatmos_diagedmf.yml create mode 100644 config/benchmark_configs/gpu_amip_diagedmf.yml create mode 100644 config/benchmark_configs/gpu_climaatmos_diagedmf.yml rename config/{model_configs => ci_configs}/coarse_mpi_n2.yml (100%) rename config/{model_configs => ci_configs}/coarse_single_ft32.yml (100%) rename config/{model_configs => ci_configs}/coarse_single_ft64.yml (100%) rename config/{model_configs => ci_configs}/coarse_single_ft64_hourly_checkpoints.yml (100%) rename config/{model_configs => ci_configs}/coarse_single_ft64_hourly_checkpoints_co2.yml (100%) rename config/{model_configs => ci_configs}/coarse_single_ft64_hourly_checkpoints_restart.yml (100%) rename config/{model_configs => ci_configs}/default_mono.yml (100%) rename config/{model_configs => ci_configs}/default_notmono.yml (100%) rename config/{model_configs => ci_configs}/default_unthreaded.yml (100%) rename config/{model_configs => ci_configs}/gpu_amip_albedo_function.yml (100%) rename config/{model_configs => ci_configs}/gpu_amip_albedo_static_map.yml (100%) rename config/{model_configs => ci_configs}/gpu_amip_albedo_temporal_map.yml (100%) rename config/{model_configs => ci_configs}/gpu_amip_target_topo_diagedmf_shortrun.yml (100%) rename config/{model_configs => ci_configs}/gpu_slabplanet_albedo_function.yml (100%) rename config/{model_configs => ci_configs}/gpu_slabplanet_albedo_static_map.yml (100%) rename config/{model_configs => ci_configs}/gpu_slabplanet_albedo_temporal_map.yml (100%) rename config/{model_configs => ci_configs}/interactive_debug.yml (100%) rename config/{mpi_configs => ci_configs}/regridder_mpi.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_albedo_function.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_albedo_static_map.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_albedo_temporal_map.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_atmos_diags.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_default.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_dry_norad.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_eisenman.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_ft32.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_nonmono.yml (100%) rename config/{model_configs => ci_configs}/slabplanet_partitioned_fluxes.yml (100%) rename config/{model_configs => ci_configs}/target_amip_albedo_function.yml (100%) rename config/{model_configs => ci_configs}/target_amip_n1_shortrun.yml (100%) rename config/{model_configs => ci_configs}/target_params_in_slab_test2.yml (100%) rename config/{model_configs => ci_configs}/target_params_in_slab_test3.yml (100%) rename config/longrun_configs/{gpu_dyamond_target.yml => gpu_longrun_amip_dyamond.yml} (83%) create mode 100644 experiments/AMIP/user_io/benchmarks.jl create mode 100644 toml/diagnostic_edmfx_box.toml diff --git a/.buildkite/benchmarks/README.md b/.buildkite/benchmarks/README.md new file mode 100644 index 0000000000..4367f2debe --- /dev/null +++ b/.buildkite/benchmarks/README.md @@ -0,0 +1,47 @@ +## ClimaCoupler Benchmarks Pipeline + +### Purpose +The goal of the benchmarks pipeline is to have concrete comparisons between +analogous simulations of different setups and on different architectures. +This allows us to compare things like performance and allocations across +atmosphere-only vs coupled runs, and on CPU vs GPU. + +This pipeline is triggered manually rather than on a schedule, so that we +can monitor the various metrics after specific changes made to the code. + +### Simulation Setups +#### All simulations +- Timestep: 120 seconds +- Horizontal resolution: 30 spectral elements (~110km) +- Vertical resolution: 63 levels +- Config setup duplicated from ClimaAtmos.jl v0.23.0 +[gpu_aquaplanet_diagedmf.yml](https://github.com/CliMA/ClimaAtmos.jl/blob/v0.23.0/config/gpu_configs/gpu_aquaplanet_diagedmf.yml), +with minor tweaks + +#### CPU ClimaAtmos with diagnostic EDMF +- Atmosphere-only simulation +- Run on 64 CPU threads + +#### CPU AMIP with diagnostic EDMF +- ClimaAtmos coupled to ClimaLand bucket model, with prescribed sea surface +temperature and sea ice +- Run on 64 CPU threads + +#### GPU ClimaAtmos with diagnostic EDMF +- Atmosphere-only simulation +- Run on 4 A100 GPUs sharing 1 node + +#### GPU AMIP with diagnostic EDMF +- ClimaAtmos coupled to ClimaLand bucket model, with prescribed sea surface +temperature and sea ice +- Run on 4 A100 GPUs sharing 1 node + +### Comparison Metrics +- Simulated years per day (SYPD): The number of years of simulation time we +can run in 1 day of walltime +- CPU simulation object allocations: The allocations in GB of the simulation +object, which contains everything needed to run the simulation. +In the atmosphere-only case, this is the `AtmosSimulation` object. +In the coupled case, this is the `CoupledSimulation` object, which includes +all of the component models, coupler fields, and auxiliary objects. More +information on this object can be found in the `Interfacer` docs. diff --git a/.buildkite/benchmarks/pipeline.yml b/.buildkite/benchmarks/pipeline.yml new file mode 100644 index 0000000000..8f25f9cef9 --- /dev/null +++ b/.buildkite/benchmarks/pipeline.yml @@ -0,0 +1,108 @@ +agents: + queue: clima + slurm_time: 24:00:00 + modules: common + +env: + JULIA_NVTX_CALLBACKS: gc + OPENBLAS_NUM_THREADS: 1 + OMPI_MCA_opal_warn_on_missing_libcuda: 0 + SLURM_KILL_BAD_EXIT: 1 + SLURM_GRES_FLAGS: "allow-task-sharing" + BENCHMARK_CONFIG_PATH: "config/benchmark_configs" + +steps: + - label: "init :GPU:" + key: "init_gpu_env" + command: + - echo "--- Instantiate experiments/AMIP" + - julia --project=experiments/AMIP -e 'using Pkg; Pkg.instantiate(;verbose=true)' + - julia --project=experiments/AMIP -e 'using Pkg; Pkg.precompile()' + - julia --project=experiments/AMIP -e 'using Pkg; Pkg.status()' + + - echo "--- Instantiate test env" + - "julia --project=test/ -e 'using Pkg; Pkg.develop(path=\".\")'" + - "julia --project=test/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'" + - "julia --project=test/ -e 'using Pkg; Pkg.precompile()'" + - "julia --project=test/ -e 'using Pkg; Pkg.status()'" + + - echo "--- Download artifacts" + - "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'" + - "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'" + - "julia --project=artifacts -e 'using Pkg; Pkg.status()'" + - "julia --project=artifacts artifacts/download_artifacts.jl" + + agents: + slurm_gpus: 1 + slurm_cpus_per_task: 8 + env: + JULIA_NUM_PRECOMPILE_TASKS: 8 + JULIA_MAX_NUM_PRECOMPILE_FILES: 50 + + - wait + + - group: "CPU benchmarks" + steps: + - label: "CPU ClimaAtmos with diagnostic EDMF" + key: "climaatmos_diagedmf" + command: "srun julia --color=yes --project=test/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file $BENCHMARK_CONFIG_PATH/climaatmos_diagedmf.yml" + artifact_paths: "experiments/AMIP/output/climaatmos/climaatmos_diagedmf_artifacts/*" + env: + BUILD_HISTORY_HANDLE: "" + CLIMACOMMS_DEVICE: "CPU" + agents: + slurm_ntasks_per_node: 64 + slurm_nodes: 1 + slurm_mem_per_cpu: 4GB + + - label: "CPU AMIP with diagnostic EDMF" + key: "amip_diagedmf" + command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $BENCHMARK_CONFIG_PATH/amip_diagedmf.yml" + artifact_paths: "experiments/AMIP/output/amip/amip_diagedmf_artifacts/*" + env: + BUILD_HISTORY_HANDLE: "" + CLIMACOMMS_DEVICE: "CPU" + agents: + slurm_ntasks_per_node: 64 + slurm_nodes: 1 + slurm_mem_per_cpu: 4GB + + - group: "GPU benchmarks" + steps: + - label: "GPU ClimaAtmos with diagnostic EDMF" + 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/gpu_climaatmos_diagedmf.yml" + artifact_paths: "experiments/AMIP/output/climaatmos/gpu_climaatmos_diagedmf_artifacts/*" + agents: + slurm_gpus_per_task: 1 + slurm_cpus_per_task: 4 + slurm_ntasks: 2 + slurm_mem: 16GB + + - label: "GPU AMIP with diagnostic EDMF" + key: "gpu_amip_diagedmf" + command: "srun julia --threads=3 --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $BENCHMARK_CONFIG_PATH/gpu_amip_diagedmf.yml" + artifact_paths: "experiments/AMIP/output/amip/gpu_amip_diagedmf_artifacts/*" + agents: + slurm_gpus_per_task: 1 + slurm_cpus_per_task: 4 + slurm_ntasks: 2 + slurm_mem: 16GB + + - group: "Generate output table" + steps: + - label: "Compare AMIP/Atmos-only with diagnostic EDMF" + key: "compare_amip_climaatmos_amip_diagedmf" + command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/user_io/benchmarks.jl --cpu_run_name_coupled amip_diagedmf --cpu_run_name_atmos climaatmos_diagedmf --gpu_run_name_coupled gpu_amip_diagedmf --gpu_run_name_atmos gpu_climaatmos_diagedmf --mode_name amip --build_id $BUILDKITE_BUILD_NUMBER" + artifact_paths: "experiments/AMIP/output/compare_amip_climaatmos_amip_diagedmf/*" + depends_on: + - "climaatmos_diagedmf" + - "amip_diagedmf" + - "gpu_climaatmos_diagedmf" + - "gpu_amip_diagedmf" + + - label: ":envelope: Slack report: CPU/GPU AMIP/Atmos-only table" + depends_on: + - "compare_amip_climaatmos_amip_diagedmf" + command: + - slack-upload -c "#coupler-report" -f experiments/AMIP/output/compare_amip_climaatmos_amip_diagedmf/table.txt -m txt -n compare_amip_climaatmos_amip_diagedmf_table -x "Coupler CPU/GPU Comparison Table" diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml index 2df3228ce7..ee0cad1359 100644 --- a/.buildkite/longruns/pipeline.yml +++ b/.buildkite/longruns/pipeline.yml @@ -11,7 +11,6 @@ env: JULIA_MAX_NUM_PRECOMPILE_FILES: 100 GKSwstype: 100 SLURM_KILL_BAD_EXIT: 1 - CONFIG_PATH: "config/longrun_configs" timeout_in_minutes: 1440 @@ -300,11 +299,11 @@ steps: # DYAMOND AMIP: 1 day (convection resolving) - label: "GPU AMIP SUPERFINE: dyamond_target" - key: "gpu_dyamond_target" + key: "gpu_longrun_amip_dyamond" command: - echo "--- Run simulation" - - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_dyamond_target.yml" - artifact_paths: "experiments/AMIP/output/amip/gpu_dyamond_target_artifacts/*" + - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_longrun_amip_dyamond.yml" + artifact_paths: "experiments/AMIP/output/amip/gpu_longrun_amip_dyamond_artifacts/*" agents: queue: clima slurm_mem: 20GB diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 989b8c2bcf..15536eb5fb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -13,9 +13,8 @@ env: GKSwstype: 100 SLURM_KILL_BAD_EXIT: 1 - CONFIG_PATH: "config/model_configs" + CONFIG_PATH: "config/ci_configs" PERF_CONFIG_PATH: "config/perf_configs" - MPI_CONFIG_PATH: "config/mpi_configs" timeout_in_minutes: 240 @@ -81,7 +80,7 @@ steps: steps: - label: "MPI Regridder unit tests" key: "regridder_mpi_tests" - command: "srun julia --color=yes --project=test/ test/mpi_tests/regridder_mpi_tests.jl --config_file $MPI_CONFIG_PATH/regridder_mpi.yml" + 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" diff --git a/Project.toml b/Project.toml index 2480bbedac..25b6f577af 100644 --- a/Project.toml +++ b/Project.toml @@ -4,6 +4,7 @@ authors = ["CliMA Contributors "] version = "0.0.1" [deps] +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884" ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70" @@ -23,6 +24,7 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" ClimaComms = "0.5.6" ClimaCore = "0.13" ClimaCoreTempestRemap = "0.3" +CUDA = "5" Dates = "1" DocStringExtensions = "0.8, 0.9" JLD2 = "0.4" diff --git a/config/benchmark_configs/amip_diagedmf.yml b/config/benchmark_configs/amip_diagedmf.yml new file mode 100644 index 0000000000..ac3670b15a --- /dev/null +++ b/config/benchmark_configs/amip_diagedmf.yml @@ -0,0 +1,16 @@ +FLOAT_TYPE: "Float32" +anim: false +atmos_config_file: "config/gpu_configs/gpu_aquaplanet_diagedmf.yml" +dt_cpl: 120 +dt_save_state_to_disk: "Inf" +dt_save_to_sol: "Inf" +energy_check: false +job_id: "amip_diagedmf" +land_albedo_type: "map_temporal" +mode_name: "amip" +mono_surface: false +monthly_checkpoint: false +run_name: "amip_diagedmf" +start_date: "19790301" +t_end: "12hours" +turb_flux_partition: "CombinedStateFluxes" diff --git a/config/benchmark_configs/climaatmos_diagedmf.yml b/config/benchmark_configs/climaatmos_diagedmf.yml new file mode 100644 index 0000000000..c473d8a8e0 --- /dev/null +++ b/config/benchmark_configs/climaatmos_diagedmf.yml @@ -0,0 +1,30 @@ +FLOAT_TYPE: "Float32" +approximate_linear_solve_iters: 2 +dt: 120secs +dt_cloud_fraction: 1hours +dt_rad: 1hours +dt_save_state_to_disk: "Inf" +dt_save_to_sol: "Inf" +dz_bottom: 30.0 +dz_top: 3000.0 +edmfx_detr_model: "Generalized" +edmfx_entr_model: "Generalized" +edmfx_nh_pressure: true +edmfx_sgs_diffusive_flux: true +edmfx_sgs_mass_flux: true +edmfx_upwinding: first_order +h_elem: 30 +idealized_insolation: false +implicit_diffusion: true +job_id: "climaatmos_diagedmf" +moist: equil +output_default_diagnostics: false +precip_model: 0M +prognostic_tke: true +rad: allskywithclear +surface_setup: DefaultMoninObukhov +t_end: 12hours +toml: [toml/diagnostic_edmfx_box.toml] +turbconv: diagnostic_edmfx +z_elem: 63 +z_max: 55000.0 diff --git a/config/benchmark_configs/gpu_amip_diagedmf.yml b/config/benchmark_configs/gpu_amip_diagedmf.yml new file mode 100644 index 0000000000..a3b528f579 --- /dev/null +++ b/config/benchmark_configs/gpu_amip_diagedmf.yml @@ -0,0 +1,16 @@ +FLOAT_TYPE: "Float32" +anim: false +atmos_config_file: "config/gpu_configs/gpu_aquaplanet_diagedmf.yml" +dt_cpl: 120 +dt_save_state_to_disk: "Inf" +dt_save_to_sol: "Inf" +energy_check: false +job_id: "gpu_amip_diagedmf" +land_albedo_type: "map_temporal" +mode_name: "amip" +mono_surface: false +monthly_checkpoint: false +run_name: "gpu_amip_diagedmf" +start_date: "19790301" +t_end: "12hours" +turb_flux_partition: "CombinedStateFluxes" diff --git a/config/benchmark_configs/gpu_climaatmos_diagedmf.yml b/config/benchmark_configs/gpu_climaatmos_diagedmf.yml new file mode 100644 index 0000000000..8cb3974b89 --- /dev/null +++ b/config/benchmark_configs/gpu_climaatmos_diagedmf.yml @@ -0,0 +1,30 @@ +FLOAT_TYPE: "Float32" +approximate_linear_solve_iters: 2 +dt: 120secs +dt_cloud_fraction: 1hours +dt_rad: 1hours +dt_save_state_to_disk: "Inf" +dt_save_to_sol: "Inf" +dz_bottom: 30.0 +dz_top: 3000.0 +edmfx_detr_model: "Generalized" +edmfx_entr_model: "Generalized" +edmfx_nh_pressure: true +edmfx_sgs_diffusive_flux: true +edmfx_sgs_mass_flux: true +edmfx_upwinding: first_order +h_elem: 30 +idealized_insolation: false +implicit_diffusion: true +job_id: "gpu_climaatmos_diagedmf" +moist: equil +output_default_diagnostics: false +precip_model: 0M +prognostic_tke: true +rad: allskywithclear +surface_setup: DefaultMoninObukhov +t_end: 12hours +toml: [toml/diagnostic_edmfx_box.toml] +turbconv: diagnostic_edmfx +z_elem: 63 +z_max: 55000.0 diff --git a/config/model_configs/coarse_mpi_n2.yml b/config/ci_configs/coarse_mpi_n2.yml similarity index 100% rename from config/model_configs/coarse_mpi_n2.yml rename to config/ci_configs/coarse_mpi_n2.yml diff --git a/config/model_configs/coarse_single_ft32.yml b/config/ci_configs/coarse_single_ft32.yml similarity index 100% rename from config/model_configs/coarse_single_ft32.yml rename to config/ci_configs/coarse_single_ft32.yml diff --git a/config/model_configs/coarse_single_ft64.yml b/config/ci_configs/coarse_single_ft64.yml similarity index 100% rename from config/model_configs/coarse_single_ft64.yml rename to config/ci_configs/coarse_single_ft64.yml diff --git a/config/model_configs/coarse_single_ft64_hourly_checkpoints.yml b/config/ci_configs/coarse_single_ft64_hourly_checkpoints.yml similarity index 100% rename from config/model_configs/coarse_single_ft64_hourly_checkpoints.yml rename to config/ci_configs/coarse_single_ft64_hourly_checkpoints.yml diff --git a/config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml b/config/ci_configs/coarse_single_ft64_hourly_checkpoints_co2.yml similarity index 100% rename from config/model_configs/coarse_single_ft64_hourly_checkpoints_co2.yml rename to config/ci_configs/coarse_single_ft64_hourly_checkpoints_co2.yml diff --git a/config/model_configs/coarse_single_ft64_hourly_checkpoints_restart.yml b/config/ci_configs/coarse_single_ft64_hourly_checkpoints_restart.yml similarity index 100% rename from config/model_configs/coarse_single_ft64_hourly_checkpoints_restart.yml rename to config/ci_configs/coarse_single_ft64_hourly_checkpoints_restart.yml diff --git a/config/model_configs/default_mono.yml b/config/ci_configs/default_mono.yml similarity index 100% rename from config/model_configs/default_mono.yml rename to config/ci_configs/default_mono.yml diff --git a/config/model_configs/default_notmono.yml b/config/ci_configs/default_notmono.yml similarity index 100% rename from config/model_configs/default_notmono.yml rename to config/ci_configs/default_notmono.yml diff --git a/config/model_configs/default_unthreaded.yml b/config/ci_configs/default_unthreaded.yml similarity index 100% rename from config/model_configs/default_unthreaded.yml rename to config/ci_configs/default_unthreaded.yml diff --git a/config/model_configs/gpu_amip_albedo_function.yml b/config/ci_configs/gpu_amip_albedo_function.yml similarity index 100% rename from config/model_configs/gpu_amip_albedo_function.yml rename to config/ci_configs/gpu_amip_albedo_function.yml diff --git a/config/model_configs/gpu_amip_albedo_static_map.yml b/config/ci_configs/gpu_amip_albedo_static_map.yml similarity index 100% rename from config/model_configs/gpu_amip_albedo_static_map.yml rename to config/ci_configs/gpu_amip_albedo_static_map.yml diff --git a/config/model_configs/gpu_amip_albedo_temporal_map.yml b/config/ci_configs/gpu_amip_albedo_temporal_map.yml similarity index 100% rename from config/model_configs/gpu_amip_albedo_temporal_map.yml rename to config/ci_configs/gpu_amip_albedo_temporal_map.yml diff --git a/config/model_configs/gpu_amip_target_topo_diagedmf_shortrun.yml b/config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml similarity index 100% rename from config/model_configs/gpu_amip_target_topo_diagedmf_shortrun.yml rename to config/ci_configs/gpu_amip_target_topo_diagedmf_shortrun.yml diff --git a/config/model_configs/gpu_slabplanet_albedo_function.yml b/config/ci_configs/gpu_slabplanet_albedo_function.yml similarity index 100% rename from config/model_configs/gpu_slabplanet_albedo_function.yml rename to config/ci_configs/gpu_slabplanet_albedo_function.yml diff --git a/config/model_configs/gpu_slabplanet_albedo_static_map.yml b/config/ci_configs/gpu_slabplanet_albedo_static_map.yml similarity index 100% rename from config/model_configs/gpu_slabplanet_albedo_static_map.yml rename to config/ci_configs/gpu_slabplanet_albedo_static_map.yml diff --git a/config/model_configs/gpu_slabplanet_albedo_temporal_map.yml b/config/ci_configs/gpu_slabplanet_albedo_temporal_map.yml similarity index 100% rename from config/model_configs/gpu_slabplanet_albedo_temporal_map.yml rename to config/ci_configs/gpu_slabplanet_albedo_temporal_map.yml diff --git a/config/model_configs/interactive_debug.yml b/config/ci_configs/interactive_debug.yml similarity index 100% rename from config/model_configs/interactive_debug.yml rename to config/ci_configs/interactive_debug.yml diff --git a/config/mpi_configs/regridder_mpi.yml b/config/ci_configs/regridder_mpi.yml similarity index 100% rename from config/mpi_configs/regridder_mpi.yml rename to config/ci_configs/regridder_mpi.yml diff --git a/config/model_configs/slabplanet_albedo_function.yml b/config/ci_configs/slabplanet_albedo_function.yml similarity index 100% rename from config/model_configs/slabplanet_albedo_function.yml rename to config/ci_configs/slabplanet_albedo_function.yml diff --git a/config/model_configs/slabplanet_albedo_static_map.yml b/config/ci_configs/slabplanet_albedo_static_map.yml similarity index 100% rename from config/model_configs/slabplanet_albedo_static_map.yml rename to config/ci_configs/slabplanet_albedo_static_map.yml diff --git a/config/model_configs/slabplanet_albedo_temporal_map.yml b/config/ci_configs/slabplanet_albedo_temporal_map.yml similarity index 100% rename from config/model_configs/slabplanet_albedo_temporal_map.yml rename to config/ci_configs/slabplanet_albedo_temporal_map.yml diff --git a/config/model_configs/slabplanet_atmos_diags.yml b/config/ci_configs/slabplanet_atmos_diags.yml similarity index 100% rename from config/model_configs/slabplanet_atmos_diags.yml rename to config/ci_configs/slabplanet_atmos_diags.yml diff --git a/config/model_configs/slabplanet_default.yml b/config/ci_configs/slabplanet_default.yml similarity index 100% rename from config/model_configs/slabplanet_default.yml rename to config/ci_configs/slabplanet_default.yml diff --git a/config/model_configs/slabplanet_dry_norad.yml b/config/ci_configs/slabplanet_dry_norad.yml similarity index 100% rename from config/model_configs/slabplanet_dry_norad.yml rename to config/ci_configs/slabplanet_dry_norad.yml diff --git a/config/model_configs/slabplanet_eisenman.yml b/config/ci_configs/slabplanet_eisenman.yml similarity index 100% rename from config/model_configs/slabplanet_eisenman.yml rename to config/ci_configs/slabplanet_eisenman.yml diff --git a/config/model_configs/slabplanet_ft32.yml b/config/ci_configs/slabplanet_ft32.yml similarity index 100% rename from config/model_configs/slabplanet_ft32.yml rename to config/ci_configs/slabplanet_ft32.yml diff --git a/config/model_configs/slabplanet_nonmono.yml b/config/ci_configs/slabplanet_nonmono.yml similarity index 100% rename from config/model_configs/slabplanet_nonmono.yml rename to config/ci_configs/slabplanet_nonmono.yml diff --git a/config/model_configs/slabplanet_partitioned_fluxes.yml b/config/ci_configs/slabplanet_partitioned_fluxes.yml similarity index 100% rename from config/model_configs/slabplanet_partitioned_fluxes.yml rename to config/ci_configs/slabplanet_partitioned_fluxes.yml diff --git a/config/model_configs/target_amip_albedo_function.yml b/config/ci_configs/target_amip_albedo_function.yml similarity index 100% rename from config/model_configs/target_amip_albedo_function.yml rename to config/ci_configs/target_amip_albedo_function.yml diff --git a/config/model_configs/target_amip_n1_shortrun.yml b/config/ci_configs/target_amip_n1_shortrun.yml similarity index 100% rename from config/model_configs/target_amip_n1_shortrun.yml rename to config/ci_configs/target_amip_n1_shortrun.yml diff --git a/config/model_configs/target_params_in_slab_test2.yml b/config/ci_configs/target_params_in_slab_test2.yml similarity index 100% rename from config/model_configs/target_params_in_slab_test2.yml rename to config/ci_configs/target_params_in_slab_test2.yml diff --git a/config/model_configs/target_params_in_slab_test3.yml b/config/ci_configs/target_params_in_slab_test3.yml similarity index 100% rename from config/model_configs/target_params_in_slab_test3.yml rename to config/ci_configs/target_params_in_slab_test3.yml diff --git a/config/longrun_configs/gpu_dyamond_target.yml b/config/longrun_configs/gpu_longrun_amip_dyamond.yml similarity index 83% rename from config/longrun_configs/gpu_dyamond_target.yml rename to config/longrun_configs/gpu_longrun_amip_dyamond.yml index 0c96492245..548b137493 100644 --- a/config/longrun_configs/gpu_dyamond_target.yml +++ b/config/longrun_configs/gpu_longrun_amip_dyamond.yml @@ -4,12 +4,12 @@ dt_cpl: 50 dt_save_state_to_disk: "0.5days" dt_save_to_sol: "0.5days" energy_check: false -job_id: "gpu_dyamond_target" +job_id: "gpu_longrun_amip_dyamond" land_albedo_type: "map_temporal" mode_name: "amip" mono_surface: false monthly_checkpoint: false -run_name: "gpu_dyamond_target" +run_name: "gpu_longrun_amip_dyamond" start_date: "19790301" t_end: "1days" turb_flux_partition: "CombinedStateFluxes" diff --git a/experiments/AMIP/Manifest.toml b/experiments/AMIP/Manifest.toml index b5fd7d0fcd..21029d3104 100644 --- a/experiments/AMIP/Manifest.toml +++ b/experiments/AMIP/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.2" manifest_format = "2.0" -project_hash = "c00c8204c76db2774e82408096e51d91be9ef6bf" +project_hash = "36cae8e3da41534867db0a0941600724a7517b72" [[deps.ADTypes]] git-tree-sha1 = "016833eb52ba2d6bea9fcb50ca295980e728ee24" @@ -401,7 +401,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70" version = "0.3.14" [[deps.ClimaCoupler]] -deps = ["ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "ClimaLand", "ClimaParams", "Dates", "DocStringExtensions", "Insolation", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] +deps = ["CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "DocStringExtensions", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.0.1" diff --git a/experiments/AMIP/coupler_driver.jl b/experiments/AMIP/coupler_driver.jl index 1f444e1120..0adb5acb12 100644 --- a/experiments/AMIP/coupler_driver.jl +++ b/experiments/AMIP/coupler_driver.jl @@ -95,7 +95,7 @@ parsed_args = parse_commandline(argparse_settings()) ## modify parsed args for fast testing from REPL #hide if isinteractive() parsed_args["config_file"] = - isnothing(parsed_args["config_file"]) ? joinpath(pkg_dir, "config/model_configs/interactive_debug.yml") : + isnothing(parsed_args["config_file"]) ? joinpath(pkg_dir, "config/ci_configs/interactive_debug.yml") : parsed_args["config_file"] end @@ -178,8 +178,12 @@ returns a `ComponentModelSimulation` object (see `Interfacer` docs for more deta This uses the `ClimaAtmos.jl` model, with parameterization options specified in the `config_dict_atmos` dictionary. =# +Utilities.show_memory_usage(comms_ctx) + ## init atmos model component atmos_sim = atmos_init(FT, config_dict_atmos); +Utilities.show_memory_usage(comms_ctx) + thermo_params = get_thermo_params(atmos_sim) # TODO: this should be shared by all models #610 #= @@ -210,6 +214,7 @@ land_area_fraction = mono = mono_surface, ) ) +Utilities.show_memory_usage(comms_ctx) #= ### Surface Models: AMIP and SlabPlanet Modes @@ -322,6 +327,7 @@ if mode_name == "amip" Interfacer.update_field!(atmos_sim, Val(:co2), CO2_init) mode_specifics = (; name = mode_name, SST_info = SST_info, SIC_info = SIC_info, CO2_info = CO2_info) + Utilities.show_memory_usage(comms_ctx) elseif mode_name in ("slabplanet", "slabplanet_aqua", "slabplanet_terra") @@ -373,6 +379,7 @@ elseif mode_name in ("slabplanet", "slabplanet_aqua", "slabplanet_terra") )) mode_specifics = (; name = mode_name, SST_info = nothing, SIC_info = nothing) + Utilities.show_memory_usage(comms_ctx) elseif mode_name == "slabplanet_eisenman" @@ -416,6 +423,7 @@ elseif mode_name == "slabplanet_eisenman" ) mode_specifics = (; name = mode_name, SST_info = nothing, SIC_info = nothing) + Utilities.show_memory_usage(comms_ctx) end #= @@ -448,6 +456,7 @@ coupler_field_names = ( ) coupler_fields = NamedTuple{coupler_field_names}(ntuple(i -> CC.Fields.zeros(boundary_space), length(coupler_field_names))) +Utilities.show_memory_usage(comms_ctx) ## model simulations model_sims = (atmos_sim = atmos_sim, ice_sim = ice_sim, land_sim = land_sim, ocean_sim = ocean_sim); @@ -481,6 +490,7 @@ monthly_2d_diags = Diagnostics.init_diagnostics( ) diagnostics = (monthly_3d_diags, monthly_2d_diags) +Utilities.show_memory_usage(comms_ctx) #= ## Initialize Conservation Checks @@ -583,6 +593,7 @@ cs = Interfacer.CoupledSimulation{FT}( turbulent_fluxes, thermo_params, ); +Utilities.show_memory_usage(comms_ctx) #= ## Restart component model states if specified @@ -668,7 +679,7 @@ function solve_coupler!(cs) ClimaComms.iamroot(comms_ctx) && @info("Starting coupling loop") ## step in time - walltime = @elapsed for t in ((tspan[begin] + Δt_cpl):Δt_cpl:tspan[end]) + for t in ((tspan[begin] + Δt_cpl):Δt_cpl:tspan[end]) cs.dates.date[1] = TimeManager.current_date(cs, t) @@ -754,9 +765,8 @@ function solve_coupler!(cs) TimeManager.trigger_callback!(cs, cs.callbacks.checkpoint) end - ClimaComms.iamroot(comms_ctx) && @show(walltime) - return cs + return nothing end ## exit if running performance anaysis #hide @@ -764,8 +774,39 @@ if haskey(ENV, "CI_PERF_SKIP_COUPLED_RUN") #hide throw(:exit_profile_init) #hide end #hide -## run the coupled simulation -solve_coupler!(cs); +## run the coupled simulation for one timestep to precompile everything before timing +cs.tspan[2] = Δt_cpl * 2 +solve_coupler!(cs) + +## run the coupled simulation for the full timespan and time it +cs.tspan[1] = Δt_cpl * 2 +cs.tspan[2] = tspan[2] + +## Run garbage collection before solving for more accurate memory comparison to ClimaAtmos +GC.gc() + +## Use ClimaComms.@elapsed to time the simulation on both CPU and GPU +walltime = ClimaComms.@elapsed comms_ctx.device begin + s = CA.@timed_str begin + solve_coupler!(cs) + end +end +ClimaComms.iamroot(comms_ctx) && @show(walltime) + +## Use ClimaAtmos calculation to show the simulated years per day of the simulation (SYPD) +es = CA.EfficiencyStats(tspan, walltime) +sypd = CA.simulated_years_per_day(es) +@info "SYPD: $sypd" + +## Save the SYPD and allocation information +if ClimaComms.iamroot(comms_ctx) + sypd_filename = joinpath(dir_paths.artifacts, "sypd.txt") + write(sypd_filename, "$sypd") + + cpu_allocs_GB = Utilities.show_memory_usage(comms_ctx) + cpu_allocs_filename = joinpath(dir_paths.artifacts, "allocations_cpu.txt") + write(cpu_allocs_filename, cpu_allocs_GB) +end #= ## Postprocessing @@ -863,7 +904,7 @@ if ClimaComms.iamroot(comms_ctx) Plots.png(joinpath(dir_paths.artifacts, "amip_ncep.png")) ## Compare against observations - if t_end > 84600 + if t_end > 84600 && config_dict["output_default_diagnostics"] @info "Error against observations" output_dates = cs.dates.date0[] .+ Dates.Second.(atmos_sim.integrator.sol.t) diff --git a/experiments/AMIP/user_io/benchmarks.jl b/experiments/AMIP/user_io/benchmarks.jl new file mode 100644 index 0000000000..fe3d4c5fb5 --- /dev/null +++ b/experiments/AMIP/user_io/benchmarks.jl @@ -0,0 +1,156 @@ +#= +Our goal here is to output a table displaying some results from benchmark runs +in the coupler. We want to be able to compare between CPU and GPU runs, as well +as between coupled and atmos-only runs. The metrics we want to compare are +SYPD, allocations, and the maximum, median, and mean differences between the +CPU and GPU states. + +The table should look something like this (note that the last 3 columns will be +added in a future PR): +------------------------------------------------------------------------------------ +| | CPU Run | GPU Run | Max Diff | Median Diff | Mean Diff | +------------------------------------------------------------------------------------ +| | $run_name | $run_name | | | | +| Coupled run | $SYPD | $SYPD | $max_diff | $median_diff | $mean_diff | +| | $cpu_allocs | $cpu_allocs | | | | +------------------------------------------------------------------------------------ +| | $run_name | $run_name | | | | +| Atmos-only | $SYPD | $SYPD | $max_diff | $median_diff | $mean_diff | +| | $cpu_allocs | $cpu_allocs | | | | +------------------------------------------------------------------------------------ + +=# + +import ArgParse +import PrettyTables +import ClimaCoupler + +function argparse_settings() + s = ArgParse.ArgParseSettings() + ArgParse.@add_arg_table! s begin + "--cpu_run_name_coupled" + help = "The name of the CPU coupled run we want to compare. User must specify CPU and/or GPU coupled run name." + arg_type = String + default = nothing + "--gpu_run_name_coupled" + help = "The name of the GPU coupled run we want to compare." + arg_type = String + default = nothing + "--cpu_run_name_atmos" + help = "The name of the CPU atmos-only run we want to compare. User must specify CPU and/or GPU atmos-only run name." + arg_type = String + default = nothing + "--gpu_run_name_atmos" + help = "The name of the GPU atmos-only run we want to compare." + arg_type = String + default = nothing + "--mode_name" + help = "The mode of the simulations being compared (`slabplanet` or `AMIP`)." + arg_type = String + default = nothing + "--coupler_output_dir" + help = "Directory to save output files." + arg_type = String + default = "experiments/AMIP/output" + "--build_id" + help = "The build ID of the pipeline running this script." + arg_type = String + default = nothing + end + return s +end + +# Parse command line arguments +parsed_args = ArgParse.parse_args(ARGS, argparse_settings()) + +# Access buildkite pipeline ID (from `BUILDKITE_GITHUB_DEPLOYMENT_ID` variable) +build_id = parsed_args["build_id"] +if !isnothing(build_id) + build_id_str = "Build ID: $build_id" +else + build_id_str = "Build ID: N/A" +end + +# Construct CPU and GPU artifacts directories +output_dir = parsed_args["coupler_output_dir"] + +# Coupled runs +# Read in CPU and GPU run name info from command line +cpu_run_name_coupled = parsed_args["cpu_run_name_coupled"] +gpu_run_name_coupled = parsed_args["gpu_run_name_coupled"] +if isnothing(cpu_run_name_coupled) && isnothing(gpu_run_name_coupled) + error("Must pass CPU and/or GPU coupled run name to compare them.") +elseif isnothing(gpu_run_name_coupled) + gpu_run_name_coupled = "gpu_" * cpu_run_name_coupled +elseif isnothing(cpu_run_name_coupled) + cpu_run_name_coupled = gpu_run_name_coupled[5:end] +end + +# Read in mode name from command line (or retrieve from run name). +# Note that we expect this to be the same for all 4 simulations being compared. +mode_name = parsed_args["mode_name"] +if isnothing(mode_name) + mode_name = + occursin("amip", cpu_run_name_coupled) ? "amip" : + (occursin("slabplanet", cpu_run_name_coupled) ? "slabplanet" : error("Please provide a valid `mode_name`.")) +end + +gpu_artifacts_dir_coupled = joinpath(output_dir, mode_name, gpu_run_name_coupled) * "_artifacts" +cpu_artifacts_dir_coupled = joinpath(output_dir, mode_name, cpu_run_name_coupled) * "_artifacts" + +# Atmos-only runs +# Read in CPU and GPU run name info from command line +cpu_run_name_atmos = parsed_args["cpu_run_name_atmos"] +gpu_run_name_atmos = parsed_args["gpu_run_name_atmos"] +if isnothing(cpu_run_name_atmos) && isnothing(gpu_run_name_atmos) + error("Must pass CPU and/or GPU coupled run name to compare them.") +elseif isnothing(gpu_run_name_atmos) + gpu_run_name_atmos = "gpu_" * cpu_run_name_atmos +elseif isnothing(cpu_run_name_atmos) + cpu_run_name_atmos = gpu_run_name_atmos[5:end] + cpu_artifacts_dir_atmos = joinpath(output_dir, cpu_run_name_atmos) +end + +mode_name_atmos = "climaatmos" +gpu_artifacts_dir_atmos = joinpath(output_dir, mode_name_atmos, gpu_run_name_atmos) * "_artifacts" +cpu_artifacts_dir_atmos = joinpath(output_dir, mode_name_atmos, cpu_run_name_atmos) * "_artifacts" + +# Read in SYPD and allocations info from artifacts directories +function get_sypd_allocs(artifacts_dir) + # Read in SYPD info + sypd_file = open(joinpath(artifacts_dir, "sypd.txt"), "r") + sypd = round(parse(Float64, read(sypd_file, String)), digits = 4) + + # Read in allocations info + cpu_allocs_file = open(joinpath(artifacts_dir, "allocations_cpu.txt"), "r") + cpu_allocs = read(cpu_allocs_file, String) + + return (sypd, cpu_allocs) +end + +cpu_sypd_coupled, cpu_allocs_coupled = get_sypd_allocs(cpu_artifacts_dir_coupled) +gpu_sypd_coupled, gpu_cpu_allocs_coupled = get_sypd_allocs(gpu_artifacts_dir_coupled) +cpu_sypd_atmos, cpu_allocs_atmos = get_sypd_allocs(cpu_artifacts_dir_atmos) +gpu_sypd_atmos, gpu_cpu_allocs_atmos = get_sypd_allocs(gpu_artifacts_dir_atmos) + +# Set up info for PrettyTables.jl +headers = [build_id_str, "Horiz. res.: 30 elems", "CPU Run [64 processes]", "GPU Run [4 A100s]"] +data = [ + ["" "Vert. res.: 63 levels" "" ""] + ["" "dt: 120secs" "" ""] + ["" "run name:" cpu_run_name_coupled gpu_run_name_coupled] + ["Coupled" "SYPD:" cpu_sypd_coupled gpu_sypd_coupled] + ["" "CPU max RSS allocs:" cpu_allocs_coupled gpu_cpu_allocs_coupled] + ["" "run name:" cpu_run_name_atmos gpu_run_name_atmos] + ["Atmos-only" "SYPD:" cpu_sypd_atmos gpu_sypd_atmos] + ["" "CPU max RSS allocs:" cpu_allocs_atmos gpu_cpu_allocs_atmos] +] + +# Use the coupled CPU run name for the output dir +table_output_dir = joinpath(output_dir, "compare_$(mode_name)_$(mode_name_atmos)_$(cpu_run_name_coupled)") +!isdir(table_output_dir) && mkdir(table_output_dir) +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]) +end diff --git a/experiments/ClimaCore/Manifest.toml b/experiments/ClimaCore/Manifest.toml index 5633353f4d..0929daf41d 100644 --- a/experiments/ClimaCore/Manifest.toml +++ b/experiments/ClimaCore/Manifest.toml @@ -32,14 +32,25 @@ uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" version = "0.4.5" [[deps.Accessors]] -deps = ["Compat", "CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Requires", "Test"] -git-tree-sha1 = "4a98a9491dd44348664c371998a75074a6938145" +deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Markdown", "Test"] +git-tree-sha1 = "c0d491ef0b135fd7d63cbc6404286bc633329425" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" -version = "0.1.27" -weakdeps = ["StaticArrays"] +version = "0.1.36" [deps.Accessors.extensions] - StaticArraysExt = "StaticArrays" + AccessorsAxisKeysExt = "AxisKeys" + AccessorsIntervalSetsExt = "IntervalSets" + AccessorsStaticArraysExt = "StaticArrays" + AccessorsStructArraysExt = "StructArrays" + AccessorsUnitfulExt = "Unitful" + + [deps.Accessors.weakdeps] + AxisKeys = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5" + IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953" + Requires = "ae029012-a4dd-5104-9daa-d747884805df" + StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" + StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" + Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] @@ -55,12 +66,6 @@ weakdeps = ["StaticArrays"] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" version = "1.1.1" -[[deps.ArnoldiMethod]] -deps = ["LinearAlgebra", "Random", "StaticArrays"] -git-tree-sha1 = "62e51b39331de8911e4a7ff6f5aaf38a5f4cc0ae" -uuid = "ec485272-7323-5ecc-a04f-4719b315124d" -version = "0.2.0" - [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"] git-tree-sha1 = "c5aeb516a84459e0318a02507d2261edad97eb75" @@ -85,9 +90,9 @@ version = "7.7.1" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "0330bc3e828a05d1073553fb56f9695d73077370" +git-tree-sha1 = "33207a8be6267bc389d0701e97a9bce6a4de68eb" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.9.1" +version = "1.9.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -138,20 +143,6 @@ git-tree-sha1 = "9a9610fbe5779636f75229e423e367124034af41" uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" version = "0.16.43" -[[deps.BoundaryValueDiffEq]] -deps = ["ADTypes", "Adapt", "ArrayInterface", "BandedMatrices", "ConcreteStructs", "DiffEqBase", "FastAlmostBandedMatrices", "ForwardDiff", "LinearAlgebra", "LinearSolve", "NonlinearSolve", "PreallocationTools", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "Setfield", "SparseArrays", "SparseDiffTools", "Tricks", "TruncatedStacktraces", "UnPack"] -git-tree-sha1 = "3ff968887be48760b0e9e8650c2d05c96cdea9d8" -uuid = "764a87c0-6b3e-53db-9096-fe964310641d" -version = "5.6.3" - - [deps.BoundaryValueDiffEq.extensions] - BoundaryValueDiffEqODEInterfaceExt = "ODEInterface" - BoundaryValueDiffEqOrdinaryDiffEqExt = "OrdinaryDiffEq" - - [deps.BoundaryValueDiffEq.weakdeps] - ODEInterface = "54ca160b-1b9f-5127-a996-1867f4bc2a2c" - OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" - [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" @@ -194,9 +185,9 @@ version = "0.7.0+1" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] -git-tree-sha1 = "2cb12f6b2209f40a4b8967697689a47c50485490" +git-tree-sha1 = "38f830504358e9972d2a0c3e5d51cb865e0733df" uuid = "1af6417a-86b4-443c-805f-a4643ffb695f" -version = "0.2.3" +version = "0.2.4" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] @@ -210,12 +201,6 @@ git-tree-sha1 = "a4c43f59baa34011e303e76f5c8c91bf58415aaf" uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a" version = "1.18.0+1" -[[deps.Calculus]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad" -uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" -version = "0.5.1" - [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] git-tree-sha1 = "575cd02e080939a33b6df6c5853d14924c08e35b" @@ -233,10 +218,10 @@ uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" version = "0.5.8" [[deps.ClimaCore]] -deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] -git-tree-sha1 = "3c8ba2a248d30aaa7f0e72a3516b142521447377" +deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] +git-tree-sha1 = "ce60e793254676e4ff0121997bae6fc4b78ebd09" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.13.3" +version = "0.13.4" weakdeps = ["Krylov"] [deps.ClimaCore.extensions] @@ -244,15 +229,15 @@ weakdeps = ["Krylov"] [[deps.ClimaParams]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "1a3d2455fff201bcf130bbd5a71ac16fc3c21fd1" +git-tree-sha1 = "528aadfaae6f447df3879eab224625ecceec5982" uuid = "5c42b081-d73a-476f-9059-fd94b934656c" -version = "0.10.4" +version = "0.10.5" [[deps.ClimaTimeSteppers]] deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] -git-tree-sha1 = "9c203f39784c968700c55f555754a7771b3410df" +git-tree-sha1 = "5e9df5522c1a5259c913a54ad842edb11f0cdeb5" uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79" -version = "0.7.19" +version = "0.7.20" [[deps.CloseOpenIntervals]] deps = ["Static", "StaticArrayInterface"] @@ -274,9 +259,9 @@ version = "3.24.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4" +git-tree-sha1 = "b10d0b65641d57b8b4d5e234446582de5047050d" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.11.4" +version = "0.11.5" [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] @@ -392,9 +377,9 @@ version = "1.6.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0f4b5d62a88d8f59003e43c25a8a90de9eb76317" +git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.18" +version = "0.18.20" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -405,12 +390,6 @@ version = "1.0.0" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[deps.DelayDiffEq]] -deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "LinearAlgebra", "Logging", "OrdinaryDiffEq", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "SimpleUnPack"] -git-tree-sha1 = "e40378efd2af7658d0a0579aa9e15b17137368f4" -uuid = "bcd4f6db-9728-5f36-b5f7-82caef46ccdb" -version = "5.44.0" - [[deps.DelimitedFiles]] deps = ["Mmap"] git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" @@ -449,22 +428,13 @@ version = "6.145.2" [[deps.DiffEqCallbacks]] deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "Functors", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "d0b94b3694d55e7eedeee918e7daee9e3b873399" +git-tree-sha1 = "ee954c8b9d348b7a8a6aec5f28288bf5adecd4ee" uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "2.35.0" -weakdeps = ["OrdinaryDiffEq", "Sundials"] - -[[deps.DiffEqNoiseProcess]] -deps = ["DiffEqBase", "Distributions", "GPUArraysCore", "LinearAlgebra", "Markdown", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "Requires", "ResettableStacks", "SciMLBase", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "65cbbe1450ced323b4b17228ccd96349d96795a7" -uuid = "77a26b50-5914-5dd7-bc55-306e6241c503" -version = "5.21.0" +version = "2.37.0" - [deps.DiffEqNoiseProcess.extensions] - DiffEqNoiseProcessReverseDiffExt = "ReverseDiff" - - [deps.DiffEqNoiseProcess.weakdeps] - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" + [deps.DiffEqCallbacks.weakdeps] + OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" + Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4" [[deps.DiffResults]] deps = ["StaticArraysCore"] @@ -478,12 +448,6 @@ git-tree-sha1 = "23163d55f885173722d1e4cf0f6110cdbaf7e272" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" -[[deps.DifferentialEquations]] -deps = ["BoundaryValueDiffEq", "DelayDiffEq", "DiffEqBase", "DiffEqCallbacks", "DiffEqNoiseProcess", "JumpProcesses", "LinearAlgebra", "LinearSolve", "NonlinearSolve", "OrdinaryDiffEq", "Random", "RecursiveArrayTools", "Reexport", "SciMLBase", "SteadyStateDiffEq", "StochasticDiffEq", "Sundials"] -git-tree-sha1 = "19a5b6314715139ddefea4108a105bb9b90dc4fb" -uuid = "0c46a032-eb83-5123-abaf-570d42b7fbaa" -version = "7.11.0" - [[deps.Distances]] deps = ["LinearAlgebra", "Statistics", "StatsAPI"] git-tree-sha1 = "66c4c81f259586e8f002eacebc177e1fb06363b0" @@ -499,22 +463,6 @@ weakdeps = ["ChainRulesCore", "SparseArrays"] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[deps.Distributions]] -deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsAPI", "StatsBase", "StatsFuns"] -git-tree-sha1 = "7c302d7a5fec5214eb8a5a4c466dcf7a51fcf169" -uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.107" - - [deps.Distributions.extensions] - DistributionsChainRulesCoreExt = "ChainRulesCore" - DistributionsDensityInterfaceExt = "DensityInterface" - DistributionsTestExt = "Test" - - [deps.Distributions.weakdeps] - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - DensityInterface = "b429d917-457f-4dbc-8f4c-0cc954292b1d" - Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - [[deps.DocStringExtensions]] deps = ["LibGit2"] git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d" @@ -526,12 +474,6 @@ deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" version = "1.6.0" -[[deps.DualNumbers]] -deps = ["Calculus", "NaNMath", "SpecialFunctions"] -git-tree-sha1 = "5837a837389fccf076445fce071c8ddaea35a566" -uuid = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74" -version = "0.6.8" - [[deps.Elliptic]] git-tree-sha1 = "71c79e77221ab3a29918aaf6db4f217b89138608" uuid = "b305315f-e792-5b7a-8f41-49f472929428" @@ -569,12 +511,6 @@ git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" version = "2.5.0+0" -[[deps.ExponentialUtilities]] -deps = ["Adapt", "ArrayInterface", "GPUArraysCore", "GenericSchur", "LinearAlgebra", "PrecompileTools", "Printf", "SparseArrays", "libblastrampoline_jll"] -git-tree-sha1 = "8e18940a5ba7f4ddb41fe2b79b6acaac50880a86" -uuid = "d4d017d3-3776-5f7e-afef-a10c40355c18" -version = "1.26.1" - [[deps.ExprTools]] git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" @@ -604,12 +540,6 @@ git-tree-sha1 = "c6033cc3892d0ef5bb9cd29b7f2f0331ea5184ea" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" version = "3.3.10+0" -[[deps.FastAlmostBandedMatrices]] -deps = ["ArrayInterface", "ArrayLayouts", "BandedMatrices", "ConcreteStructs", "LazyArrays", "LinearAlgebra", "MatrixFactorizations", "PrecompileTools", "Reexport"] -git-tree-sha1 = "9dc913faf8552fd09b92a0d7fcc25f1d5609d795" -uuid = "9d29842c-ecb8-4973-b1e9-a27b1157504e" -version = "0.1.1" - [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] git-tree-sha1 = "a6e756a880fc419c8b41592010aebe6a5ce09136" @@ -621,12 +551,6 @@ git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef" uuid = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a" version = "0.3.2" -[[deps.FastLapackInterface]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "0a59c7d1002f3131de53dc4568a47d15a44daef7" -uuid = "29a986be-02c6-4525-aec4-84b980013641" -version = "2.0.2" - [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] git-tree-sha1 = "82d8afa92ecf4b52d78d869f038ebfb881267322" @@ -641,18 +565,22 @@ deps = ["LinearAlgebra"] git-tree-sha1 = "bfe82a708416cf00b73a3198db0859c82f741558" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" version = "1.10.0" -weakdeps = ["PDMats", "SparseArrays", "Statistics"] [deps.FillArrays.extensions] FillArraysPDMatsExt = "PDMats" FillArraysSparseArraysExt = "SparseArrays" FillArraysStatisticsExt = "Statistics" + [deps.FillArrays.weakdeps] + PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150" + SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "Setfield", "SparseArrays"] -git-tree-sha1 = "bc0c5092d6caaea112d3c8e3b238d61563c58d5f" +git-tree-sha1 = "2de436b72c3422940cbe1367611d137008af7ec3" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.23.0" +version = "2.23.1" [deps.FiniteDiff.extensions] FiniteDiffBandedMatricesExt = "BandedMatrices" @@ -716,9 +644,9 @@ version = "0.1.3" [[deps.Functors]] deps = ["LinearAlgebra"] -git-tree-sha1 = "fa8d8fcfa6c38a9a7aa07233e35b3d9a39ec751a" +git-tree-sha1 = "d3e63d9fa13f8eaa2f06f64949e2afc593ff52c2" uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.4.9" +version = "0.4.10" [[deps.Future]] deps = ["Random"] @@ -766,12 +694,6 @@ git-tree-sha1 = "eb6f1f48aa994f3018cbd029a17863c6535a266d" uuid = "d54b0c1a-921d-58e0-8e36-89d8069c0969" version = "0.5.8" -[[deps.GenericSchur]] -deps = ["LinearAlgebra", "Printf"] -git-tree-sha1 = "af49a0851f8113fcfae2ef5027c6d49d0acec39b" -uuid = "c145ed77-6b09-5dd9-b285-bf645a82121e" -version = "0.5.4" - [[deps.Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" @@ -795,12 +717,6 @@ git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472" version = "1.3.14+0" -[[deps.Graphs]] -deps = ["ArnoldiMethod", "Compat", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "899050ace26649433ef1af25bc17a815b3db52b7" -uuid = "86223c79-3864-5bf0-83f7-82e725a168b6" -version = "1.9.0" - [[deps.Grisu]] git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" @@ -818,15 +734,15 @@ weakdeps = ["MPI"] [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "6384c847ff5056c5624e30e75b3ca48902cae0ac" +git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+2" +version = "1.14.3+3" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "8e59b47b9dc525b70550ca082ce85bcd7f5477cd" +git-tree-sha1 = "2c3ec1f90bb4a8f7beafb0cffea8a4c3f4e636ab" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.5" +version = "1.10.6" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -834,34 +750,17 @@ git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3" uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566" version = "2.8.1+1" -[[deps.HostCPUFeatures]] -deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] -git-tree-sha1 = "eb8fed28f4994600e29beef49744639d985a04b2" -uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" -version = "0.1.16" - [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.10.0+0" -[[deps.HypergeometricFunctions]] -deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] -git-tree-sha1 = "f218fe3736ddf977e0e772bc9a586b2383da2685" -uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a" -version = "0.3.23" - [[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" version = "0.1.1" -[[deps.Inflate]] -git-tree-sha1 = "ea8031dea4aff6bd41f1df8f2fdfb25b33626381" -uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" -version = "0.1.4" - [[deps.InlineStrings]] deps = ["Parsers"] git-tree-sha1 = "9cc2baf75c6d09f9da536ddf58eb2f29dedaf461" @@ -875,19 +774,24 @@ version = "0.1.2" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "5fdf2fe6724d8caabf43b557b84ce53f3b7e2f6b" +git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.0.2+0" +version = "2024.1.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[deps.IntervalSets]] -deps = ["Dates", "Statistics"] -git-tree-sha1 = "ad841eddfb05f6d9be0bff1fa48dcae32f134a2d" +git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.6.2" +version = "0.7.10" +weakdeps = ["Random", "RecipesBase", "Statistics"] + + [deps.IntervalSets.extensions] + IntervalSetsRandomExt = "Random" + IntervalSetsRecipesBaseExt = "RecipesBase" + IntervalSetsStatisticsExt = "Statistics" [[deps.InverseFunctions]] deps = ["Test"] @@ -950,22 +854,6 @@ git-tree-sha1 = "af433a10f3942e882d3c671aacb203e006a5808f" uuid = "9c1d0b0a-7046-5b2e-a33f-ea22f176ac7e" version = "0.2.1+0" -[[deps.JumpProcesses]] -deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "FunctionWrappers", "Graphs", "LinearAlgebra", "Markdown", "PoissonRandom", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SciMLBase", "StaticArrays", "UnPack"] -git-tree-sha1 = "c451feb97251965a9fe40bacd62551a72cc5902c" -uuid = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5" -version = "9.10.1" -weakdeps = ["FastBroadcast"] - - [deps.JumpProcesses.extensions] - JumpProcessFastBroadcastExt = "FastBroadcast" - -[[deps.KLU]] -deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse_jll"] -git-tree-sha1 = "884c2968c2e8e7e6bf5956af88cb46aa745c854b" -uuid = "ef3ab10e-7fda-4108-b977-705223b18434" -version = "0.4.1" - [[deps.KernelAbstractions]] deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"] git-tree-sha1 = "ed7167240f40e62d97c1f5f7735dea6de3cc5c49" @@ -1046,9 +934,9 @@ version = "1.3.1" [[deps.Latexify]] deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"] -git-tree-sha1 = "cad560042a7cc108f5a4c24ea1431a9221f22c1b" +git-tree-sha1 = "e0b5cd21dc1b44ec6e64f351976f961e6f31d6c4" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.16.2" +version = "0.16.3" [deps.Latexify.extensions] DataFramesExt = "DataFrames" @@ -1070,16 +958,6 @@ git-tree-sha1 = "62edfee3211981241b57ff1cedf4d74d79519277" uuid = "10f19ff3-798f-405d-979b-55457f8fc047" version = "0.1.15" -[[deps.LazyArrays]] -deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "MacroTools", "MatrixFactorizations", "SparseArrays"] -git-tree-sha1 = "af45931c321aafdb96a6e0b26e81124e1b390e4e" -uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02" -version = "1.9.0" -weakdeps = ["StaticArrays"] - - [deps.LazyArrays.extensions] - LazyArraysStaticArraysExt = "StaticArrays" - [[deps.LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" @@ -1090,12 +968,6 @@ git-tree-sha1 = "fb6803dafae4a5d62ea5cab204b1e657d9737e7f" uuid = "1d6d02ad-be62-4b6b-8a6d-2f90e265016e" version = "0.2.0" -[[deps.LevyArea]] -deps = ["LinearAlgebra", "Random", "SpecialFunctions"] -git-tree-sha1 = "56513a09b8e0ae6485f34401ea9e2f31357958ec" -uuid = "2d8b4e74-eb68-11e8-0fb9-d5eb67b50637" -version = "1.0.0" - [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" @@ -1191,41 +1063,6 @@ weakdeps = ["ChainRulesCore"] [deps.LinearOperators.extensions] LinearOperatorsChainRulesCoreExt = "ChainRulesCore" -[[deps.LinearSolve]] -deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "StaticArraysCore", "UnPack"] -git-tree-sha1 = "6f8e084deabe3189416c4e505b1c53e1b590cae8" -uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" -version = "2.22.1" - - [deps.LinearSolve.extensions] - LinearSolveBandedMatricesExt = "BandedMatrices" - LinearSolveBlockDiagonalsExt = "BlockDiagonals" - LinearSolveCUDAExt = "CUDA" - LinearSolveEnzymeExt = ["Enzyme", "EnzymeCore"] - LinearSolveFastAlmostBandedMatricesExt = ["FastAlmostBandedMatrices"] - LinearSolveHYPREExt = "HYPRE" - LinearSolveIterativeSolversExt = "IterativeSolvers" - LinearSolveKernelAbstractionsExt = "KernelAbstractions" - LinearSolveKrylovKitExt = "KrylovKit" - LinearSolveMetalExt = "Metal" - LinearSolvePardisoExt = "Pardiso" - LinearSolveRecursiveArrayToolsExt = "RecursiveArrayTools" - - [deps.LinearSolve.weakdeps] - BandedMatrices = "aae01518-5342-5314-be14-df237901396f" - BlockDiagonals = "0a1fb500-61f7-11e9-3c65-f5ef3456f9f0" - CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" - Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" - EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" - FastAlmostBandedMatrices = "9d29842c-ecb8-4973-b1e9-a27b1157504e" - HYPRE = "b5ffcf37-a2bd-41ab-a3da-4bd9bc8ad771" - IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153" - KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" - KrylovKit = "0b1a1467-8014-51b9-945f-bf0ae24f4b77" - Metal = "dde4c033-4e86-420c-a63e-0dd931031962" - Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2" - RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd" - [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] git-tree-sha1 = "18144f3e9cbe9b15b070288eef858f71b291ce37" @@ -1251,22 +1088,11 @@ git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" version = "1.0.3" -[[deps.LoopVectorization]] -deps = ["ArrayInterface", "CPUSummary", "CloseOpenIntervals", "DocStringExtensions", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"] -git-tree-sha1 = "a13f3be5d84b9c95465d743c82af0b094ef9c2e2" -uuid = "bdcacae8-1622-11e9-2a5c-532679323890" -version = "0.12.169" -weakdeps = ["ChainRulesCore", "ForwardDiff", "SpecialFunctions"] - - [deps.LoopVectorization.extensions] - ForwardDiffExt = ["ChainRulesCore", "ForwardDiff"] - SpecialFunctionsExt = "SpecialFunctions" - [[deps.MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] -git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" +deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] +git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.0.0+0" +version = "2024.1.0+0" [[deps.MPI]] deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"] @@ -1315,12 +1141,6 @@ version = "0.1.8" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[deps.MatrixFactorizations]] -deps = ["ArrayLayouts", "LinearAlgebra", "Printf", "Random"] -git-tree-sha1 = "78f6e33434939b0ac9ba1df81e6d005ee85a7396" -uuid = "a3b82374-2e81-5b9e-98ce-41277c0e4c87" -version = "2.1.0" - [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf" @@ -1345,9 +1165,9 @@ version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272" +git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "1.1.0" +version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -1361,6 +1181,11 @@ git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.4" +[[deps.MultiBroadcastFusion]] +git-tree-sha1 = "cb2fb12bdd092eea393b4bd3252815cc8a395f7f" +uuid = "c3c07f87-98de-43f2-a76f-835b330b2cbb" +version = "0.2.0" + [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] git-tree-sha1 = "a0b464d183da839699f4c79e7606d9d186ec172c" @@ -1395,31 +1220,6 @@ version = "1.0.2" uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" -[[deps.NonlinearSolve]] -deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "EnumX", "FastBroadcast", "FiniteDiff", "ForwardDiff", "LineSearches", "LinearAlgebra", "LinearSolve", "PrecompileTools", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SimpleNonlinearSolve", "SparseArrays", "SparseDiffTools", "StaticArraysCore", "UnPack"] -git-tree-sha1 = "6166ccd8f79c93c636ca61ab4cd18f555932563d" -uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "2.8.2" - - [deps.NonlinearSolve.extensions] - NonlinearSolveBandedMatricesExt = "BandedMatrices" - NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt" - NonlinearSolveLeastSquaresOptimExt = "LeastSquaresOptim" - - [deps.NonlinearSolve.weakdeps] - BandedMatrices = "aae01518-5342-5314-be14-df237901396f" - FastLevenbergMarquardt = "7a0df574-e128-4d35-8cbd-3d84502bf7ce" - LeastSquaresOptim = "0fc2ff8b-aaa3-5acd-a817-1944a5e08891" - -[[deps.OffsetArrays]] -git-tree-sha1 = "6a731f2b5c03157418a20c12195eb4b74c8f8621" -uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.13.0" -weakdeps = ["Adapt"] - - [deps.OffsetArrays.extensions] - OffsetArraysAdaptExt = "Adapt" - [[deps.Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f" @@ -1444,9 +1244,9 @@ version = "4.1.6+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "af81a32750ebc831ee28bdaaba6e1067decef51e" +git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.4.2" +version = "1.4.3" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1460,18 +1260,6 @@ git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.5+0" -[[deps.Optim]] -deps = ["Compat", "FillArrays", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] -git-tree-sha1 = "d9b79c4eed437421ac4285148fcadf42e0700e89" -uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "1.9.4" - - [deps.Optim.extensions] - OptimMOIExt = "MathOptInterface" - - [deps.Optim.weakdeps] - MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" - [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720" @@ -1483,29 +1271,11 @@ git-tree-sha1 = "dfdf5519f235516220579f949664f1bf44e741c5" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.6.3" -[[deps.OrdinaryDiffEq]] -deps = ["ADTypes", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "ExponentialUtilities", "FastBroadcast", "FastClosures", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "IfElse", "InteractiveUtils", "LineSearches", "LinearAlgebra", "LinearSolve", "Logging", "LoopVectorization", "MacroTools", "MuladdMacro", "NLsolve", "NonlinearSolve", "Polyester", "PreallocationTools", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLNLSolve", "SciMLOperators", "SimpleNonlinearSolve", "SimpleUnPack", "SparseArrays", "SparseDiffTools", "StaticArrayInterface", "StaticArrays", "TruncatedStacktraces"] -git-tree-sha1 = "5f9e7ce227d0e447c3803cc05ef5d8f75f84b9ea" -uuid = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" -version = "6.59.3" - [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" version = "10.42.0+1" -[[deps.PDMats]] -deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "949347156c25054de2db3b166c52ac4728cbad65" -uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.31" - -[[deps.PackageExtensionCompat]] -git-tree-sha1 = "fb28e33b8a95c4cee25ce296c817d89cc2e53518" -uuid = "65ce6f38-6b18-4e1d-a461-8949797d7930" -version = "1.0.2" -weakdeps = ["Requires", "TOML"] - [[deps.Parameters]] deps = ["OrderedCollections", "UnPack"] git-tree-sha1 = "34c0e9ad262e5f7fc75b10a9952ca7692cfc5fbe" @@ -1554,9 +1324,9 @@ version = "1.4.1" [[deps.Plots]] deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] -git-tree-sha1 = "3bdfa4fa528ef21287ef659a89d686e8a1bcb1a9" +git-tree-sha1 = "442e1e7ac27dd5ff8825c3fa62fbd1e86397974b" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.3" +version = "1.40.4" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -1572,17 +1342,11 @@ version = "1.40.3" ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" -[[deps.PoissonRandom]] -deps = ["Random"] -git-tree-sha1 = "a0f1159c33f846aa77c3f30ebbc69795e5327152" -uuid = "e409e4f3-bfea-5376-8464-e040bb5c01ab" -version = "0.4.4" - [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] -git-tree-sha1 = "09f59c6dda37c7f73efddc5bdf6f92bc940eb484" +git-tree-sha1 = "2ba5f33cbb51a85ef58a850749492b08f9bf2193" uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" -version = "0.7.12" +version = "0.7.13" [[deps.PolyesterWeave]] deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"] @@ -1596,17 +1360,11 @@ git-tree-sha1 = "36d8b4b899628fb92c2749eb488d884a926614d3" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "1.4.3" -[[deps.PositiveFactorizations]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" -uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" -version = "0.2.4" - [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "ForwardDiff"] -git-tree-sha1 = "b6665214f2d0739f2d09a17474dd443b9139784a" +git-tree-sha1 = "a660e9daab5db07adf3dedfe09b435cc530d855e" uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.20" +version = "0.4.21" [deps.PreallocationTools.extensions] PreallocationToolsReverseDiffExt = "ReverseDiff" @@ -1660,22 +1418,18 @@ git-tree-sha1 = "37b7bb7aabf9a085e0044307e1717436117f2b3b" uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56" version = "6.5.3+1" -[[deps.QuadGK]] -deps = ["DataStructures", "LinearAlgebra"] -git-tree-sha1 = "9b23c31e76e333e6fb4c1595ae6afa74966a729e" -uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" -version = "2.9.4" - [[deps.QuasiMonteCarlo]] deps = ["Accessors", "ConcreteStructs", "LatticeRules", "LinearAlgebra", "Primes", "Random", "Requires", "Sobol", "StatsBase"] git-tree-sha1 = "cc086f8485bce77b6187141e1413c3b55f9a4341" uuid = "8a4e6c94-4038-4cdc-81c3-7e6ffdb2a71b" version = "0.3.3" -weakdeps = ["Distributions"] [deps.QuasiMonteCarlo.extensions] QuasiMonteCarloDistributionsExt = "Distributions" + [deps.QuasiMonteCarlo.weakdeps] + Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" + [[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" @@ -1726,12 +1480,6 @@ version = "2.38.10" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" -[[deps.RecursiveFactorization]] -deps = ["LinearAlgebra", "LoopVectorization", "Polyester", "PrecompileTools", "StrideArraysCore", "TriangularSolve"] -git-tree-sha1 = "8bc86c78c7d8e2a5fe559e3721c0f9c9e303b2ed" -uuid = "f2c3362d-daeb-58d1-803e-2bc74f2840b4" -version = "0.2.21" - [[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" @@ -1749,24 +1497,6 @@ git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.0" -[[deps.ResettableStacks]] -deps = ["StaticArrays"] -git-tree-sha1 = "256eeeec186fa7f26f2801732774ccf277f05db9" -uuid = "ae5879a3-cd67-5da8-be7f-38c6eb64a37b" -version = "1.1.1" - -[[deps.Rmath]] -deps = ["Random", "Rmath_jll"] -git-tree-sha1 = "f65dcb5fa46aee0cf9ed6274ccbd597adc49aa7b" -uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa" -version = "0.7.1" - -[[deps.Rmath_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6ed52fdd3382cf21947b15e8870ac0ddbff736da" -uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f" -version = "0.4.0+0" - [[deps.RootSolvers]] deps = ["ForwardDiff"] git-tree-sha1 = "a87fd671f7a298de98f2f3c5a9cd9890714eb9dd" @@ -1775,9 +1505,9 @@ version = "0.4.2" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] -git-tree-sha1 = "6aacc5eefe8415f47b3e34214c1d79d2674a0ba2" +git-tree-sha1 = "04c968137612c4a5629fa531334bb81ad5680f00" uuid = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47" -version = "0.5.12" +version = "0.5.13" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -1788,12 +1518,6 @@ git-tree-sha1 = "330289636fb8107c5f32088d2741e9fd7a061a5c" uuid = "94e857df-77ce-4151-89e5-788b33177be4" version = "0.1.0" -[[deps.SLEEFPirates]] -deps = ["IfElse", "Static", "VectorizationBase"] -git-tree-sha1 = "3aac6d68c5e57449f5b9b865c9ba50ac2970c4cf" -uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.6.42" - [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "QuasiMonteCarlo", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"] git-tree-sha1 = "32ea825941f7b58a6f48268f4b76971ae8eb9eec" @@ -1817,12 +1541,6 @@ version = "2.10.0" RCall = "6f49c342-dc21-5d91-9882-a32aef131414" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" -[[deps.SciMLNLSolve]] -deps = ["DiffEqBase", "LineSearches", "NLsolve", "Reexport", "SciMLBase"] -git-tree-sha1 = "765b788339abd7d983618c09cfc0192e2b6b15fd" -uuid = "e9a6253c-8580-4d32-9898-8661bb511710" -version = "0.1.9" - [[deps.SciMLOperators]] deps = ["ArrayInterface", "DocStringExtensions", "LinearAlgebra", "MacroTools", "Setfield", "SparseArrays", "StaticArraysCore"] git-tree-sha1 = "10499f619ef6e890f3f4a38914481cc868689cd5" @@ -1850,10 +1568,6 @@ git-tree-sha1 = "e2cc6d8c88613c05e1defb55170bf5ff211fbeac" uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" version = "1.1.1" -[[deps.SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - [[deps.Showoff]] deps = ["Dates", "Grisu"] git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de" @@ -1865,29 +1579,6 @@ git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.1.0" -[[deps.SimpleNonlinearSolve]] -deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "69b1a53374dd14d7c165d98cb646aeb5f36f8d07" -uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.25" - - [deps.SimpleNonlinearSolve.extensions] - SimpleNonlinearSolveNNlibExt = "NNlib" - - [deps.SimpleNonlinearSolve.weakdeps] - NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" - -[[deps.SimpleTraits]] -deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" -uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.4" - -[[deps.SimpleUnPack]] -git-tree-sha1 = "58e6353e72cde29b90a69527e56df1b5c3d8c437" -uuid = "ce78b400-467f-4804-87d8-8f486da07d0a" -version = "1.1.0" - [[deps.Sobol]] deps = ["DelimitedFiles", "Random"] git-tree-sha1 = "5a74ac22a9daef23705f010f72c81d6925b19df8" @@ -1908,32 +1599,6 @@ deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" version = "1.10.0" -[[deps.SparseDiffTools]] -deps = ["ADTypes", "Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "Graphs", "LinearAlgebra", "PackageExtensionCompat", "Random", "Reexport", "SciMLOperators", "Setfield", "SparseArrays", "StaticArrayInterface", "StaticArrays", "Tricks", "UnPack", "VertexSafeGraphs"] -git-tree-sha1 = "a616ac46c38da60ac05cecf52064d44732edd05e" -uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804" -version = "2.17.0" - - [deps.SparseDiffTools.extensions] - SparseDiffToolsEnzymeExt = "Enzyme" - SparseDiffToolsPolyesterExt = "Polyester" - SparseDiffToolsPolyesterForwardDiffExt = "PolyesterForwardDiff" - SparseDiffToolsSymbolicsExt = "Symbolics" - SparseDiffToolsZygoteExt = "Zygote" - - [deps.SparseDiffTools.weakdeps] - Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" - Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588" - PolyesterForwardDiff = "98d1487c-24ca-40b6-b7ab-df2af84e126b" - Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" - Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" - -[[deps.Sparspak]] -deps = ["Libdl", "LinearAlgebra", "Logging", "OffsetArrays", "Printf", "SparseArrays", "Test"] -git-tree-sha1 = "342cf4b449c299d8d1ceaf00b7a49f4fbc7940e7" -uuid = "e56a9233-b9d6-4f03-8d0f-1825330902ac" -version = "0.3.9" - [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] git-tree-sha1 = "e2cfc4012a19088254b3950b85c3c1d8882d864d" @@ -1955,12 +1620,15 @@ deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "PrecompileTools" git-tree-sha1 = "5d66818a39bb04bf328e92bc933ec5b4ee88e436" uuid = "0d7ed370-da01-4f52-bd93-41d350b8b718" version = "1.5.0" -weakdeps = ["OffsetArrays", "StaticArrays"] [deps.StaticArrayInterface.extensions] StaticArrayInterfaceOffsetArraysExt = "OffsetArrays" StaticArrayInterfaceStaticArraysExt = "StaticArrays" + [deps.StaticArrayInterface.weakdeps] + OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" + StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" + [[deps.StaticArrays]] deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] git-tree-sha1 = "bf074c045d3d5ffd956fa0a461da38a44685d6b2" @@ -1994,34 +1662,11 @@ git-tree-sha1 = "5cf7606d6cef84b543b483848d4ae08ad9832b21" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.34.3" -[[deps.StatsFuns]] -deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "cef0472124fab0695b58ca35a77c6fb942fdab8a" -uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "1.3.1" -weakdeps = ["ChainRulesCore", "InverseFunctions"] - - [deps.StatsFuns.extensions] - StatsFunsChainRulesCoreExt = "ChainRulesCore" - StatsFunsInverseFunctionsExt = "InverseFunctions" - -[[deps.SteadyStateDiffEq]] -deps = ["DiffEqBase", "DiffEqCallbacks", "LinearAlgebra", "NLsolve", "Reexport", "SciMLBase"] -git-tree-sha1 = "2ca69f4be3294e4cd987d83d6019037d420d9fc1" -uuid = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f" -version = "1.16.1" - -[[deps.StochasticDiffEq]] -deps = ["Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqNoiseProcess", "DocStringExtensions", "FiniteDiff", "ForwardDiff", "JumpProcesses", "LevyArea", "LinearAlgebra", "Logging", "MuladdMacro", "NLsolve", "OrdinaryDiffEq", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SparseArrays", "SparseDiffTools", "StaticArrays", "UnPack"] -git-tree-sha1 = "97e5d0b7e5ec2e68eec6626af97c59e9f6b6c3d0" -uuid = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0" -version = "6.65.1" - [[deps.StrideArraysCore]] -deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] -git-tree-sha1 = "d6415f66f3d89c615929af907fdc6a3e17af0d8c" +deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] +git-tree-sha1 = "b518da45c50dfab8384125ba829f1739bda41034" uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da" -version = "0.5.2" +version = "0.5.5" [[deps.StringManipulation]] deps = ["PrecompileTools"] @@ -2038,18 +1683,6 @@ deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" version = "7.2.1+1" -[[deps.Sundials]] -deps = ["CEnum", "DataStructures", "DiffEqBase", "Libdl", "LinearAlgebra", "Logging", "PrecompileTools", "Reexport", "SciMLBase", "SparseArrays", "Sundials_jll"] -git-tree-sha1 = "e15f5a73f0d14b9079b807a9d1dac13e4302e997" -uuid = "c3572dad-4567-51f8-b174-8c6c989267f4" -version = "4.24.0" - -[[deps.Sundials_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "SuiteSparse_jll", "libblastrampoline_jll"] -git-tree-sha1 = "ba4d38faeb62de7ef47155ed321dce40a549c305" -uuid = "fb77eaff-e24c-56d4-86b1-d163f2edb164" -version = "5.2.2+0" - [[deps.SymbolicIndexingInterface]] deps = ["DocStringExtensions"] git-tree-sha1 = "f8ab052bfcbdb9b48fad2c80c873aa0d0344dfe5" @@ -2127,12 +1760,6 @@ weakdeps = ["Random", "Test"] [deps.TranscodingStreams.extensions] TestExt = ["Test", "Random"] -[[deps.TriangularSolve]] -deps = ["CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "LoopVectorization", "Polyester", "Static", "VectorizationBase"] -git-tree-sha1 = "7ee8ed8904e7dd5d31bb46294ef5644d9e2e44e4" -uuid = "d5829a12-d9aa-46ab-831f-fb7c9ab06edf" -version = "0.1.21" - [[deps.Tricks]] git-tree-sha1 = "eae1bb484cd63b36999ee58be2de6c178105112f" uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775" @@ -2206,18 +1833,6 @@ git-tree-sha1 = "ca0969166a028236229f63514992fc073799bb78" uuid = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d" version = "0.2.0" -[[deps.VectorizationBase]] -deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static", "StaticArrayInterface"] -git-tree-sha1 = "7209df901e6ed7489fe9b7aa3e46fb788e15db85" -uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.65" - -[[deps.VertexSafeGraphs]] -deps = ["Graphs"] -git-tree-sha1 = "8351f8d73d7e880bfc042a8b6922684ebeafb35c" -uuid = "19fa3120-7c27-5ec5-8db8-b0b0aa330d6f" -version = "0.2.0" - [[deps.Vulkan_Loader_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Wayland_jll", "Xorg_libX11_jll", "Xorg_libXrandr_jll", "xkbcommon_jll"] git-tree-sha1 = "2f0486047a07670caad3a81a075d2e518acc5c59" @@ -2491,6 +2106,12 @@ deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" version = "1.52.0+1" +[[deps.oneTBB_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493" +uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" +version = "2021.12.0+0" + [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/experiments/ClimaCore/Project.toml b/experiments/ClimaCore/Project.toml index 88bd21d042..13f593bbd2 100644 --- a/experiments/ClimaCore/Project.toml +++ b/experiments/ClimaCore/Project.toml @@ -3,7 +3,6 @@ ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884" ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79" CommonDataModel = "1fbeeb36-5f17-413c-809b-666fb144f157" -DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" @@ -21,9 +20,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" ClimaParams = "0.10" ClimaTimeSteppers = "0.7" CommonDataModel = "=0.3.5" -DifferentialEquations = "7.10" FileIO = "1.16" -IntervalSets = "0.6" +IntervalSets = "0.6, 0.7" LinearAlgebra = "1.0" PrettyTables = "2.3" RecursiveArrayTools = "2.38" diff --git a/experiments/ClimaCore/sea_breeze/Manifest.toml b/experiments/ClimaCore/sea_breeze/Manifest.toml index a15a5f9374..cc3039ecbe 100644 --- a/experiments/ClimaCore/sea_breeze/Manifest.toml +++ b/experiments/ClimaCore/sea_breeze/Manifest.toml @@ -31,41 +31,52 @@ git-tree-sha1 = "2d9c9a55f9c93e8887ad391fbae72f8ef55e1177" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" version = "0.4.5" +[[deps.Accessors]] +deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Markdown", "Test"] +git-tree-sha1 = "c0d491ef0b135fd7d63cbc6404286bc633329425" +uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" +version = "0.1.36" + + [deps.Accessors.extensions] + AccessorsAxisKeysExt = "AxisKeys" + AccessorsIntervalSetsExt = "IntervalSets" + AccessorsStaticArraysExt = "StaticArrays" + AccessorsStructArraysExt = "StructArrays" + AccessorsUnitfulExt = "Unitful" + + [deps.Accessors.weakdeps] + AxisKeys = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5" + IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953" + Requires = "ae029012-a4dd-5104-9daa-d747884805df" + StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" + StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" + Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" + [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "cea4ac3f5b4bc4b3000aa55afb6e5626518948fa" +git-tree-sha1 = "6a55b747d1812e699320963ffde36f1ebdda4099" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "4.0.3" +version = "4.0.4" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] AdaptStaticArraysExt = "StaticArrays" -[[deps.ArgCheck]] -git-tree-sha1 = "a3a402a35a2f7e0b87828ccabbd5ebfbebe356b4" -uuid = "dce04be8-c92d-5529-be00-80e4d2c0e197" -version = "2.3.0" - -[[deps.ArgParse]] -deps = ["Logging", "TextWrap"] -git-tree-sha1 = "d4eccacaa3a632e8717556479d45502af44b4c17" -uuid = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" -version = "1.1.5" - [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" version = "1.1.1" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "44691067188f6bd1b2289552a23e4b7572f4528d" +git-tree-sha1 = "133a240faec6e074e07c31ee75619c90544179cf" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.9.0" +version = "7.10.0" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" ArrayInterfaceBlockBandedMatricesExt = "BlockBandedMatrices" ArrayInterfaceCUDAExt = "CUDA" + ArrayInterfaceCUDSSExt = "CUDSS" ArrayInterfaceChainRulesExt = "ChainRules" ArrayInterfaceGPUArraysCoreExt = "GPUArraysCore" ArrayInterfaceReverseDiffExt = "ReverseDiff" @@ -76,6 +87,7 @@ version = "7.9.0" BandedMatrices = "aae01518-5342-5314-be14-df237901396f" BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" + CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e" ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" @@ -84,85 +96,42 @@ version = "7.9.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "e46675dbc095ddfdf2b5fba247d5a25f34e1f8a2" +git-tree-sha1 = "33207a8be6267bc389d0701e97a9bce6a4de68eb" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.6.1" +version = "1.9.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] ArrayLayoutsSparseArraysExt = "SparseArrays" -[[deps.ArtifactWrappers]] -deps = ["Downloads", "Pkg"] -git-tree-sha1 = "760f4c06375735829b8c1b67560b608b9dba4c6a" -uuid = "a14bc488-3040-4b00-9dc1-f6467924858a" -version = "0.2.0" - [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -[[deps.AtmosphericProfilesLibrary]] -deps = ["Dierckx", "LinearAlgebra"] -git-tree-sha1 = "c6be1ce28b7870a60400c51c75dc1b08d6a8dd73" -uuid = "86bc3604-9858-485a-bdbe-831ec50de11d" -version = "0.1.4" - [[deps.Atomix]] deps = ["UnsafeAtomics"] git-tree-sha1 = "c06a868224ecba914baa6942988e2f2aade419be" uuid = "a9b6321e-bd34-4604-b9c9-b65b8de01458" version = "0.1.0" -[[deps.AxisAlgorithms]] -deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] -git-tree-sha1 = "01b8ccb13d68535d73d2b0c23e39bd23155fb712" -uuid = "13072b0f-2c55-5437-9ae7-d433b7a33950" -version = "1.1.0" - [[deps.BFloat16s]] deps = ["LinearAlgebra", "Printf", "Random", "Test"] -git-tree-sha1 = "dbf84058d0a8cbbadee18d25cf606934b22d7c66" +git-tree-sha1 = "2c7cc21e8678eff479978a0a2ef5ce2f51b63dff" uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b" -version = "0.4.2" +version = "0.5.0" [[deps.BandedMatrices]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"] -git-tree-sha1 = "fe7ed7b33416db994f706f66e31bbd1b378f71b7" +git-tree-sha1 = "c946c5014cf4cdbfacacb363b110e7bffba3e742" uuid = "aae01518-5342-5314-be14-df237901396f" -version = "1.6.0" +version = "1.6.1" weakdeps = ["SparseArrays"] [deps.BandedMatrices.extensions] BandedMatricesSparseArraysExt = "SparseArrays" -[[deps.BangBang]] -deps = ["Compat", "ConstructionBase", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables"] -git-tree-sha1 = "7aa7ad1682f3d5754e3491bb59b8103cae28e3a3" -uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.40" - - [deps.BangBang.extensions] - BangBangChainRulesCoreExt = "ChainRulesCore" - BangBangDataFramesExt = "DataFrames" - BangBangStaticArraysExt = "StaticArrays" - BangBangStructArraysExt = "StructArrays" - BangBangTypedTablesExt = "TypedTables" - - [deps.BangBang.weakdeps] - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" - StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" - StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" - TypedTables = "9d95f2ec-7b3d-5a63-8d20-e2491e220bb9" - [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[deps.Baselet]] -git-tree-sha1 = "aebf55e6d7795e02ca500a689d326ac979aaf89e" -uuid = "9718e550-a3fa-408a-8086-8db961cd8217" -version = "0.1.1" - [[deps.BitFlags]] git-tree-sha1 = "2dc09997850d68179b69dafb58ae806167a32b1b" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" @@ -176,9 +145,9 @@ version = "0.1.5" [[deps.BlockArrays]] deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra"] -git-tree-sha1 = "fc69cbdb4277042f72c6e59cbc7024fbe3034b89" +git-tree-sha1 = "9a9610fbe5779636f75229e423e367124034af41" uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" -version = "0.16.39" +version = "0.16.43" [[deps.Blosc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] @@ -209,17 +178,11 @@ git-tree-sha1 = "601f7e7b3d36f18790e2caf83a882d88e9b71ff1" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" version = "0.2.4" -[[deps.CSV]] -deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"] -git-tree-sha1 = "a44910ceb69b0d44fe262dd451ab11ead3ed0be8" -uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" -version = "0.10.13" - [[deps.CUDA]] deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics"] -git-tree-sha1 = "baa8ea7a1ea63316fa3feb454635215773c9c845" +git-tree-sha1 = "dd1c682b372b6791b69f6823afe364fc92a0146c" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "5.2.0" +version = "5.3.1" weakdeps = ["ChainRulesCore", "SpecialFunctions"] [deps.CUDA.extensions] @@ -228,27 +191,21 @@ weakdeps = ["ChainRulesCore", "SpecialFunctions"] [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] -git-tree-sha1 = "d01bfc999768f0a31ed36f5d22a76161fc63079c" +git-tree-sha1 = "dc172b558adbf17952001e15cf0d6364e6d78c2f" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "0.7.0+1" +version = "0.8.1+0" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] -git-tree-sha1 = "2cb12f6b2209f40a4b8967697689a47c50485490" +git-tree-sha1 = "38f830504358e9972d2a0c3e5d51cb865e0733df" uuid = "1af6417a-86b4-443c-805f-a4643ffb695f" -version = "0.2.3" +version = "0.2.4" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "8e25c009d2bf16c2c31a70a6e9e8939f7325cc84" +git-tree-sha1 = "4ca7d6d92075906c2ce871ea8bba971fff20d00c" uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2" -version = "0.11.1+0" - -[[deps.CUDNN_jll]] -deps = ["Artifacts", "CUDA_Runtime_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "75923dce4275ead3799b238e10178a68c07dbd3b" -uuid = "62b44479-cb7b-5706-934f-f13b2eb2e645" -version = "8.9.4+0" +version = "0.12.1+0" [[deps.Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -256,12 +213,6 @@ git-tree-sha1 = "a4c43f59baa34011e303e76f5c8c91bf58415aaf" uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a" version = "1.18.0+1" -[[deps.ChainRules]] -deps = ["Adapt", "ChainRulesCore", "Compat", "Distributed", "GPUArraysCore", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "SparseInverseSubset", "Statistics", "StructArrays", "SuiteSparse"] -git-tree-sha1 = "4e42872be98fa3343c4f8458cbda8c5c6a6fa97c" -uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "1.63.0" - [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] git-tree-sha1 = "575cd02e080939a33b6df6c5853d14924c08e35b" @@ -272,17 +223,11 @@ weakdeps = ["SparseArrays"] [deps.ChainRulesCore.extensions] ChainRulesCoreSparseArraysExt = "SparseArrays" -[[deps.ClimaAtmos]] -deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaParams", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] -git-tree-sha1 = "6f61041395606445cb1c69233b0451f395231cec" -uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.22.0" - [[deps.ClimaComms]] deps = ["CUDA", "MPI"] -git-tree-sha1 = "f0350e34c91c8f3b5a11b5e39990439303d727b1" +git-tree-sha1 = "ef5d206be51fdf62cd0cbd63058e237128652cf7" uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" -version = "0.5.7" +version = "0.5.8" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] @@ -307,26 +252,10 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70" version = "0.3.14" [[deps.ClimaCoupler]] -deps = ["ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "ClimaLand", "ClimaParams", "Dates", "DocStringExtensions", "Insolation", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] +deps = ["CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "DocStringExtensions", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] path = "../../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" -version = "0.1.0" - -[[deps.ClimaLand]] -deps = ["Adapt", "ArtifactWrappers", "CFTime", "CSV", "CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "DataFrames", "Dates", "DocStringExtensions", "Flux", "HTTP", "Insolation", "IntervalSets", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "StatsBase", "SurfaceFluxes", "Thermodynamics", "cuDNN"] -git-tree-sha1 = "ee8d018563e6d0a84a56436b846ee886fbff34b1" -uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532" -version = "0.11.0" -weakdeps = ["ClimaParams"] - - [deps.ClimaLand.extensions] - CreateParametersExt = "ClimaParams" - -[[deps.ClimaParams]] -deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "ec67949db856e01df4cbf7d6ddafefeda02f93ee" -uuid = "5c42b081-d73a-476f-9059-fd94b934656c" -version = "0.10.3" +version = "0.0.1" [[deps.ClimaTimeSteppers]] deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -340,12 +269,6 @@ git-tree-sha1 = "70232f82ffaab9dc52585e0dd043b5e0c6b714f1" uuid = "fb6a15b2-703c-40df-9091-08a04967cfa9" version = "0.1.12" -[[deps.CloudMicrophysics]] -deps = ["ClimaParams", "DocStringExtensions", "ForwardDiff", "RootSolvers", "SpecialFunctions", "Thermodynamics"] -git-tree-sha1 = "4d6c1e67ff8924b14313d71edd3fed6cf9586ae7" -uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" -version = "0.18.0" - [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] git-tree-sha1 = "59939d8a997469ee05c4b4944560a820f9ba0d73" @@ -360,9 +283,9 @@ version = "3.24.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4" +git-tree-sha1 = "b10d0b65641d57b8b4d5e234446582de5047050d" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.11.4" +version = "0.11.5" [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] @@ -416,12 +339,15 @@ version = "1.1.0+0" git-tree-sha1 = "802bb88cd69dfd1509f6670416bd4434015693ad" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" version = "0.1.2" +weakdeps = ["InverseFunctions"] [deps.CompositionsBase.extensions] CompositionsBaseInverseFunctionsExt = "InverseFunctions" - [deps.CompositionsBase.weakdeps] - InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" +[[deps.ConcreteStructs]] +git-tree-sha1 = "f749037478283d372048690eb3b5f92a79432b34" +uuid = "2569d6c7-a4a2-43d3-a901-331e8e4be471" +version = "0.2.3" [[deps.ConcurrentUtilities]] deps = ["Serialization", "Sockets"] @@ -431,25 +357,19 @@ version = "2.4.1" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "c53fc348ca4d40d7b371e71fd52251839080cbc9" +git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.5.4" +version = "1.5.5" weakdeps = ["IntervalSets", "StaticArrays"] [deps.ConstructionBase.extensions] ConstructionBaseIntervalSetsExt = "IntervalSets" ConstructionBaseStaticArraysExt = "StaticArrays" -[[deps.ContextVariablesX]] -deps = ["Compat", "Logging", "UUIDs"] -git-tree-sha1 = "25cc3803f1030ab855e383129dcd3dc294e322cc" -uuid = "6add18c4-b38d-439d-96f6-d6bc489c04c5" -version = "0.1.3" - [[deps.Contour]] -git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781" +git-tree-sha1 = "439e35b0b36e2e5881738abc8857bd92ad6ff9a8" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" -version = "0.6.2" +version = "0.6.3" [[deps.CpuId]] deps = ["Markdown"] @@ -481,9 +401,9 @@ version = "1.6.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0f4b5d62a88d8f59003e43c25a8a90de9eb76317" +git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.18" +version = "0.18.20" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -494,34 +414,17 @@ version = "1.0.0" deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[deps.DefineSingletons]] -git-tree-sha1 = "0fba8b706d0178b4dc7fd44a96a92382c9065c2c" -uuid = "244e2a9f-e319-4986-a169-4d1fe445cd52" -version = "0.1.2" - [[deps.DelimitedFiles]] deps = ["Mmap"] git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" -[[deps.Dierckx]] -deps = ["Dierckx_jll"] -git-tree-sha1 = "d1ea9f433781bb6ff504f7d3cb70c4782c504a3a" -uuid = "39dd38d3-220a-591b-8e3c-4c3a8c710a94" -version = "0.5.3" - -[[deps.Dierckx_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6596b96fe1caff3db36415eeb6e9d3b50bfe40ee" -uuid = "cd4c43a9-7502-52ba-aa6d-59fb2a88580b" -version = "0.1.0+0" - [[deps.DiffEqBase]] -deps = ["ArrayInterface", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "b19b2bb1ecd1271334e4b25d605e50f75e68fcae" +deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] +git-tree-sha1 = "531c53fd0405716712a8b4960216c3b7b5ec89b9" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.148.0" +version = "6.149.1" [deps.DiffEqBase.extensions] DiffEqBaseChainRulesCoreExt = "ChainRulesCore" @@ -612,9 +515,9 @@ uuid = "4e289a0a-7415-4d19-859d-a7e5c4648b56" version = "1.0.4" [[deps.EnzymeCore]] -git-tree-sha1 = "59c44d8fbc651c0395d8a6eda64b05ce316f58b4" +git-tree-sha1 = "18394bc78ac2814ff38fe5e0c9dc2cd171e2810c" uuid = "f151be2c-9106-41f4-ab19-57ee4f262869" -version = "0.6.5" +version = "0.7.2" weakdeps = ["Adapt"] [deps.EnzymeCore.extensions] @@ -667,18 +570,6 @@ git-tree-sha1 = "c6033cc3892d0ef5bb9cd29b7f2f0331ea5184ea" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" version = "3.3.10+0" -[[deps.FLoops]] -deps = ["BangBang", "Compat", "FLoopsBase", "InitialValues", "JuliaVariables", "MLStyle", "Serialization", "Setfield", "Transducers"] -git-tree-sha1 = "ffb97765602e3cbe59a0589d237bf07f245a8576" -uuid = "cc61a311-1640-44b5-9fba-1b764f453329" -version = "0.2.1" - -[[deps.FLoopsBase]] -deps = ["ContextVariablesX"] -git-tree-sha1 = "656f7a6859be8673bf1f35da5670246b923964f7" -uuid = "b9860ae5-e623-471e-878b-f6a53c775ea6" -version = "0.1.1" - [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] git-tree-sha1 = "a6e756a880fc419c8b41592010aebe6a5ce09136" @@ -690,32 +581,20 @@ git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef" uuid = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a" version = "0.3.2" -[[deps.FastGaussQuadrature]] -deps = ["LinearAlgebra", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "fd923962364b645f3719855c88f7074413a6ad92" -uuid = "442a2c76-b920-505d-bb47-c5924d526838" -version = "1.0.2" - [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "c5c28c245101bd59154f649e19b038d15901b5dc" +git-tree-sha1 = "82d8afa92ecf4b52d78d869f038ebfb881267322" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.16.2" - -[[deps.FilePathsBase]] -deps = ["Compat", "Dates", "Mmap", "Printf", "Test", "UUIDs"] -git-tree-sha1 = "9f00e42f8d99fdde64d40c8ea5d14269a2e2c1aa" -uuid = "48062228-2e41-5def-b9a4-89aafe57970f" -version = "0.9.21" +version = "1.16.3" [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.FillArrays]] -deps = ["LinearAlgebra", "Random"] -git-tree-sha1 = "5b93957f6dcd33fc343044af3d48c215be2562f1" +deps = ["LinearAlgebra"] +git-tree-sha1 = "57f08d5665e76397e96b168f9acc12ab17c84a68" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "1.9.3" +version = "1.10.2" [deps.FillArrays.extensions] FillArraysPDMatsExt = "PDMats" @@ -729,9 +608,9 @@ version = "1.9.3" [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "Setfield", "SparseArrays"] -git-tree-sha1 = "bc0c5092d6caaea112d3c8e3b238d61563c58d5f" +git-tree-sha1 = "2de436b72c3422940cbe1367611d137008af7ec3" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.23.0" +version = "2.23.1" [deps.FiniteDiff.extensions] FiniteDiffBandedMatricesExt = "BandedMatrices" @@ -749,24 +628,6 @@ git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc" uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.8.4" -[[deps.Flux]] -deps = ["Adapt", "ChainRulesCore", "Compat", "Functors", "LinearAlgebra", "MLUtils", "MacroTools", "NNlib", "OneHotArrays", "Optimisers", "Preferences", "ProgressLogging", "Random", "Reexport", "SparseArrays", "SpecialFunctions", "Statistics", "Zygote"] -git-tree-sha1 = "5a626d6ef24ae0a8590c22dc12096fb65eb66325" -uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.14.13" - - [deps.Flux.extensions] - FluxAMDGPUExt = "AMDGPU" - FluxCUDAExt = "CUDA" - FluxCUDAcuDNNExt = ["CUDA", "cuDNN"] - FluxMetalExt = "Metal" - - [deps.Flux.weakdeps] - AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e" - CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" - Metal = "dde4c033-4e86-420c-a63e-0dd931031962" - cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" - [[deps.Fontconfig_jll]] deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"] git-tree-sha1 = "21efd19106a55620a188615da6d3d06cd7f6ee03" @@ -774,9 +635,9 @@ uuid = "a3f928ae-7b40-5064-980b-68af3947d34b" version = "2.13.93+0" [[deps.Format]] -git-tree-sha1 = "f3cf88025f6d03c194d73f5d13fee9004a108329" +git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" -version = "1.3.6" +version = "1.3.7" [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] @@ -813,9 +674,9 @@ version = "0.1.3" [[deps.Functors]] deps = ["LinearAlgebra"] -git-tree-sha1 = "8ae30e786837ce0a24f5e2186938bf3251ab94b2" +git-tree-sha1 = "d3e63d9fa13f8eaa2f06f64949e2afc593ff52c2" uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.4.8" +version = "0.4.10" [[deps.Future]] deps = ["Random"] @@ -834,9 +695,9 @@ version = "6.2.1+6" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] -git-tree-sha1 = "47e4686ec18a9620850bad110b79966132f14283" +git-tree-sha1 = "68e8ff56a4a355a85d2784b94614491f8c900cde" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "10.0.2" +version = "10.1.0" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -846,9 +707,9 @@ version = "0.1.6" [[deps.GPUCompiler]] deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "a846f297ce9d09ccba02ead0cae70690e072a119" +git-tree-sha1 = "1600477fba37c9fc067b9be21f5e8101f24a8865" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.25.0" +version = "0.26.4" [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"] @@ -887,9 +748,9 @@ version = "2.80.0+0" [[deps.GnuTLS_jll]] deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Nettle_jll", "P11Kit_jll", "Zlib_jll"] -git-tree-sha1 = "f3c0936dd685d57fa0b1eee7dbebf382b969ea63" +git-tree-sha1 = "383db7d3f900f4c1f47a8a04115b053c095e48d3" uuid = "0951126a-58fd-58f1-b5b3-b08c7c4a876d" -version = "3.8.3+0" +version = "3.8.4+0" [[deps.Graphite2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -904,9 +765,9 @@ version = "1.0.2" [[deps.HDF5]] deps = ["Compat", "HDF5_jll", "Libdl", "MPIPreferences", "Mmap", "Preferences", "Printf", "Random", "Requires", "UUIDs"] -git-tree-sha1 = "26407bd1c60129062cec9da63dc7d08251544d53" +git-tree-sha1 = "e856eef26cf5bf2b0f95f8f4fc37553c72c8641c" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" -version = "0.17.1" +version = "0.17.2" weakdeps = ["MPI"] [deps.HDF5.extensions] @@ -914,15 +775,15 @@ weakdeps = ["MPI"] [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "e4591176488495bf44d7456bd73179d87d5e6eab" +git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+1" +version = "1.14.3+3" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "db864f2d91f68a5912937af80327d288ea1f3aee" +git-tree-sha1 = "2c3ec1f90bb4a8f7beafb0cffea8a4c3f4e636ab" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.3" +version = "1.10.6" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -936,58 +797,27 @@ git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.10.0+0" -[[deps.IRTools]] -deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "5d8c5713f38f7bc029e26627b687710ba406d0dd" -uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.4.12" - [[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" version = "0.1.1" -[[deps.InitialValues]] -git-tree-sha1 = "4da0f88e9a39111c2fa3add390ab15f3a44f3ca3" -uuid = "22cec73e-a1b8-11e9-2c92-598750a2cf9c" -version = "0.3.1" - [[deps.InlineStrings]] deps = ["Parsers"] git-tree-sha1 = "9cc2baf75c6d09f9da536ddf58eb2f29dedaf461" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" version = "1.4.0" -[[deps.Insolation]] -deps = ["Artifacts", "Dates", "DelimitedFiles", "Interpolations"] -git-tree-sha1 = "1a2a8e1f202523619225fb54adf458b9345cee9b" -uuid = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" -version = "0.9.2" -weakdeps = ["ClimaParams"] - - [deps.Insolation.extensions] - CreateParametersExt = "ClimaParams" - [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "5fdf2fe6724d8caabf43b557b84ce53f3b7e2f6b" +git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.0.2+0" +version = "2024.1.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[deps.Interpolations]] -deps = ["Adapt", "AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "88a101217d7cb38a7b481ccd50d21876e1d1b0e0" -uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.15.1" -weakdeps = ["Unitful"] - - [deps.Interpolations.extensions] - InterpolationsUnitfulExt = "Unitful" - [[deps.IntervalSets]] git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" uuid = "8197267c-284f-5f27-9208-e0e47529a953" @@ -999,6 +829,16 @@ weakdeps = ["Random", "RecipesBase", "Statistics"] IntervalSetsRecipesBaseExt = "RecipesBase" IntervalSetsStatisticsExt = "Statistics" +[[deps.InverseFunctions]] +deps = ["Test"] +git-tree-sha1 = "896385798a8d49a255c398bd49162062e4a4c435" +uuid = "3587e190-3f89-42d0-90ee-14403ec27112" +version = "0.1.13" +weakdeps = ["Dates"] + + [deps.InverseFunctions.extensions] + DatesExt = "Dates" + [[deps.InvertedIndices]] git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038" uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" @@ -1050,12 +890,6 @@ git-tree-sha1 = "af433a10f3942e882d3c671aacb203e006a5808f" uuid = "9c1d0b0a-7046-5b2e-a33f-ea22f176ac7e" version = "0.2.1+0" -[[deps.JuliaVariables]] -deps = ["MLStyle", "NameResolution"] -git-tree-sha1 = "49fb3cb53362ddadb4415e9b73926d6b40709e70" -uuid = "b14d175d-62b4-44ba-8fb7-3064adc8c3ec" -version = "0.2.4" - [[deps.KernelAbstractions]] deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"] git-tree-sha1 = "ed7167240f40e62d97c1f5f7735dea6de3cc5c49" @@ -1098,9 +932,9 @@ version = "3.0.0+1" [[deps.LLVM]] deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Preferences", "Printf", "Requires", "Unicode"] -git-tree-sha1 = "ddab4d40513bce53c8e3157825e245224f74fae7" +git-tree-sha1 = "839c82932db86740ae729779e610f07a1640be9a" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "6.6.0" +version = "6.6.3" weakdeps = ["BFloat16s"] [deps.LLVM.extensions] @@ -1145,9 +979,9 @@ version = "1.3.1" [[deps.Latexify]] deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"] -git-tree-sha1 = "cad560042a7cc108f5a4c24ea1431a9221f22c1b" +git-tree-sha1 = "e0b5cd21dc1b44ec6e64f351976f961e6f31d6c4" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.16.2" +version = "0.16.3" [deps.Latexify.extensions] DataFramesExt = "DataFrames" @@ -1207,10 +1041,10 @@ uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" version = "3.2.2+1" [[deps.Libgcrypt_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] -git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll"] +git-tree-sha1 = "9fd170c4bbfd8b935fdc5f8b7aa33532c991a673" uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" -version = "1.8.7+0" +version = "1.8.11+0" [[deps.Libglvnd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] @@ -1300,21 +1134,10 @@ uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" version = "1.9.4+0" [[deps.MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] -git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" +deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] +git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.0.0+0" - -[[deps.MLStyle]] -git-tree-sha1 = "bc38dff0548128765760c79eb7388a4b37fae2c8" -uuid = "d8e11817-5142-5d16-987a-aa16d5891078" -version = "0.4.17" - -[[deps.MLUtils]] -deps = ["ChainRulesCore", "Compat", "DataAPI", "DelimitedFiles", "FLoops", "NNlib", "Random", "ShowCases", "SimpleTraits", "Statistics", "StatsBase", "Tables", "Transducers"] -git-tree-sha1 = "b45738c2e3d0d402dffa32b2c1654759a2ac35a4" -uuid = "f1d291b0-491e-4a28-83b9-f70985020b54" -version = "0.4.4" +version = "2024.1.0+0" [[deps.MPI]] deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"] @@ -1332,9 +1155,9 @@ version = "0.20.19" [[deps.MPICH_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" +git-tree-sha1 = "d8a7bf80c88326ebc98b7d38437208c3a0f20725" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.2.0+0" +version = "4.2.1+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -1343,10 +1166,10 @@ uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.10" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "3f884417b47a96d87e7c6219f8f7b30ce67f4f2c" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.2+0" +version = "5.3.3+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1379,12 +1202,6 @@ git-tree-sha1 = "c13304c81eec1ed3af7fc20e75fb6b26092a1102" uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e" version = "0.3.2" -[[deps.MicroCollections]] -deps = ["BangBang", "InitialValues", "Setfield"] -git-tree-sha1 = "629afd7d10dbc6935ec59b32daeb33bc4460a42e" -uuid = "128add7d-3638-4c79-886c-908ea0c25c34" -version = "0.1.4" - [[deps.MicrosoftMPI_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "f12a29c4400ba812841c6ace3f4efbb6dbb3ba01" @@ -1393,9 +1210,9 @@ version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272" +git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "1.1.0" +version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -1411,9 +1228,9 @@ version = "0.2.4" [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "79400cceb1655e7b2fe528a7b114c785bc152e59" +git-tree-sha1 = "a640912695952b074672edb5f9aaee2f7f9fd59a" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.14.1" +version = "0.14.4" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1427,24 +1244,6 @@ git-tree-sha1 = "019f12e9a1a7880459d0173c182e6a99365d7ac1" uuid = "2774e3e8-f4cf-5e23-947b-6d7e65073b56" version = "4.5.1" -[[deps.NNlib]] -deps = ["Adapt", "Atomix", "ChainRulesCore", "GPUArraysCore", "KernelAbstractions", "LinearAlgebra", "Pkg", "Random", "Requires", "Statistics"] -git-tree-sha1 = "877f15c331337d54cf24c797d5bcb2e48ce21221" -uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.9.12" - - [deps.NNlib.extensions] - NNlibAMDGPUExt = "AMDGPU" - NNlibCUDACUDNNExt = ["CUDA", "cuDNN"] - NNlibCUDAExt = "CUDA" - NNlibEnzymeCoreExt = "EnzymeCore" - - [deps.NNlib.weakdeps] - AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e" - CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" - EnzymeCore = "f151be2c-9106-41f4-ab19-57ee4f262869" - cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" - [[deps.NVTX]] deps = ["Colors", "JuliaNVTXCallbacks_jll", "Libdl", "NVTX_jll"] git-tree-sha1 = "53046f0483375e3ed78e49190f1154fa0a4083a1" @@ -1463,17 +1262,11 @@ git-tree-sha1 = "0877504529a3e5c3343c6f8b4c0381e57e4387e4" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.0.2" -[[deps.NameResolution]] -deps = ["PrettyPrint"] -git-tree-sha1 = "1a0fa0e9613f46c9b8c11eee38ebb4f590013c5e" -uuid = "71a1bf82-56d0-4bbc-8a3c-48b961074391" -version = "0.1.5" - [[deps.NetCDF_jll]] -deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] -git-tree-sha1 = "a8af1798e4eb9ff768ce7fdefc0e957097793f15" +deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] +git-tree-sha1 = "ef30054d4e6eab74228cc7beae0c0873129bc078" uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" -version = "400.902.209+0" +version = "400.902.211+0" [[deps.Nettle_jll]] deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -1486,9 +1279,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.OffsetArrays]] -git-tree-sha1 = "6a731f2b5c03157418a20c12195eb4b74c8f8621" +git-tree-sha1 = "e64b4f5ea6b7389f6f046d13d4896a8f9c1ba71e" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.13.0" +version = "1.14.0" weakdeps = ["Adapt"] [deps.OffsetArrays.extensions] @@ -1500,12 +1293,6 @@ git-tree-sha1 = "887579a3eb005446d514ab7aeac5d1d027658b8f" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" version = "1.3.5+1" -[[deps.OneHotArrays]] -deps = ["Adapt", "ChainRulesCore", "Compat", "GPUArraysCore", "LinearAlgebra", "NNlib"] -git-tree-sha1 = "963a3f28a2e65bb87a68033ea4a616002406037d" -uuid = "0b1bfda6-eb8a-41d2-88d8-f5af5cad476f" -version = "0.2.5" - [[deps.OpenBLAS32_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] git-tree-sha1 = "6065c4cff8fee6c6770b277af45d5082baacdba1" @@ -1530,15 +1317,15 @@ version = "4.1.6+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "af81a32750ebc831ee28bdaaba6e1067decef51e" +git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.4.2" +version = "1.4.3" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "60e3045590bd104a16fefb12836c00c0ef8c7f8c" +git-tree-sha1 = "3da7367955dcc5c54c1ba4d402ccdc09a1a3e046" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.13+0" +version = "3.0.13+1" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -1546,12 +1333,6 @@ git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.5+0" -[[deps.Optimisers]] -deps = ["ChainRulesCore", "Functors", "LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "264b061c1903bc0fe9be77cb9050ebacff66bb63" -uuid = "3bd65402-5787-11e9-1adc-39752487f4e2" -version = "0.3.2" - [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720" @@ -1642,9 +1423,9 @@ version = "1.40.2" [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] -git-tree-sha1 = "fca25670784a1ae44546bcb17288218310af2778" +git-tree-sha1 = "2ba5f33cbb51a85ef58a850749492b08f9bf2193" uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" -version = "0.7.9" +version = "0.7.13" [[deps.PolyesterWeave]] deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"] @@ -1660,9 +1441,9 @@ version = "1.4.3" [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "ForwardDiff"] -git-tree-sha1 = "b6665214f2d0739f2d09a17474dd443b9139784a" +git-tree-sha1 = "a660e9daab5db07adf3dedfe09b435cc530d855e" uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.20" +version = "0.4.21" [deps.PreallocationTools.extensions] PreallocationToolsReverseDiffExt = "ReverseDiff" @@ -1682,11 +1463,6 @@ git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6" uuid = "21216c6a-2e73-6563-6e65-726566657250" version = "1.4.3" -[[deps.PrettyPrint]] -git-tree-sha1 = "632eb4abab3449ab30c5e1afaa874f0b98b586e4" -uuid = "8162dcfd-2161-5ef2-ae6c-7681170c5f98" -version = "0.2.0" - [[deps.PrettyTables]] deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "Reexport", "StringManipulation", "Tables"] git-tree-sha1 = "88b895d13d53b5577fd53379d913b9ab9ac82660" @@ -1719,16 +1495,6 @@ version = "6.5.3+1" deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" -[[deps.RRTMGP]] -deps = ["Adapt", "Artifacts", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"] -git-tree-sha1 = "af4b414b2c57927e0be6ba49c137f30df7889a1c" -uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1" -version = "0.13.1" -weakdeps = ["ClimaParams"] - - [deps.RRTMGP.extensions] - CreateParametersExt = "ClimaParams" - [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" @@ -1745,22 +1511,6 @@ git-tree-sha1 = "043da614cc7e95c703498a491e2c21f58a2b8111" uuid = "e6cf234a-135c-5ec9-84dd-332b85af5143" version = "1.5.3" -[[deps.Ratios]] -deps = ["Requires"] -git-tree-sha1 = "1342a47bf3260ee108163042310d26f2be5ec90b" -uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.4.5" -weakdeps = ["FixedPointNumbers"] - - [deps.Ratios.extensions] - RatiosFixedPointNumbersExt = "FixedPointNumbers" - -[[deps.RealDot]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "9f0a1b71baaf7650f4fa8a1d168c7fb6ee41f0c9" -uuid = "c1ae055f-0cd5-4b69-90a6-9a35b1a98df9" -version = "0.1.0" - [[deps.RecipesBase]] deps = ["PrecompileTools"] git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff" @@ -1775,9 +1525,9 @@ version = "0.6.12" [[deps.RecursiveArrayTools]] deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "SparseArrays", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "a94d22ca9ad49a7a169ecbc5419c59b9793937cc" +git-tree-sha1 = "d8f131090f2e44b145084928856a561c83f43b27" uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" -version = "3.12.0" +version = "3.13.0" [deps.RecursiveArrayTools.extensions] RecursiveArrayToolsFastBroadcastExt = "FastBroadcast" @@ -1822,9 +1572,9 @@ version = "0.4.2" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] -git-tree-sha1 = "6aacc5eefe8415f47b3e34214c1d79d2674a0ba2" +git-tree-sha1 = "04c968137612c4a5629fa531334bb81ad5680f00" uuid = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47" -version = "0.5.12" +version = "0.5.13" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -1887,15 +1637,6 @@ git-tree-sha1 = "e2cc6d8c88613c05e1defb55170bf5ff211fbeac" uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" version = "1.1.1" -[[deps.SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - -[[deps.ShowCases]] -git-tree-sha1 = "7f534ad62ab2bd48591bdeac81994ea8c445e4a5" -uuid = "605ecd9f-84a6-4c9e-81e2-4798472b76a3" -version = "0.1.0" - [[deps.Showoff]] deps = ["Dates", "Grisu"] git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de" @@ -1907,12 +1648,6 @@ git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.1.0" -[[deps.SimpleTraits]] -deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" -uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.4" - [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -1927,12 +1662,6 @@ deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" version = "1.10.0" -[[deps.SparseInverseSubset]] -deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "52962839426b75b3021296f7df242e40ecfc0852" -uuid = "dc90abb0-5640-4711-901d-7e5b23a2fada" -version = "0.1.2" - [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] git-tree-sha1 = "e2cfc4012a19088254b3950b85c3c1d8882d864d" @@ -1943,12 +1672,6 @@ weakdeps = ["ChainRulesCore"] [deps.SpecialFunctions.extensions] SpecialFunctionsChainRulesCoreExt = "ChainRulesCore" -[[deps.SplittablesBase]] -deps = ["Setfield", "Test"] -git-tree-sha1 = "e08a62abc517eb79667d0a29dc08a3b589516bb5" -uuid = "171d559e-b47b-412a-8079-5efa626c420e" -version = "0.1.15" - [[deps.Static]] deps = ["IfElse"] git-tree-sha1 = "d2fdac9ff3906e27f7a618d47b676941baa6c80c" @@ -1995,21 +1718,15 @@ version = "1.7.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "1d77abd07f617c4868c33d4f5b9e1dbb2643c9cf" +git-tree-sha1 = "5cf7606d6cef84b543b483848d4ae08ad9832b21" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.34.2" +version = "0.34.3" [[deps.StrideArraysCore]] -deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] -git-tree-sha1 = "d6415f66f3d89c615929af907fdc6a3e17af0d8c" +deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] +git-tree-sha1 = "25349bf8f63aa36acbff5e3550a86e9f5b0ef682" uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da" -version = "0.5.2" - -[[deps.StringEncodings]] -deps = ["Libiconv_jll"] -git-tree-sha1 = "b765e46ba27ecf6b44faf70df40c57aa3a547dcb" -uuid = "69024149-9ee7-55f6-a4c4-859efe599b68" -version = "0.3.7" +version = "0.5.6" [[deps.StringManipulation]] deps = ["PrecompileTools"] @@ -2017,19 +1734,6 @@ git-tree-sha1 = "a04cabe79c5f01f4d723cc6704070ada0b9d46d5" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.3.4" -[[deps.StructArrays]] -deps = ["ConstructionBase", "DataAPI", "Tables"] -git-tree-sha1 = "f4dc295e983502292c4c3f951dbb4e985e35b3be" -uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.6.18" -weakdeps = ["Adapt", "GPUArraysCore", "SparseArrays", "StaticArrays"] - - [deps.StructArrays.extensions] - StructArraysAdaptExt = "Adapt" - StructArraysGPUArraysCoreExt = "GPUArraysCore" - StructArraysSparseArraysExt = "SparseArrays" - StructArraysStaticArraysExt = "StaticArrays" - [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" @@ -2044,16 +1748,18 @@ deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"] git-tree-sha1 = "89c701c87f378ce95e7ddbcd69b8f1106ba8b968" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" version = "0.11.0" -weakdeps = ["ClimaParams"] [deps.SurfaceFluxes.extensions] CreateParametersExt = "ClimaParams" + [deps.SurfaceFluxes.weakdeps] + ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" + [[deps.SymbolicIndexingInterface]] -deps = ["MacroTools", "RuntimeGeneratedFunctions"] -git-tree-sha1 = "f7b1fc9fc2bc938436b7684c243be7d317919056" +deps = ["Accessors", "ArrayInterface", "MacroTools", "RuntimeGeneratedFunctions", "StaticArraysCore"] +git-tree-sha1 = "40ea524431a92328cd73582d1820a5b08247a40f" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.11" +version = "0.3.16" [[deps.TOML]] deps = ["Dates"] @@ -2111,21 +1817,18 @@ version = "0.1.7" deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[deps.TextWrap]] -git-tree-sha1 = "9250ef9b01b66667380cf3275b3f7488d0e25faf" -uuid = "b718987f-49a8-5099-9789-dcd902bef87d" -version = "1.0.1" - [[deps.Thermodynamics]] deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"] git-tree-sha1 = "6098c65a2ad62312ac74cb1627c8fb33efe33287" uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" version = "0.12.5" -weakdeps = ["ClimaParams"] [deps.Thermodynamics.extensions] CreateParametersExt = "ClimaParams" + [deps.Thermodynamics.weakdeps] + ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c" + [[deps.ThreadingUtilities]] deps = ["ManualMemory"] git-tree-sha1 = "eda08f7e9818eb53661b3deb74e3159460dfbc27" @@ -2139,34 +1842,14 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.23" [[deps.TranscodingStreams]] -git-tree-sha1 = "3caa21522e7efac1ba21834a03734c57b4611c7e" +git-tree-sha1 = "71509f04d045ec714c4748c785a59045c3736349" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.10.4" +version = "0.10.7" weakdeps = ["Random", "Test"] [deps.TranscodingStreams.extensions] TestExt = ["Test", "Random"] -[[deps.Transducers]] -deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "ConstructionBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "3064e780dbb8a9296ebb3af8f440f787bb5332af" -uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.80" - - [deps.Transducers.extensions] - TransducersBlockArraysExt = "BlockArrays" - TransducersDataFramesExt = "DataFrames" - TransducersLazyArraysExt = "LazyArrays" - TransducersOnlineStatsBaseExt = "OnlineStatsBase" - TransducersReferenceablesExt = "Referenceables" - - [deps.Transducers.weakdeps] - BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" - DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" - LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02" - OnlineStatsBase = "925886fa-5bf2-5e8e-b522-a9147a512338" - Referenceables = "42d2dcc6-99eb-4e98-b66c-637b7d73030e" - [[deps.Tricks]] git-tree-sha1 = "eae1bb484cd63b36999ee58be2de6c178105112f" uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775" @@ -2211,15 +1894,12 @@ deps = ["Dates", "LinearAlgebra", "Random"] git-tree-sha1 = "3c793be6df9dd77a0cf49d80984ef9ff996948fa" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" version = "1.19.0" +weakdeps = ["ConstructionBase", "InverseFunctions"] [deps.Unitful.extensions] ConstructionBaseUnitfulExt = "ConstructionBase" InverseFunctionsUnitfulExt = "InverseFunctions" - [deps.Unitful.weakdeps] - ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9" - InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" - [[deps.UnitfulLatexify]] deps = ["LaTeXStrings", "Latexify", "Unitful"] git-tree-sha1 = "e2d817cc500e960fdbafcf988ac8436ba3208bfd" @@ -2266,28 +1946,11 @@ git-tree-sha1 = "93f43ab61b16ddfb2fd3bb13b3ce241cafb0e6c9" uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" version = "1.31.0+0" -[[deps.WeakRefStrings]] -deps = ["DataAPI", "InlineStrings", "Parsers"] -git-tree-sha1 = "b1be2855ed9ed8eac54e5caff2afcdb442d52c23" -uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" -version = "1.4.2" - -[[deps.WoodburyMatrices]] -deps = ["LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "c1a7aa6219628fcd757dede0ca95e245c5cd9511" -uuid = "efce3f68-66dc-5838-9240-27a6d6f5f9b6" -version = "1.0.0" - -[[deps.WorkerUtilities]] -git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7" -uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60" -version = "1.6.1" - [[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"] -git-tree-sha1 = "07e470dabc5a6a4254ffebc29a1b3fc01464e105" +git-tree-sha1 = "532e22cf7be8462035d092ff21fada7527e2c488" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.12.5+0" +version = "2.12.6+0" [[deps.XSLT_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"] @@ -2297,9 +1960,9 @@ version = "1.1.34+0" [[deps.XZ_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "31c421e5516a6248dfb22c194519e37effbf1f30" +git-tree-sha1 = "ac88fb95ae6447c8dda6a5503f3bafd496ae8632" uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" -version = "5.6.1+0" +version = "5.4.6+0" [[deps.Xorg_libICE_jll]] deps = ["Libdl", "Pkg"] @@ -2445,12 +2108,6 @@ git-tree-sha1 = "e92a1a012a10506618f10b7047e478403a046c77" uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" version = "1.5.0+0" -[[deps.YAML]] -deps = ["Base64", "Dates", "Printf", "StringEncodings"] -git-tree-sha1 = "e6330e4b731a6af7959673621e91645eb1356884" -uuid = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" -version = "0.4.9" - [[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" @@ -2458,37 +2115,9 @@ version = "1.2.13+1" [[deps.Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "49ce682769cd5de6c72dcf1b94ed7790cd08974c" +git-tree-sha1 = "e678132f07ddb5bfa46857f0d7620fb9be675d3b" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.5.5+0" - -[[deps.Zygote]] -deps = ["AbstractFFTs", "ChainRules", "ChainRulesCore", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "GPUArrays", "GPUArraysCore", "IRTools", "InteractiveUtils", "LinearAlgebra", "LogExpFunctions", "MacroTools", "NaNMath", "PrecompileTools", "Random", "Requires", "SparseArrays", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "4ddb4470e47b0094c93055a3bcae799165cc68f1" -uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.6.69" - - [deps.Zygote.extensions] - ZygoteColorsExt = "Colors" - ZygoteDistancesExt = "Distances" - ZygoteTrackerExt = "Tracker" - - [deps.Zygote.weakdeps] - Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" - Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" - Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" - -[[deps.ZygoteRules]] -deps = ["ChainRulesCore", "MacroTools"] -git-tree-sha1 = "27798139afc0a2afa7b1824c206d5e87ea587a00" -uuid = "700de1a5-db45-46bc-99cf-38207098b444" -version = "0.2.5" - -[[deps.cuDNN]] -deps = ["CEnum", "CUDA", "CUDA_Runtime_Discovery", "CUDNN_jll"] -git-tree-sha1 = "d433ec29756895512190cac9c96666d879f07b92" -uuid = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" -version = "1.3.0" +version = "1.5.6+0" [[deps.eudev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "gperf_jll"] @@ -2578,6 +2207,12 @@ deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" version = "1.52.0+1" +[[deps.oneTBB_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493" +uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" +version = "2021.12.0+0" + [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 91457f6400..b00a61bca0 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -5,9 +5,14 @@ manifest_format = "2.0" project_hash = "647e4bb9de6fec70b3e8cb44ebde6c64c497515f" [[deps.ADTypes]] -git-tree-sha1 = "016833eb52ba2d6bea9fcb50ca295980e728ee24" +git-tree-sha1 = "fcdb00b4d412b80ab08e39978e3bdef579e5e224" uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b" -version = "0.2.7" +version = "1.0.0" +weakdeps = ["ChainRulesCore", "EnzymeCore"] + + [deps.ADTypes.extensions] + ADTypesChainRulesCoreExt = "ChainRulesCore" + ADTypesEnzymeCoreExt = "EnzymeCore" [[deps.AMD]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse_jll"] @@ -79,14 +84,15 @@ version = "1.1.1" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "44691067188f6bd1b2289552a23e4b7572f4528d" +git-tree-sha1 = "133a240faec6e074e07c31ee75619c90544179cf" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.9.0" +version = "7.10.0" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" ArrayInterfaceBlockBandedMatricesExt = "BlockBandedMatrices" ArrayInterfaceCUDAExt = "CUDA" + ArrayInterfaceCUDSSExt = "CUDSS" ArrayInterfaceChainRulesExt = "ChainRules" ArrayInterfaceGPUArraysCoreExt = "GPUArraysCore" ArrayInterfaceReverseDiffExt = "ReverseDiff" @@ -97,6 +103,7 @@ version = "7.9.0" BandedMatrices = "aae01518-5342-5314-be14-df237901396f" BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0" CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" + CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e" ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2" GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" @@ -105,9 +112,9 @@ version = "7.9.0" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra"] -git-tree-sha1 = "0330bc3e828a05d1073553fb56f9695d73077370" +git-tree-sha1 = "33207a8be6267bc389d0701e97a9bce6a4de68eb" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.9.1" +version = "1.9.2" weakdeps = ["SparseArrays"] [deps.ArrayLayouts.extensions] @@ -232,15 +239,15 @@ version = "0.2.4" [[deps.CSV]] deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"] -git-tree-sha1 = "a44910ceb69b0d44fe262dd451ab11ead3ed0be8" +git-tree-sha1 = "6c834533dc1fabd820c1db03c839bf97e45a3fab" uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" -version = "0.10.13" +version = "0.10.14" [[deps.CUDA]] deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics"] -git-tree-sha1 = "baa8ea7a1ea63316fa3feb454635215773c9c845" +git-tree-sha1 = "dd1c682b372b6791b69f6823afe364fc92a0146c" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "5.2.0" +version = "5.3.1" weakdeps = ["ChainRulesCore", "SpecialFunctions"] [deps.CUDA.extensions] @@ -249,27 +256,27 @@ weakdeps = ["ChainRulesCore", "SpecialFunctions"] [[deps.CUDA_Driver_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] -git-tree-sha1 = "d01bfc999768f0a31ed36f5d22a76161fc63079c" +git-tree-sha1 = "dc172b558adbf17952001e15cf0d6364e6d78c2f" uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc" -version = "0.7.0+1" +version = "0.8.1+0" [[deps.CUDA_Runtime_Discovery]] deps = ["Libdl"] -git-tree-sha1 = "2cb12f6b2209f40a4b8967697689a47c50485490" +git-tree-sha1 = "38f830504358e9972d2a0c3e5d51cb865e0733df" uuid = "1af6417a-86b4-443c-805f-a4643ffb695f" -version = "0.2.3" +version = "0.2.4" [[deps.CUDA_Runtime_jll]] deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "8e25c009d2bf16c2c31a70a6e9e8939f7325cc84" +git-tree-sha1 = "4ca7d6d92075906c2ce871ea8bba971fff20d00c" uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2" -version = "0.11.1+0" +version = "0.12.1+0" [[deps.CUDNN_jll]] deps = ["Artifacts", "CUDA_Runtime_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "75923dce4275ead3799b238e10178a68c07dbd3b" +git-tree-sha1 = "cbf7d75f8c58b147bdf6acea2e5bc96cececa6d4" uuid = "62b44479-cb7b-5706-934f-f13b2eb2e645" -version = "8.9.4+0" +version = "9.0.0+1" [[deps.Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -279,9 +286,9 @@ version = "1.18.0+1" [[deps.ChainRules]] deps = ["Adapt", "ChainRulesCore", "Compat", "Distributed", "GPUArraysCore", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "SparseInverseSubset", "Statistics", "StructArrays", "SuiteSparse"] -git-tree-sha1 = "4e42872be98fa3343c4f8458cbda8c5c6a6fa97c" +git-tree-sha1 = "e7d1016142a71c980309114ee30a3e4f870902f4" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "1.63.0" +version = "1.65.0" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] @@ -295,9 +302,9 @@ weakdeps = ["SparseArrays"] [[deps.ClimaAtmos]] deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaParams", "ClimaTimeSteppers", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DiffEqCallbacks", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"] -git-tree-sha1 = "6f61041395606445cb1c69233b0451f395231cec" +git-tree-sha1 = "4960972c563c63850c0c730939a0ec38281ac5c1" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" -version = "0.22.0" +version = "0.22.1" [[deps.ClimaComms]] deps = ["CUDA", "MPI"] @@ -306,10 +313,10 @@ uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" version = "0.5.8" [[deps.ClimaCore]] -deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] -git-tree-sha1 = "3c8ba2a248d30aaa7f0e72a3516b142521447377" +deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "Unrolled"] +git-tree-sha1 = "ce60e793254676e4ff0121997bae6fc4b78ebd09" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.13.3" +version = "0.13.4" weakdeps = ["Krylov"] [deps.ClimaCore.extensions] @@ -328,7 +335,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70" version = "0.3.14" [[deps.ClimaCoupler]] -deps = ["ClimaAtmos", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "ClimaLand", "ClimaParams", "Dates", "DocStringExtensions", "Insolation", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] +deps = ["CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "DocStringExtensions", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"] path = ".." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.0.1" @@ -345,15 +352,15 @@ weakdeps = ["ClimaParams"] [[deps.ClimaParams]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "1a3d2455fff201bcf130bbd5a71ac16fc3c21fd1" +git-tree-sha1 = "528aadfaae6f447df3879eab224625ecceec5982" uuid = "5c42b081-d73a-476f-9059-fd94b934656c" -version = "0.10.4" +version = "0.10.5" [[deps.ClimaTimeSteppers]] deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] -git-tree-sha1 = "9c203f39784c968700c55f555754a7771b3410df" +git-tree-sha1 = "5e9df5522c1a5259c913a54ad842edb11f0cdeb5" uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79" -version = "0.7.19" +version = "0.7.20" [[deps.CloseOpenIntervals]] deps = ["Static", "StaticArrayInterface"] @@ -381,9 +388,9 @@ version = "3.24.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4" +git-tree-sha1 = "b10d0b65641d57b8b4d5e234446582de5047050d" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.11.4" +version = "0.11.5" [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] @@ -505,9 +512,9 @@ version = "1.6.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0f4b5d62a88d8f59003e43c25a8a90de9eb76317" +git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.18" +version = "0.18.20" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -543,9 +550,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "4fa023dbb15b3485426bbc6c43e030c14250d664" +git-tree-sha1 = "531c53fd0405716712a8b4960216c3b7b5ec89b9" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.149.0" +version = "6.149.1" [deps.DiffEqBase.extensions] DiffEqBaseChainRulesCoreExt = "ChainRulesCore" @@ -737,9 +744,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.FillArrays]] deps = ["LinearAlgebra"] -git-tree-sha1 = "bfe82a708416cf00b73a3198db0859c82f741558" +git-tree-sha1 = "57f08d5665e76397e96b168f9acc12ab17c84a68" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "1.10.0" +version = "1.10.2" [deps.FillArrays.extensions] FillArraysPDMatsExt = "PDMats" @@ -753,9 +760,9 @@ version = "1.10.0" [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "Setfield", "SparseArrays"] -git-tree-sha1 = "bc0c5092d6caaea112d3c8e3b238d61563c58d5f" +git-tree-sha1 = "2de436b72c3422940cbe1367611d137008af7ec3" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.23.0" +version = "2.23.1" [deps.FiniteDiff.extensions] FiniteDiffBandedMatricesExt = "BandedMatrices" @@ -837,9 +844,9 @@ version = "0.1.3" [[deps.Functors]] deps = ["LinearAlgebra"] -git-tree-sha1 = "fa8d8fcfa6c38a9a7aa07233e35b3d9a39ec751a" +git-tree-sha1 = "d3e63d9fa13f8eaa2f06f64949e2afc593ff52c2" uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.4.9" +version = "0.4.10" [[deps.Future]] deps = ["Random"] @@ -858,9 +865,9 @@ version = "6.2.1+6" [[deps.GPUArrays]] deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] -git-tree-sha1 = "47e4686ec18a9620850bad110b79966132f14283" +git-tree-sha1 = "68e8ff56a4a355a85d2784b94614491f8c900cde" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "10.0.2" +version = "10.1.0" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -870,9 +877,9 @@ version = "0.1.6" [[deps.GPUCompiler]] deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "a846f297ce9d09ccba02ead0cae70690e072a119" +git-tree-sha1 = "1600477fba37c9fc067b9be21f5e8101f24a8865" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.25.0" +version = "0.26.4" [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"] @@ -943,15 +950,15 @@ weakdeps = ["MPI"] [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "6384c847ff5056c5624e30e75b3ca48902cae0ac" +git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+2" +version = "1.14.3+3" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "8e59b47b9dc525b70550ca082ce85bcd7f5477cd" +git-tree-sha1 = "2c3ec1f90bb4a8f7beafb0cffea8a4c3f4e636ab" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.5" +version = "1.10.6" [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -967,9 +974,9 @@ version = "2.10.0+0" [[deps.IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] -git-tree-sha1 = "5d8c5713f38f7bc029e26627b687710ba406d0dd" +git-tree-sha1 = "d05027a62b4c9a2223820a9fdeae1110ad3946a5" uuid = "7869d1d1-7146-5819-86e3-90919afe41df" -version = "0.4.12" +version = "0.4.13" [[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" @@ -999,9 +1006,9 @@ weakdeps = ["ClimaParams"] [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "5fdf2fe6724d8caabf43b557b84ce53f3b7e2f6b" +git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.0.2+0" +version = "2024.1.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] @@ -1030,9 +1037,9 @@ weakdeps = ["Random", "RecipesBase", "Statistics"] [[deps.InverseFunctions]] deps = ["Test"] -git-tree-sha1 = "896385798a8d49a255c398bd49162062e4a4c435" +git-tree-sha1 = "e7cbed5032c4c397a6ac23d1493f3289e01231c4" uuid = "3587e190-3f89-42d0-90ee-14403ec27112" -version = "0.1.13" +version = "0.1.14" weakdeps = ["Dates"] [deps.InverseFunctions.extensions] @@ -1184,9 +1191,9 @@ version = "1.3.1" [[deps.Latexify]] deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"] -git-tree-sha1 = "cad560042a7cc108f5a4c24ea1431a9221f22c1b" +git-tree-sha1 = "e0b5cd21dc1b44ec6e64f351976f961e6f31d6c4" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.16.2" +version = "0.16.3" [deps.Latexify.extensions] DataFramesExt = "DataFrames" @@ -1246,10 +1253,10 @@ uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" version = "3.2.2+1" [[deps.Libgcrypt_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] -git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll"] +git-tree-sha1 = "9fd170c4bbfd8b935fdc5f8b7aa33532c991a673" uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" -version = "1.8.7+0" +version = "1.8.11+0" [[deps.Libglvnd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] @@ -1339,10 +1346,10 @@ uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" version = "1.9.4+0" [[deps.MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] -git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" +deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] +git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.0.0+0" +version = "2024.1.0+0" [[deps.MLStyle]] git-tree-sha1 = "bc38dff0548128765760c79eb7388a4b37fae2c8" @@ -1371,9 +1378,9 @@ version = "0.20.19" [[deps.MPICH_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" +git-tree-sha1 = "d8a7bf80c88326ebc98b7d38437208c3a0f20725" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.2.0+0" +version = "4.2.1+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -1382,10 +1389,10 @@ uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.10" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "3f884417b47a96d87e7c6219f8f7b30ce67f4f2c" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.2+0" +version = "5.3.3+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -1432,9 +1439,9 @@ version = "10.1.4+2" [[deps.Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272" +git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "1.1.0" +version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -1448,11 +1455,16 @@ git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.4" +[[deps.MultiBroadcastFusion]] +git-tree-sha1 = "cb2fb12bdd092eea393b4bd3252815cc8a395f7f" +uuid = "c3c07f87-98de-43f2-a76f-835b330b2cbb" +version = "0.2.0" + [[deps.NCDatasets]] deps = ["CFTime", "CommonDataModel", "DataStructures", "Dates", "DiskArrays", "NetCDF_jll", "NetworkOptions", "Printf"] -git-tree-sha1 = "79400cceb1655e7b2fe528a7b114c785bc152e59" +git-tree-sha1 = "a640912695952b074672edb5f9aaee2f7f9fd59a" uuid = "85f8d34a-cbdd-5861-8df4-14fed0d494ab" -version = "0.14.1" +version = "0.14.4" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1468,9 +1480,9 @@ version = "4.5.1" [[deps.NNlib]] deps = ["Adapt", "Atomix", "ChainRulesCore", "GPUArraysCore", "KernelAbstractions", "LinearAlgebra", "Pkg", "Random", "Requires", "Statistics"] -git-tree-sha1 = "1fa1a14766c60e66ab22e242d45c1857c83a3805" +git-tree-sha1 = "5055845dd316575ae2fc1f6dcb3545ff15fe547a" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.9.13" +version = "0.9.14" [deps.NNlib.extensions] NNlibAMDGPUExt = "AMDGPU" @@ -1509,10 +1521,10 @@ uuid = "71a1bf82-56d0-4bbc-8a3c-48b961074391" version = "0.1.5" [[deps.NetCDF_jll]] -deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] -git-tree-sha1 = "a8af1798e4eb9ff768ce7fdefc0e957097793f15" +deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] +git-tree-sha1 = "ef30054d4e6eab74228cc7beae0c0873129bc078" uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" -version = "400.902.209+0" +version = "400.902.211+0" [[deps.Nettle_jll]] deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -1525,9 +1537,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.OffsetArrays]] -git-tree-sha1 = "6a731f2b5c03157418a20c12195eb4b74c8f8621" +git-tree-sha1 = "e64b4f5ea6b7389f6f046d13d4896a8f9c1ba71e" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.13.0" +version = "1.14.0" weakdeps = ["Adapt"] [deps.OffsetArrays.extensions] @@ -1569,9 +1581,9 @@ version = "4.1.6+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "af81a32750ebc831ee28bdaaba6e1067decef51e" +git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.4.2" +version = "1.4.3" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1587,9 +1599,9 @@ version = "0.5.5+0" [[deps.Optimisers]] deps = ["ChainRulesCore", "Functors", "LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "264b061c1903bc0fe9be77cb9050ebacff66bb63" +git-tree-sha1 = "6572fe0c5b74431aaeb0b18a4aa5ef03c84678be" uuid = "3bd65402-5787-11e9-1adc-39752487f4e2" -version = "0.3.2" +version = "0.3.3" [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1661,9 +1673,9 @@ version = "1.4.1" [[deps.Plots]] deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"] -git-tree-sha1 = "3bdfa4fa528ef21287ef659a89d686e8a1bcb1a9" +git-tree-sha1 = "442e1e7ac27dd5ff8825c3fa62fbd1e86397974b" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.40.3" +version = "1.40.4" [deps.Plots.extensions] FileIOExt = "FileIO" @@ -1681,9 +1693,9 @@ version = "1.40.3" [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] -git-tree-sha1 = "09f59c6dda37c7f73efddc5bdf6f92bc940eb484" +git-tree-sha1 = "2ba5f33cbb51a85ef58a850749492b08f9bf2193" uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" -version = "0.7.12" +version = "0.7.13" [[deps.PolyesterWeave]] deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"] @@ -1699,9 +1711,9 @@ version = "1.4.3" [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "ForwardDiff"] -git-tree-sha1 = "b6665214f2d0739f2d09a17474dd443b9139784a" +git-tree-sha1 = "a660e9daab5db07adf3dedfe09b435cc530d855e" uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.20" +version = "0.4.21" [deps.PreallocationTools.extensions] PreallocationToolsReverseDiffExt = "ReverseDiff" @@ -1871,9 +1883,9 @@ version = "0.4.2" [[deps.RuntimeGeneratedFunctions]] deps = ["ExprTools", "SHA", "Serialization"] -git-tree-sha1 = "6aacc5eefe8415f47b3e34214c1d79d2674a0ba2" +git-tree-sha1 = "04c968137612c4a5629fa531334bb81ad5680f00" uuid = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47" -version = "0.5.12" +version = "0.5.13" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -1886,9 +1898,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"] -git-tree-sha1 = "d15c65e25615272e1b1c5edb1d307484c7942824" +git-tree-sha1 = "beb1f94b08c4976ed1db0ca01b9e6bac89706faf" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.31.0" +version = "2.35.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -2054,10 +2066,10 @@ uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.34.3" [[deps.StrideArraysCore]] -deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] -git-tree-sha1 = "d6415f66f3d89c615929af907fdc6a3e17af0d8c" +deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static", "StaticArrayInterface", "ThreadingUtilities"] +git-tree-sha1 = "25349bf8f63aa36acbff5e3550a86e9f5b0ef682" uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da" -version = "0.5.2" +version = "0.5.6" [[deps.StringEncodings]] deps = ["Libiconv_jll"] @@ -2105,9 +2117,9 @@ weakdeps = ["ClimaParams"] [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "MacroTools", "RuntimeGeneratedFunctions", "StaticArraysCore"] -git-tree-sha1 = "4b7f4c80449d8baae8857d55535033981862619c" +git-tree-sha1 = "40ea524431a92328cd73582d1820a5b08247a40f" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.15" +version = "0.3.16" [[deps.TOML]] deps = ["Dates"] @@ -2537,9 +2549,9 @@ version = "0.2.5" [[deps.cuDNN]] deps = ["CEnum", "CUDA", "CUDA_Runtime_Discovery", "CUDNN_jll"] -git-tree-sha1 = "d433ec29756895512190cac9c96666d879f07b92" +git-tree-sha1 = "1f6a185a8da9bbbc20134b7b935981f70c9b26ad" uuid = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd" -version = "1.3.0" +version = "1.3.1" [[deps.eudev_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "gperf_jll"] @@ -2629,6 +2641,12 @@ deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" version = "1.52.0+1" +[[deps.oneTBB_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493" +uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" +version = "2021.12.0+0" + [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/perf/flame.jl b/perf/flame.jl index 3f8d5cb3c8..aeef73a21c 100644 --- a/perf/flame.jl +++ b/perf/flame.jl @@ -9,7 +9,7 @@ import ProfileCanvas import YAML cc_dir = joinpath(dirname(@__DIR__)); -config_dir = joinpath(cc_dir, "config", "model_configs"); +config_dir = joinpath(cc_dir, "config", "perf_configs"); include(joinpath(cc_dir, "experiments", "AMIP", "cli_options.jl")); # assuming a common driver for all tested runs diff --git a/perf/flame_diff.jl b/perf/flame_diff.jl index e63066c464..e1362f57be 100644 --- a/perf/flame_diff.jl +++ b/perf/flame_diff.jl @@ -29,7 +29,7 @@ cwd = pwd() @info "build_path is: $build_path" cc_dir = joinpath(dirname(@__DIR__)); -config_dir = joinpath(cc_dir, "config", "model_configs"); +config_dir = joinpath(cc_dir, "config", "perf_configs"); include(joinpath(cc_dir, "experiments", "AMIP", "cli_options.jl")); # assuming a common driver for all tested runs diff --git a/src/Utilities.jl b/src/Utilities.jl index a78361a1c7..97e12fbca1 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -6,6 +6,7 @@ modules in the coupler. """ module Utilities +import CUDA import ClimaComms import ClimaCore as CC @@ -70,4 +71,22 @@ function get_comms_context(parsed_args) return comms_ctx end +""" + show_memory_usage(comms_ctx) + +Display and return the maximum resident set size (RSS) memory footprint on the +CPU of this process since it began. + +# Arguments +`comms_ctx`: the communication context being used to run the model +""" +function show_memory_usage(comms_ctx) + cpu_allocs_GB = "" + if ClimaComms.iamroot(comms_ctx) + cpu_allocs_GB = "CPU: " * string(round(Sys.maxrss() / 1e9, digits = 3)) * " GiB" + @info cpu_allocs_GB + end + return cpu_allocs_GB +end + end # module diff --git a/test/Project.toml b/test/Project.toml index ed7a81a481..46d703634b 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,6 +1,8 @@ [deps] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" +ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a" +CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6" ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717" diff --git a/test/component_model_tests/climaatmos_standalone/atmos_driver.jl b/test/component_model_tests/climaatmos_standalone/atmos_driver.jl index 8f50916e14..19edbd1895 100644 --- a/test/component_model_tests/climaatmos_standalone/atmos_driver.jl +++ b/test/component_model_tests/climaatmos_standalone/atmos_driver.jl @@ -1,12 +1,75 @@ +import ClimaComms +import ArgParse +import CUDA +import ClimaCoupler +import ClimaCoupler: Utilities import ClimaAtmos as CA import Random redirect_stderr(IOContext(stderr, :stacktrace_types_limited => Ref(false))) Random.seed!(1234) -if !(@isdefined config) - config = CA.AtmosConfig() +function argparse_settings() + s = ArgParse.ArgParseSettings() + ArgParse.@add_arg_table! s begin + "--config_file" + help = "A yaml file used to set the configuration of the coupled model" + arg_type = String + default = nothing + end + return s end -simulation = CA.get_simulation(config) -(; integrator) = simulation + +function time_to_seconds(s::String) + factor = Dict("secs" => 1, "mins" => 60, "hours" => 60 * 60, "days" => 60 * 60 * 24) + s == "Inf" && return Inf + if count(occursin.(keys(factor), Ref(s))) != 1 + error("Bad format for flag $s. Examples: [`10secs`, `20mins`, `30hours`, `40days`]") + end + for match in keys(factor) + occursin(match, s) || continue + return parse(Float64, first(split(s, match))) * factor[match] + end + error("Uncaught case in computing time from given string.") +end + +# Read in atmos configuration file from command line +parse_commandline(s) = ArgParse.parse_args(ARGS, s) +parsed_args = parse_commandline(argparse_settings()) +atmos_config_file = parsed_args["config_file"] + +# Use input atmos configuration file +if isnothing(atmos_config_file) + @info "Using Atmos default configuration" + config = CA.default_config_dict() +else + @info "Using Atmos configuration from $atmos_config_file" + config = CA.override_default_config(joinpath(pkgdir(ClimaCoupler), atmos_config_file)) +end + +# Specify atmos output directory to be inside the coupler output directory +output_dir = + joinpath(pkgdir(ClimaCoupler), "experiments", "AMIP", "output", "climaatmos", config["job_id"]) * "_artifacts" +!isdir(output_dir) && mkpath(output_dir) +config = merge(config, Dict("output_dir" => output_dir)) +atmos_config = CA.AtmosConfig(config) +simulation = CA.get_simulation(atmos_config) sol_res = CA.solve_atmos!(simulation) + +## Use ClimaAtmos calculation to show the simulated years per day of the simulation (SYPD) +tspan = (Float64(0), Float64(time_to_seconds(config["t_end"]))) +walltime = sol_res.walltime +es = CA.EfficiencyStats(tspan, walltime) +sypd = CA.simulated_years_per_day(es) +@info "SYPD: $sypd" + +## Save the SYPD and allocation information +comms_ctx = atmos_config.comms_ctx +if ClimaComms.iamroot(comms_ctx) + sypd_filename = joinpath(output_dir, "sypd.txt") + write(sypd_filename, "$sypd") + + cpu_allocs_GB = Utilities.show_memory_usage(comms_ctx) + cpu_allocs_filename = joinpath(output_dir, "allocations_cpu.txt") + write(cpu_allocs_filename, cpu_allocs_GB) +end diff --git a/test/mpi_tests/local_checks.sh b/test/mpi_tests/local_checks.sh index b0a110a321..dfeff3de00 100644 --- a/test/mpi_tests/local_checks.sh +++ b/test/mpi_tests/local_checks.sh @@ -11,7 +11,7 @@ module load climacommon/2024_04_05 export CC_PATH=$(pwd)/ # adjust this to the path of your ClimaCoupler.jl directory export RUN_NAME=coarse_single_ft64_hourly_checkpoints_restart -export CONFIG_FILE=${CC_PATH}config/model_configs/${RUN_NAME}.yml +export CONFIG_FILE=${CC_PATH}config/ci_configs/${RUN_NAME}.yml export RESTART_DIR=experiments/AMIP/output/amip/${RUN_NAME}_artifacts/ export OPENBLAS_NUM_THREADS=1 diff --git a/toml/diagnostic_edmfx_box.toml b/toml/diagnostic_edmfx_box.toml new file mode 100644 index 0000000000..41c7c57094 --- /dev/null +++ b/toml/diagnostic_edmfx_box.toml @@ -0,0 +1,20 @@ +[entr_inv_tau] +value = 0.002 + +[entr_coeff] +value = 0 + +[detr_inv_tau] +value = 0 + +[detr_buoy_coeff] +value = 0.12 + +[detr_vertdiv_coeff] +value = 0.6 + +[min_area_limiter_scale] +value = 0 + +[max_area_limiter_scale] +value = 0 From 210ffff565de0d47dc6906e887bcc2113c9d6700 Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Wed, 24 Apr 2024 16:48:25 -0700 Subject: [PATCH 2/3] make diagnostics optional --- .buildkite/benchmarks/pipeline.yml | 4 +- config/benchmark_configs/amip_diagedmf.yml | 1 + .../benchmark_configs/gpu_amip_diagedmf.yml | 1 + experiments/AMIP/cli_options.jl | 4 ++ experiments/AMIP/coupler_driver.jl | 65 +++++++++++-------- 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/.buildkite/benchmarks/pipeline.yml b/.buildkite/benchmarks/pipeline.yml index 8f25f9cef9..a8ad834dd4 100644 --- a/.buildkite/benchmarks/pipeline.yml +++ b/.buildkite/benchmarks/pipeline.yml @@ -76,7 +76,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 2 + slurm_ntasks: 4 slurm_mem: 16GB - label: "GPU AMIP with diagnostic EDMF" @@ -86,7 +86,7 @@ steps: agents: slurm_gpus_per_task: 1 slurm_cpus_per_task: 4 - slurm_ntasks: 2 + slurm_ntasks: 4 slurm_mem: 16GB - group: "Generate output table" diff --git a/config/benchmark_configs/amip_diagedmf.yml b/config/benchmark_configs/amip_diagedmf.yml index ac3670b15a..fc890ffe80 100644 --- a/config/benchmark_configs/amip_diagedmf.yml +++ b/config/benchmark_configs/amip_diagedmf.yml @@ -14,3 +14,4 @@ run_name: "amip_diagedmf" start_date: "19790301" t_end: "12hours" turb_flux_partition: "CombinedStateFluxes" +use_coupler_diagnostics: false diff --git a/config/benchmark_configs/gpu_amip_diagedmf.yml b/config/benchmark_configs/gpu_amip_diagedmf.yml index a3b528f579..b798e82967 100644 --- a/config/benchmark_configs/gpu_amip_diagedmf.yml +++ b/config/benchmark_configs/gpu_amip_diagedmf.yml @@ -14,3 +14,4 @@ run_name: "gpu_amip_diagedmf" start_date: "19790301" t_end: "12hours" turb_flux_partition: "CombinedStateFluxes" +use_coupler_diagnostics: false diff --git a/experiments/AMIP/cli_options.jl b/experiments/AMIP/cli_options.jl index 9a1ac6369f..7406c5f1fd 100644 --- a/experiments/AMIP/cli_options.jl +++ b/experiments/AMIP/cli_options.jl @@ -78,6 +78,10 @@ function argparse_settings() help = "Device type to use [`auto` (default) `CPUSingleThreaded`, `CPUMultiThreaded`, `CUDADevice`]" arg_type = String default = "auto" + "--use_coupler_diagnostics" + help = "Boolean flag indicating whether to compute and output coupler diagnostics [`true` (default), `false`]" + arg_type = Bool + default = true # ClimaAtmos specific "--surface_setup" help = "Triggers ClimaAtmos into the coupled mode [`PrescribedSurface` (default)]" # retained here for standalone Atmos benchmarks diff --git a/experiments/AMIP/coupler_driver.jl b/experiments/AMIP/coupler_driver.jl index 0adb5acb12..c5cd201f60 100644 --- a/experiments/AMIP/coupler_driver.jl +++ b/experiments/AMIP/coupler_driver.jl @@ -129,6 +129,7 @@ restart_dir = config_dict["restart_dir"] restart_t = Int(config_dict["restart_t"]) evolving_ocean = config_dict["evolving_ocean"] dt_rad = config_dict["dt_rad"] +use_coupler_diagnostics = config_dict["use_coupler_diagnostics"] #= ## Setup Communication Context @@ -470,27 +471,39 @@ User can write custom diagnostics in the `user_diagnostics.jl`. Note, this will be replaced by the diagnostics framework currently in ClimaAtmos, once it is abstracted into a more general package, so we can use it to save fields from surface models. =# +if use_coupler_diagnostics + monthly_3d_diags = Diagnostics.init_diagnostics( + (:T, :u, :q_tot, :q_liq_ice), + atmos_sim.domain.center_space; + save = TimeManager.Monthly(), + operations = (; accumulate = Diagnostics.TimeMean([Int(0)])), + output_dir = COUPLER_OUTPUT_DIR, + name_tag = "monthly_mean_3d_", + ) -monthly_3d_diags = Diagnostics.init_diagnostics( - (:T, :u, :q_tot, :q_liq_ice), - atmos_sim.domain.center_space; - save = TimeManager.Monthly(), - operations = (; accumulate = Diagnostics.TimeMean([Int(0)])), - output_dir = dir_paths.output, - name_tag = "monthly_mean_3d_", -) + monthly_3d_diags = Diagnostics.init_diagnostics( + (:T, :u, :q_tot, :q_liq_ice), + atmos_sim.domain.center_space; + save = TimeManager.Monthly(), + operations = (; accumulate = Diagnostics.TimeMean([Int(0)])), + output_dir = dir_paths.output, + name_tag = "monthly_mean_3d_", + ) -monthly_2d_diags = Diagnostics.init_diagnostics( - (:precipitation_rate, :toa_fluxes, :T_sfc, :tubulent_energy_fluxes), - boundary_space; - save = TimeManager.Monthly(), - operations = (; accumulate = Diagnostics.TimeMean([Int(0)])), - output_dir = dir_paths.output, - name_tag = "monthly_mean_2d_", -) + monthly_2d_diags = Diagnostics.init_diagnostics( + (:precipitation_rate, :toa_fluxes, :T_sfc, :tubulent_energy_fluxes), + boundary_space; + save = TimeManager.Monthly(), + operations = (; accumulate = Diagnostics.TimeMean([Int(0)])), + output_dir = dir_paths.output, + name_tag = "monthly_mean_2d_", + ) -diagnostics = (monthly_3d_diags, monthly_2d_diags) -Utilities.show_memory_usage(comms_ctx) + diagnostics = (monthly_3d_diags, monthly_2d_diags) + Utilities.show_memory_usage(comms_ctx) +else + diagnostics = () +end #= ## Initialize Conservation Checks @@ -713,13 +726,14 @@ function solve_coupler!(cs) CO2_current = BCReader.interpolate_midmonth_to_daily(cs.dates.date[1], cs.mode.CO2_info) Interfacer.update_field!(atmos_sim, Val(:co2), CO2_current) - ## calculate and accumulate diagnostics at each timestep - ClimaComms.barrier(comms_ctx) - Diagnostics.accumulate_diagnostics!(cs) - - ## save and reset monthly averages - Diagnostics.save_diagnostics(cs) + ## calculate and accumulate diagnostics at each timestep, if we're using diagnostics in this run + if !isempty(cs.diagnostics) + ClimaComms.barrier(comms_ctx) + Diagnostics.accumulate_diagnostics!(cs) + ## save and reset monthly averages + Diagnostics.save_diagnostics(cs) + end end ## compute global energy @@ -842,9 +856,8 @@ if ClimaComms.iamroot(comms_ctx) end ## plotting AMIP results - if cs.mode.name == "amip" + if cs.mode.name == "amip" && !isempty(cs.diagnostics) ## plot data that correspond to the model's last save_hdf5 call (i.e., last month) - @info "AMIP plots" ## ClimaESM From c96101a6dec43af3071e086c3c484cf799ee406b Mon Sep 17 00:00:00 2001 From: Julia Sloan Date: Wed, 24 Apr 2024 17:00:45 -0700 Subject: [PATCH 3/3] use atmos config in coupler --- config/benchmark_configs/amip_diagedmf.yml | 3 +- .../benchmark_configs/gpu_amip_diagedmf.yml | 3 +- experiments/AMIP/cli_options.jl | 4 +++ .../AMIP/components/atmosphere/climaatmos.jl | 28 +++++++++++++++---- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/config/benchmark_configs/amip_diagedmf.yml b/config/benchmark_configs/amip_diagedmf.yml index fc890ffe80..2b78ef6ad0 100644 --- a/config/benchmark_configs/amip_diagedmf.yml +++ b/config/benchmark_configs/amip_diagedmf.yml @@ -1,6 +1,7 @@ FLOAT_TYPE: "Float32" anim: false -atmos_config_file: "config/gpu_configs/gpu_aquaplanet_diagedmf.yml" +atmos_config_file: "config/benchmark_configs/climaatmos_diagedmf.yml" +atmos_config_repo: "ClimaCoupler" dt_cpl: 120 dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" diff --git a/config/benchmark_configs/gpu_amip_diagedmf.yml b/config/benchmark_configs/gpu_amip_diagedmf.yml index b798e82967..84f8038863 100644 --- a/config/benchmark_configs/gpu_amip_diagedmf.yml +++ b/config/benchmark_configs/gpu_amip_diagedmf.yml @@ -1,6 +1,7 @@ FLOAT_TYPE: "Float32" anim: false -atmos_config_file: "config/gpu_configs/gpu_aquaplanet_diagedmf.yml" +atmos_config_file: "config/benchmark_configs/gpu_climaatmos_diagedmf.yml" +atmos_config_repo: "ClimaCoupler" dt_cpl: 120 dt_save_state_to_disk: "Inf" dt_save_to_sol: "Inf" diff --git a/experiments/AMIP/cli_options.jl b/experiments/AMIP/cli_options.jl index 7406c5f1fd..af58607704 100644 --- a/experiments/AMIP/cli_options.jl +++ b/experiments/AMIP/cli_options.jl @@ -93,6 +93,10 @@ function argparse_settings() help = "Type of albedo model. [`ConstantAlbedo` (default), `RegressionFunctionAlbedo`, `CouplerAlbedo`]" arg_type = String default = "CouplerAlbedo" + "--atmos_config_repo" + help = "The repository containing the ClimaAtmos configuration file to use [`ClimaAtmos` (default), `ClimaCoupler`]" + arg_type = String + default = "ClimaAtmos" # ClimaLand specific "--land_albedo_type" help = "Access land surface albedo information from data file. [`function`, `map_static`, `map_temporal`]" diff --git a/experiments/AMIP/components/atmosphere/climaatmos.jl b/experiments/AMIP/components/atmosphere/climaatmos.jl index 23b702ef96..a9ad2acec1 100644 --- a/experiments/AMIP/components/atmosphere/climaatmos.jl +++ b/experiments/AMIP/components/atmosphere/climaatmos.jl @@ -299,20 +299,36 @@ FluxCalculator.get_surface_params(sim::ClimaAtmosSimulation) = CAP.surface_fluxe Returns the specified atmospheric configuration (`atmos_config`) overwitten by arguments in the coupler dictionary (`config_dict`). The returned dictionary will then be passed to CA.AtmosConfig(). +The `atmos_config_repo` flag allows us to +use a configuration specified within the ClimaCoupler repo, which is useful for direct +coupled/atmos-only comparisons. """ function get_atmos_config_dict(coupler_dict) atmos_config_file = coupler_dict["atmos_config_file"] + atmos_config_repo = coupler_dict["atmos_config_repo"] # override default or specified configs with coupler arguments, and set the correct atmos config_file - if isnothing(atmos_config_file) - @info "Using Atmos default configuration" - atmos_config = merge(CA.default_config_dict(), coupler_dict, Dict("config_file" => atmos_config_file)) - else - @info "Using Atmos configuration from $atmos_config_file" + if atmos_config_repo == "ClimaCoupler" + @assert !isnothing(atmos_config_file) "Must specify `atmos_config_file` within ClimaCoupler." + @info "Using Atmos configuration from ClimaCoupler in $atmos_config_file" atmos_config = merge( - CA.override_default_config(joinpath(pkgdir(CA), atmos_config_file)), + CA.override_default_config(joinpath(pkgdir(ClimaCoupler), atmos_config_file)), coupler_dict, Dict("config_file" => atmos_config_file), ) + elseif atmos_config_repo == "ClimaAtmos" + if isnothing(atmos_config_file) + @info "Using Atmos default configuration" + atmos_config = merge(CA.default_config_dict(), coupler_dict, Dict("config_file" => atmos_config_file)) + else + @info "Using Atmos configuration from $atmos_config_file" + atmos_config = merge( + CA.override_default_config(joinpath(pkgdir(CA), atmos_config_file)), + coupler_dict, + Dict("config_file" => atmos_config_file), + ) + end + else + error("Invalid `atmos_config_repo`; please use \"ClimaCoupler\" or \"ClimaAtmos\"") end # use coupler toml if atmos is not defined