fix comments, logs

Author: ucabc46

extra/weak_scaling/run_particleda.jl

@@ -49,7 +49,7 @@ open(parameters_file, "w") do io
     YAML.write(io, parameters)
 end
 
-@info "Optimized resampling enabled: ", parameters["filter"]["optimize_resampling"]
+@info "Optimized resampling enabled: $(parameters["filter"]["optimize_resampling"])"
 
 final_states, final_statistics = run_particle_filter(
   LLW2d.init, parameters_file, observation_file, filter_type, summary_stat_type

src/utils.jl

@@ -91,9 +91,12 @@ function copy_states!(
     to::TimerOutputs.TimerOutput = TimerOutputs.TimerOutput()
 ) where T
 
-    # Same as copy_states
+    # These are the particle indices stored on this rank
     particles_have = my_rank * nprt_per_rank + 1:(my_rank + 1) * nprt_per_rank
+
+    # These are the particle indices this rank should have after resampling
     particles_want = resampling_indices[particles_have]
+
     reqs = Vector{MPI.Request}(undef, 0)
 
     # Determine which particles need to be sent where
@@ -183,12 +186,12 @@ function _categorize_wants(particles_want::Vector{Int}, my_rank::Int, nprt_per_r
     for k in 1:nprt_per_rank
         id = particles_want[k]
         source_rank = floor(Int, (id - 1) / nprt_per_rank)
+        dict = source_rank == my_rank ? local_copies : remote_copies
 
-        if source_rank == my_rank
-            get!(() -> Int[], local_copies, id) |> v -> push!(v, k)
-        else
-            get!(() -> Int[], remote_copies, id) |> v -> push!(v, k)
+        vec = get!(dict, id) do
+            Int[]  # initialize a new vector only if id not present
         end
+        push!(vec, k)
     end
     return local_copies, remote_copies
 end

test/mpi_optimized_copy_states.jl

@@ -37,7 +37,7 @@ MPI.Init()
 my_rank = MPI.Comm_rank(MPI.COMM_WORLD)
 my_size = MPI.Comm_size(MPI.COMM_WORLD)
 
-@info "Number of threads available: ", Threads.nthreads()
+@info "Number of threads available: $(Threads.nthreads())"
 
 n_particle_per_rank = 1000
 n_particle = n_particle_per_rank * my_size
@@ -48,13 +48,10 @@ if output_timer
         error("Please provide the output filename for timers.")
     end
     output_filename = ARGS[2]
-    @info "Outputting timers to HDF5 file '$output_filename'"
+    @info "Outputting timers to HDF5 file '$(output_filename)'"
 end
-# default: dedup enabled for testing
-no_dedup = "-nd" in ARGS || "--no-dedup" in ARGS
-@info "Deduplication enabled: ", !no_dedup
 optimize_resample = "-o" in ARGS || "--optimize-resample" in ARGS
-@info "Optimized resampling enabled: ", optimize_resample
+@info "Optimized resampling enabled: $(optimize_resample)"
 
 n_float_per_particle = 100000
 # total number of floats per rank
@@ -88,7 +85,7 @@ local_timer_dicts = Dict{String, Dict{String,Any}}()
 
 for (trial_name, indices_func) in trial_sets
     if verbose && my_rank == 0
-        @info "Resampling particles to indices ", indices
+        @info "Resampling particles to indices $(indices)"
     end
     indices = collect(1:n_particle)  # Placeholder for actual indices
     # repeat experiment 10 times to get average time
@@ -102,7 +99,7 @@ for (trial_name, indices_func) in trial_sets
         my_rank, 
         n_particle_per_rank
     )
-    @info "Starting timed runs for trial '$trial_name'..."
+    @info "Starting timed runs for trial '$(trial_name)'..."
 
     timer = TimerOutputs.TimerOutput("copy_states")
     for _ in 1:10
@@ -143,7 +140,7 @@ for (trial_name, indices_func) in trial_sets
                 show(stdout, "text/plain", local_states);
                 @info "rank $(my_rank): expected ="
                 show(stdout, "text/plain", expected);
-                @info "rank $(my_rank): match = ", match
+                @info "rank $(my_rank): match = $(match)"
             end
             MPI.Barrier(MPI.COMM_WORLD)
         end