remove nvtx macro

CliMA · Aug 24, 2023 · 7cce191 · 7cce191
1 parent 17c5a2f
commit 7cce191
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -8,7 +8,6 @@ import .Parameters as CAP
 include(joinpath("utils", "abbreviations.jl"))
 include(joinpath("utils", "common_spaces.jl"))
 include(joinpath("solver", "types.jl"))
-include(joinpath("utils", "nvtx.jl"))
 include(joinpath("solver", "cli_options.jl"))
 include(joinpath("utils", "utilities.jl"))
 include(joinpath("utils", "debug_utils.jl"))

diff --git a/src/prognostic_equations/implicit/implicit_tendency.jl b/src/prognostic_equations/implicit/implicit_tendency.jl
@@ -6,9 +6,9 @@ import ClimaCore: Fields, Geometry
 
 function implicit_tendency!(Yₜ, Y, p, t)
     fill_with_nans!(p)
-    @nvtx "implicit tendency" color = colorant"yellow" begin
+    NVTX.@range "implicit tendency" color = colorant"yellow" begin
         Yₜ .= zero(eltype(Yₜ))
-        @nvtx "precomputed quantities" color = colorant"orange" begin
+        NVTX.@range "precomputed quantities" color = colorant"orange" begin
             set_precomputed_quantities!(Y, p, t)
         end
         Fields.bycolumn(axes(Y.c)) do colidx

diff --git a/src/prognostic_equations/remaining_tendency.jl b/src/prognostic_equations/remaining_tendency.jl
@@ -1,24 +1,24 @@
 
 function remaining_tendency!(Yₜ, Y, p, t)
     fill_with_nans!(p)
-    @nvtx "remaining tendency" color = colorant"yellow" begin
+    NVTX.@range "remaining tendency" color = colorant"yellow" begin
         Yₜ .= zero(eltype(Yₜ))
-        @nvtx "precomputed quantities" color = colorant"orange" begin
+        NVTX.@range "precomputed quantities" color = colorant"orange" begin
             set_precomputed_quantities!(Y, p, t)
         end
-        @nvtx "horizontal" color = colorant"orange" begin
+        NVTX.@range "horizontal" color = colorant"orange" begin
             horizontal_advection_tendency!(Yₜ, Y, p, t)
-            @nvtx "hyperdiffusion tendency" color = colorant"yellow" begin
+            NVTX.@range "hyperdiffusion tendency" color = colorant"yellow" begin
                 hyperdiffusion_tendency!(Yₜ, Y, p, t)
             end
         end
-        @nvtx "vertical" color = colorant"orange" begin
+        NVTX.@range "vertical" color = colorant"orange" begin
             explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
         end
-        @nvtx "additional_tendency!" color = colorant"orange" begin
+        NVTX.@range "additional_tendency!" color = colorant"orange" begin
             additional_tendency!(Yₜ, Y, p, t)
         end
-        @nvtx "dss_remaining_tendency" color = colorant"blue" begin
+        NVTX.@range "dss_remaining_tendency" color = colorant"blue" begin
             dss!(Yₜ, p, t)
         end
     end

diff --git a/src/utils/nvtx.jl b/src/utils/nvtx.jl