Merge pull request #3618 from CliMA/ne/logging

Clean up duplicated log messages when using MPI

Author: nefrathenrici

src/solver/solve.jl

@@ -21,12 +21,12 @@ walltime_in_days(es::EfficiencyStats) = es.walltime * (1 / (24 * 3600)) #=second
 
 function timed_solve!(integrator)
     device = ClimaComms.device(integrator.u.c)
+    comms_ctx = ClimaComms.context(device)
     local sol
-    @time "solve!:" begin
-        walltime = ClimaComms.elapsed(device) do
-            sol = SciMLBase.solve!(integrator)
-        end
+    walltime = ClimaComms.elapsed(device) do
+        sol = SciMLBase.solve!(integrator)
     end
+    @info "solve! walltime = $(round(walltime, digits = 3))"
     (; tspan) = integrator.sol.prob
     es = EfficiencyStats(tspan, walltime)
     _sypd = simulated_years_per_day(es)

src/solver/type_getters.jl

@@ -574,7 +574,6 @@ function get_sim_info(config::AtmosConfig)
         start_date = epoch,
         t_end = t_end,
     )
-    @show sim.t_end, sim.dt
     n_steps = floor(Int, sim.t_end / sim.dt)
     @info(
         "Time info:",
@@ -639,15 +638,17 @@ end
 
 import ClimaComms, Logging, NVTX
 function get_comms_context(parsed_args)
-    device = if parsed_args["device"] == "auto"
-        ClimaComms.device()
-    elseif parsed_args["device"] == "CUDADevice"
-        ClimaComms.CUDADevice()
-    elseif parsed_args["device"] == "CPUMultiThreaded" || Threads.nthreads() > 1
-        ClimaComms.CPUMultiThreaded()
-    else
-        ClimaComms.CPUSingleThreaded()
-    end
+    device =
+        if !haskey(parsed_args, "device") || parsed_args["device"] === "auto"
+            ClimaComms.device()
+        elseif parsed_args["device"] == "CUDADevice"
+            ClimaComms.CUDADevice()
+        elseif parsed_args["device"] == "CPUMultiThreaded" ||
+               Threads.nthreads() > 1
+            ClimaComms.CPUMultiThreaded()
+        else
+            ClimaComms.CPUSingleThreaded()
+        end
     comms_ctx = ClimaComms.context(device)
     ClimaComms.init(comms_ctx)
 

src/solver/types.jl

@@ -689,9 +689,7 @@ function AtmosConfig(
 
     all_config_files =
         normrelpath.(maybe_add_default(config_files, default_config_file))
-
     configs = map(all_config_files) do config_file
-        @info "Loading yaml file $config_file"
         strip_help_messages(load_yaml_file(config_file))
     end
     return AtmosConfig(
@@ -726,13 +724,15 @@ function AtmosConfig(
     # using config_files = [default_config_file] as a default
     # relies on the fact that override_default_config uses
     # default_config_file.
-    config = override_default_config(configs)
+    config = merge(configs...)
+    comms_ctx = isnothing(comms_ctx) ? get_comms_context(config) : comms_ctx
+    config = override_default_config(config)
+
     FT = config["FLOAT_TYPE"] == "Float64" ? Float64 : Float32
     toml_dict = CP.create_toml_dict(
         FT;
         override_file = CP.merge_toml_files(config["toml"]),
     )
-    comms_ctx = isnothing(comms_ctx) ? get_comms_context(config) : comms_ctx
     config = config_with_resolved_and_acquired_artifacts(config, comms_ctx)
 
     isempty(job_id) &&

src/solver/yaml_helper.jl

@@ -59,7 +59,6 @@ override_default_config(config_dicts::ContainerType(AbstractDict)) =
     override_default_config(merge(config_dicts...))
 
 function override_default_config(::Nothing)
-    @info "Using default configuration"
     return default_config_dict()
 end