Fixes

Author: charleskawczynski

.buildkite/Manifest.toml

@@ -7,6 +7,7 @@ version = "0.14.31"
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
+ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 CubedSphere = "7445602f-e544-4518-8976-18f8e8ae6cdb"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -30,7 +31,6 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 UnrolledUtilities = "0fe1646c-419e-43be-ac14-22321958931b"
 
 [weakdeps]
-ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
 
@@ -46,8 +46,8 @@ AssociatedLegendrePolynomials = "1"
 BandedMatrices = "1"
 BenchmarkTools = "1"
 BlockArrays = "1"
-ClimaCartesianIndices = "0.1.3"
 CUDA = "5.5"
+ClimaCartesianIndices = "0.1.3"
 ClimaComms = "0.6.2"
 CountFlops = "0.1"
 CubedSphere = "0.2, 0.3"

Project.toml

@@ -28,7 +28,7 @@ macro test_all(expression)
         local test_func() = $(esc(expression))
         @test test_func()                   # correctness
         @test (@allocated test_func()) == 0 # allocations
-        @test_opt stacktrace_types_limit=4 test_func()               # type instabilities
+        @test_opt test_func()               # type instabilities
     end
 end
 
@@ -117,14 +117,14 @@ function test_field_broadcast(;
         # Test get_result and set_result! for type instabilities, and test
         # set_result! for allocations. Ignore the type instabilities in CUDA and
         # the allocations they incur.
-        @test_opt stacktrace_types_limit=4 ignored_modules = cuda_frames materialize(get_result)
-        @test_opt stacktrace_types_limit=4 ignored_modules = cuda_frames materialize!(result, set_result)
+        @test_opt ignored_modules = cuda_frames materialize(get_result)
+        @test_opt ignored_modules = cuda_frames materialize!(result, set_result)
         using_cuda || @test (@allocated materialize!(result, set_result)) == 0
 
         if !isnothing(ref_set_result)
             # Test ref_set_result! for type instabilities and allocations to
             # ensure that the performance comparison is fair.
-            @test_opt stacktrace_types_limit=4  ignored_modules = cuda_frames materialize!(
+            @test_opt ignored_modules = cuda_frames materialize!(
                 ref_result,
                 ref_set_result,
             )

benchmarks/bickleyjet/Manifest.toml

@@ -48,7 +48,7 @@ function test_column_integral_definite!(center_space)
     @test max_relative_error <= 0.006 # Less than 0.6% error.
 
     cuda = (AnyFrameModule(CUDA),)
-    @test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_definite!(∫u_test, ᶜu)
+    @test_opt ignored_modules = cuda column_integral_definite!(∫u_test, ᶜu)
 
     test_allocs(@allocated column_integral_definite!(∫u_test, ᶜu))
 end
@@ -70,7 +70,7 @@ function test_column_integral_indefinite!(center_space)
     @test max_relative_error <= 0.006 # Less than 0.6% error at the top level.
 
     cuda = (AnyFrameModule(CUDA),)
-    @test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_indefinite!(ᶠ∫u_test, ᶜu)
+    @test_opt ignored_modules = cuda column_integral_indefinite!(ᶠ∫u_test, ᶜu)
 
     test_allocs(@allocated column_integral_indefinite!(ᶠ∫u_test, ᶜu))
 end
@@ -93,7 +93,7 @@ function test_column_integral_indefinite_fn!(center_space)
         @test max_relative_error <= 0.006 # Less than 0.6% error at the top level.
 
         cuda = (AnyFrameModule(CUDA),)
-        @test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_indefinite!(
+        @test_opt ignored_modules = cuda column_integral_indefinite!(
             fn,
             ᶠ∫u_test,
         )
@@ -132,7 +132,7 @@ function test_column_reduce_and_accumulate!(center_space)
         set_output! = () -> column_reduce!(f, output, input; init, transform)
         set_output!()
         @test output == reference_output
-        @test_opt stacktrace_types_limit=4 ignored_modules = (AnyFrameModule(CUDA),) set_output!()
+        @test_opt ignored_modules = (AnyFrameModule(CUDA),) set_output!()
         test_allocs(@allocated set_output!())
     end
 
@@ -148,7 +148,7 @@ function test_column_reduce_and_accumulate!(center_space)
             () -> column_accumulate!(f, output, input; init, transform)
         set_output!()
         @test output == reference_output
-        @test_opt stacktrace_types_limit=4 ignored_modules = (AnyFrameModule(CUDA),) set_output!()
+        @test_opt ignored_modules = (AnyFrameModule(CUDA),) set_output!()
         test_allocs(@allocated set_output!())
     end
 end

lib/ClimaCoreMakie/examples/Manifest.toml

@@ -31,7 +31,7 @@ end
 
 @testset "Aqua tests (additional)" begin
     Aqua.test_undefined_exports(ClimaCore)
-    Aqua.test_stale_deps(ClimaCore)
+    Aqua.test_stale_deps(ClimaCore; ignore = [:ClimaCartesianIndices])
     Aqua.test_deps_compat(ClimaCore)
     Aqua.test_project_extras(ClimaCore)
     # Aqua.test_project_toml_formatting(ClimaCore) # failing