Merge #482

482: Use integrator interface, add flame script r=charleskawczynski a=charleskawczynski

This PR adds a flame script to the repo, and changes the monitored drivers to use OrdinaryDiffEq.jl's integrator interface. This should help make the analysis a bit more streamlined.

Co-authored-by: Charles Kawczynski <[email protected]>

.gitignore

@@ -32,5 +32,6 @@ docs/src/tutorials/
 
 
 *.gif
+*.gz
 *.mp4
 *.png

examples/3dsphere/baroclinic_wave.jl

@@ -316,11 +316,7 @@ end
 dt = 5
 prob = ODEProblem(rhs!, Y, (0.0, time_end))
 
-if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
-    throw(:exit_profile)
-end
-
-sol = @timev solve(
+integrator = OrdinaryDiffEq.init(
     prob,
     SSPRK33(),
     dt = dt,
@@ -330,6 +326,12 @@ sol = @timev solve(
     progress_message = (dt, u, p, t) -> t,
 )
 
+if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
+    throw(:exit_profile)
+end
+
+sol = @timev OrdinaryDiffEq.solve!(integrator)
+
 # visualization artifacts
 if test_name == "baroclinic_wave"
     @info "Solution L₂ norm at time t = 0: ", norm(Y.Yc.ρe)

examples/3dsphere/solid_body_rotation_3d.jl

@@ -264,12 +264,7 @@ T = 3600
 dt = 5
 prob = ODEProblem(rhs!, Y, (0.0, T))
 
-if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
-    throw(:exit_profile)
-end
-
-# solve ode
-sol = solve(
+integrator = OrdinaryDiffEq.init(
     prob,
     SSPRK33(),
     dt = dt,
@@ -279,6 +274,13 @@ sol = solve(
     progress_message = (dt, u, p, t) -> t,
 )
 
+if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
+    throw(:exit_profile)
+end
+
+# solve ode
+sol = @timev OrdinaryDiffEq.solve!(integrator)
+
 uₕ_phy = Geometry.transform.(Ref(Geometry.UVAxis()), sol.u[end].uₕ)
 w_phy = Geometry.transform.(Ref(Geometry.WAxis()), sol.u[end].w)
 

examples/hybrid/bubble_2d.jl

@@ -295,11 +295,7 @@ using OrdinaryDiffEq
 Δt = 0.03
 prob = ODEProblem(rhs!, Y, (0.0, 500.0))
 
-if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
-    throw(:exit_profile)
-end
-
-sol = @timev solve(
+integrator = OrdinaryDiffEq.init(
     prob,
     SSPRK33(),
     dt = Δt,
@@ -308,6 +304,12 @@ sol = @timev solve(
     progress_message = (dt, u, p, t) -> t,
 );
 
+if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
+    throw(:exit_profile)
+end
+
+sol = @timev OrdinaryDiffEq.solve!(integrator)
+
 ENV["GKSwstype"] = "nul"
 using ClimaCorePlots, Plots
 Plots.GRBackend()

examples/hybrid/bubble_3d.jl

@@ -303,12 +303,7 @@ rhs!(dYdt, Y, nothing, 0.0);
 using OrdinaryDiffEq
 Δt = 0.05
 prob = ODEProblem(rhs!, Y, (0.0, 1.0))
-
-if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
-    throw(:exit_profile)
-end
-
-sol = @timev solve(
+integrator = OrdinaryDiffEq.init(
     prob,
     SSPRK33(),
     dt = Δt,
@@ -317,6 +312,12 @@ sol = @timev solve(
     progress_message = (dt, u, p, t) -> t,
 );
 
+if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
+    throw(:exit_profile)
+end
+
+sol = @timev OrdinaryDiffEq.solve!(integrator)
+
 ENV["GKSwstype"] = "nul"
 import Plots
 Plots.GRBackend()

examples/sphere/shallow_water.jl

@@ -4,6 +4,7 @@ import ClimaCore:
     Domains, Fields, Geometry, Meshes, Operators, Spaces, Topologies
 
 import QuadGK
+import OrdinaryDiffEq
 using OrdinaryDiffEq: ODEProblem, solve, SSPRK33
 
 import Logging
@@ -401,12 +402,7 @@ dt = 9 * 60
 T = 86400 * 2
 
 prob = ODEProblem(rhs!, Y, (0.0, T), parameters)
-
-if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
-    throw(:exit_profile)
-end
-
-sol = @timev solve(
+integrator = OrdinaryDiffEq.init(
     prob,
     SSPRK33(),
     dt = dt,
@@ -416,6 +412,12 @@ sol = @timev solve(
     progress_message = (dt, u, p, t) -> t,
 )
 
+if haskey(ENV, "CI_PERF_SKIP_RUN") # for performance analysis
+    throw(:exit_profile)
+end
+
+sol = @timev OrdinaryDiffEq.solve!(integrator)
+
 @info "Test case: $(test_name)"
 @info "  with α: $(test_angle_name)"
 @info "Solution L₂ norm at time t = 0: ", norm(Y.h)

perf/allocs_per_case.jl

@@ -14,24 +14,6 @@ catch err
     end
 end
 
-if @isdefined integrator
-    OrdinaryDiffEq.step!(integrator) # compile first
-    Profile.clear_malloc_data()
-    OrdinaryDiffEq.step!(integrator)
-else
-    if @isdefined parameters
-        rhs!(dYdt, Y, parameters, 0.0) # compile first
-        Profile.clear_malloc_data()
-        rhs!(dYdt, Y, parameters, 0.0)
-    else
-        rhs!(dYdt, Y, nothing, 0.0) # compile first
-        Profile.clear_malloc_data()
-        rhs!(dYdt, Y, nothing, 0.0)
-    end
-end
-
-# Quit julia (which generates .mem files), then call
-#=
-import Coverage
-allocs = Coverage.analyze_malloc("src")
-=#
+OrdinaryDiffEq.step!(integrator) # compile first
+Profile.clear_malloc_data()
+OrdinaryDiffEq.step!(integrator)

perf/flame.jl

@@ -0,0 +1,33 @@
+import Pkg
+Pkg.develop(path = ".")
+
+mod_dir(x) = dirname(dirname(pathof(x)))
+import Profile
+
+ENV["CI_PERF_SKIP_RUN"] = true # we only need haskey(ENV, "CI_PERF_SKIP_RUN") == true
+
+import ClimaCore
+pkg_dir = mod_dir(ClimaCore)
+
+filename = joinpath(pkg_dir, "examples", "hybrid", "bubble_2d.jl")
+# filename = joinpath(pkg_dir, "examples", "3dsphere", "baroclinic_wave_rho_etot.jl")
+
+try
+    include(filename)
+catch err
+    if err.error !== :exit_profile
+        rethrow(err.error)
+    end
+end
+
+OrdinaryDiffEq.step!(integrator) # compile first
+Profile.clear_malloc_data()
+prof = Profile.@profile begin
+    for _ in 1:5
+        OrdinaryDiffEq.step!(integrator)
+    end
+end
+
+import PProf
+PProf.pprof()
+# http://localhost:57599/ui/flamegraph?tf