Skip to content

Commit 347b75e

Browse files
charleskawczynskicharleskawczynski
committed
Fixes
1 parent c866b9f commit 347b75e

File tree

7 files changed

+43
-34
lines changed

7 files changed

+43
-34
lines changed

‎.buildkite/Manifest.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@ git-tree-sha1 = "f8764df8d9d2aec2812f009a1ac39e46c33354b8"
320320
uuid = "7057c7e9-c182-5462-911a-8362d720325c"
321321
version = "0.3.14"
322322

323+
[[deps.ClimaCartesianIndices]]
324+
git-tree-sha1 = "0a94213cb6b99b645968da4a2c6e82d2f698eb49"
325+
uuid = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
326+
version = "0.1.3"
327+
323328
[[deps.ClimaComms]]
324329
deps = ["Adapt", "Logging", "LoggingExtras"]
325330
git-tree-sha1 = "40ad44466dfe0092e18c04bc02c849fe8e095d30"
@@ -332,20 +337,16 @@ weakdeps = ["CUDA", "MPI"]
332337
ClimaCommsMPIExt = "MPI"
333338

334339
[[deps.ClimaCore]]
335-
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
340+
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaCartesianIndices", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
336341
path = ".."
337342
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
338343
version = "0.14.31"
344+
weakdeps = ["CUDA", "Krylov"]
339345

340346
[deps.ClimaCore.extensions]
341347
ClimaCoreCUDAExt = "CUDA"
342348
KrylovExt = "Krylov"
343349

344-
[deps.ClimaCore.weakdeps]
345-
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
346-
ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
347-
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
348-
349350
[[deps.ClimaCorePlots]]
350351
deps = ["ClimaComms", "ClimaCore", "RecipesBase", "StaticArrays", "TriplotBase"]
351352
path = "../lib/ClimaCorePlots"
@@ -1904,9 +1905,9 @@ version = "0.1.0"
19041905

19051906
[[deps.SciMLBase]]
19061907
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
1907-
git-tree-sha1 = "d164208ae7d59702d8e67d6f3f047de40b235338"
1908+
git-tree-sha1 = "341c75a6ba4fa155a2471f5609163df5e3184e7b"
19081909
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1909-
version = "2.86.0"
1910+
version = "2.86.2"
19101911

19111912
[deps.SciMLBase.extensions]
19121913
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -2129,9 +2130,9 @@ version = "7.2.1+1"
21292130

21302131
[[deps.SymbolicIndexingInterface]]
21312132
deps = ["Accessors", "ArrayInterface", "PrettyTables", "RuntimeGeneratedFunctions", "StaticArraysCore"]
2132-
git-tree-sha1 = "7530e17b6ac652b009966f8ad53371a4ffd273f2"
2133+
git-tree-sha1 = "b6a641e38efa01355aa721246dd246e10c7dcd4d"
21332134
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
2134-
version = "0.3.39"
2135+
version = "0.3.40"
21352136

21362137
[[deps.TOML]]
21372138
deps = ["Dates"]

‎Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.14.31"
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
88
BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
99
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
10+
ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
1011
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
1112
CubedSphere = "7445602f-e544-4518-8976-18f8e8ae6cdb"
1213
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -30,7 +31,6 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
3031
UnrolledUtilities = "0fe1646c-419e-43be-ac14-22321958931b"
3132

3233
[weakdeps]
33-
ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
3434
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
3535
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
3636

@@ -46,8 +46,8 @@ AssociatedLegendrePolynomials = "1"
4646
BandedMatrices = "1"
4747
BenchmarkTools = "1"
4848
BlockArrays = "1"
49-
ClimaCartesianIndices = "0.1.3"
5049
CUDA = "5.5"
50+
ClimaCartesianIndices = "0.1.3"
5151
ClimaComms = "0.6.2"
5252
CountFlops = "0.1"
5353
CubedSphere = "0.2, 0.3"

‎benchmarks/bickleyjet/Manifest.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,11 @@ git-tree-sha1 = "2ac646d71d0d24b44f3f8c84da8c9f4d70fb67df"
222222
uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
223223
version = "1.18.4+0"
224224

225+
[[deps.ClimaCartesianIndices]]
226+
git-tree-sha1 = "0a94213cb6b99b645968da4a2c6e82d2f698eb49"
227+
uuid = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
228+
version = "0.1.3"
229+
225230
[[deps.ClimaComms]]
226231
deps = ["Adapt", "Logging", "LoggingExtras"]
227232
git-tree-sha1 = "40ad44466dfe0092e18c04bc02c849fe8e095d30"
@@ -237,7 +242,7 @@ version = "0.6.6"
237242
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
238243

239244
[[deps.ClimaCore]]
240-
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
245+
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaCartesianIndices", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
241246
path = "../.."
242247
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
243248
version = "0.14.31"
@@ -248,7 +253,6 @@ version = "0.14.31"
248253

249254
[deps.ClimaCore.weakdeps]
250255
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
251-
ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
252256
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
253257

254258
[[deps.CodecZlib]]
@@ -1394,9 +1398,9 @@ version = "7.2.1+1"
13941398

13951399
[[deps.SymbolicIndexingInterface]]
13961400
deps = ["Accessors", "ArrayInterface", "PrettyTables", "RuntimeGeneratedFunctions", "StaticArraysCore"]
1397-
git-tree-sha1 = "7530e17b6ac652b009966f8ad53371a4ffd273f2"
1401+
git-tree-sha1 = "b6a641e38efa01355aa721246dd246e10c7dcd4d"
13981402
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
1399-
version = "0.3.39"
1403+
version = "0.3.40"
14001404

14011405
[[deps.TOML]]
14021406
deps = ["Dates"]

‎lib/ClimaCoreMakie/examples/Manifest.toml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,11 @@ weakdeps = ["SparseArrays"]
220220
[deps.ChainRulesCore.extensions]
221221
ChainRulesCoreSparseArraysExt = "SparseArrays"
222222

223+
[[deps.ClimaCartesianIndices]]
224+
git-tree-sha1 = "0a94213cb6b99b645968da4a2c6e82d2f698eb49"
225+
uuid = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
226+
version = "0.1.3"
227+
223228
[[deps.ClimaComms]]
224229
deps = ["Adapt", "Logging", "LoggingExtras"]
225230
git-tree-sha1 = "40ad44466dfe0092e18c04bc02c849fe8e095d30"
@@ -235,7 +240,7 @@ version = "0.6.6"
235240
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
236241

237242
[[deps.ClimaCore]]
238-
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
243+
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaCartesianIndices", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
239244
path = "../../.."
240245
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
241246
version = "0.14.31"
@@ -246,7 +251,6 @@ version = "0.14.31"
246251

247252
[deps.ClimaCore.weakdeps]
248253
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
249-
ClimaCartesianIndices = "afc79dc6-9922-4b50-ae92-da7b5116c2c8"
250254
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
251255

252256
[[deps.ClimaCoreMakie]]
@@ -689,9 +693,9 @@ version = "0.4.11"
689693

690694
[[deps.GeometryOps]]
691695
deps = ["AbstractTrees", "AdaptivePredicates", "CoordinateTransformations", "DataAPI", "DelaunayTriangulation", "ExactPredicates", "Extents", "GeoFormatTypes", "GeoInterface", "GeometryBasics", "GeometryOpsCore", "LinearAlgebra", "SortTileRecursiveTree", "Statistics", "Tables"]
692-
git-tree-sha1 = "cb9ecfa01c4127f9e001b20024739a65fb7377dc"
696+
git-tree-sha1 = "d190ce025621da7fc29c7d16821425d7d58bd435"
693697
uuid = "3251bfac-6a57-4b6d-aa61-ac1fef2975ab"
694-
version = "0.1.19"
698+
version = "0.1.20"
695699

696700
[deps.GeometryOps.extensions]
697701
GeometryOpsFlexiJoinsExt = "FlexiJoins"
@@ -1753,9 +1757,9 @@ version = "0.34.4"
17531757

17541758
[[deps.StatsFuns]]
17551759
deps = ["HypergeometricFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
1756-
git-tree-sha1 = "35b09e80be285516e52c9054792c884b9216ae3c"
1760+
git-tree-sha1 = "8e45cecc66f3b42633b8ce14d431e8e57a3e242e"
17571761
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
1758-
version = "1.4.0"
1762+
version = "1.5.0"
17591763
weakdeps = ["ChainRulesCore", "InverseFunctions"]
17601764

17611765
[deps.StatsFuns.extensions]
@@ -1806,9 +1810,9 @@ version = "7.2.1+1"
18061810

18071811
[[deps.SymbolicIndexingInterface]]
18081812
deps = ["Accessors", "ArrayInterface", "PrettyTables", "RuntimeGeneratedFunctions", "StaticArraysCore"]
1809-
git-tree-sha1 = "7530e17b6ac652b009966f8ad53371a4ffd273f2"
1813+
git-tree-sha1 = "b6a641e38efa01355aa721246dd246e10c7dcd4d"
18101814
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
1811-
version = "0.3.39"
1815+
version = "0.3.40"
18121816

18131817
[[deps.TOML]]
18141818
deps = ["Dates"]

‎test/MatrixFields/matrix_field_test_utils.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ macro test_all(expression)
2828
local test_func() = $(esc(expression))
2929
@test test_func() # correctness
3030
@test (@allocated test_func()) == 0 # allocations
31-
@test_opt stacktrace_types_limit=4 test_func() # type instabilities
31+
@test_opt test_func() # type instabilities
3232
end
3333
end
3434

@@ -117,14 +117,14 @@ function test_field_broadcast(;
117117
# Test get_result and set_result! for type instabilities, and test
118118
# set_result! for allocations. Ignore the type instabilities in CUDA and
119119
# the allocations they incur.
120-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda_frames materialize(get_result)
121-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda_frames materialize!(result, set_result)
120+
@test_opt ignored_modules = cuda_frames materialize(get_result)
121+
@test_opt ignored_modules = cuda_frames materialize!(result, set_result)
122122
using_cuda || @test (@allocated materialize!(result, set_result)) == 0
123123

124124
if !isnothing(ref_set_result)
125125
# Test ref_set_result! for type instabilities and allocations to
126126
# ensure that the performance comparison is fair.
127-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda_frames materialize!(
127+
@test_opt ignored_modules = cuda_frames materialize!(
128128
ref_result,
129129
ref_set_result,
130130
)

‎test/Operators/integrals.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function test_column_integral_definite!(center_space)
4848
@test max_relative_error <= 0.006 # Less than 0.6% error.
4949

5050
cuda = (AnyFrameModule(CUDA),)
51-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_definite!(∫u_test, ᶜu)
51+
@test_opt ignored_modules = cuda column_integral_definite!(∫u_test, ᶜu)
5252

5353
test_allocs(@allocated column_integral_definite!(∫u_test, ᶜu))
5454
end
@@ -70,7 +70,7 @@ function test_column_integral_indefinite!(center_space)
7070
@test max_relative_error <= 0.006 # Less than 0.6% error at the top level.
7171

7272
cuda = (AnyFrameModule(CUDA),)
73-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_indefinite!(ᶠ∫u_test, ᶜu)
73+
@test_opt ignored_modules = cuda column_integral_indefinite!(ᶠ∫u_test, ᶜu)
7474

7575
test_allocs(@allocated column_integral_indefinite!(ᶠ∫u_test, ᶜu))
7676
end
@@ -93,7 +93,7 @@ function test_column_integral_indefinite_fn!(center_space)
9393
@test max_relative_error <= 0.006 # Less than 0.6% error at the top level.
9494

9595
cuda = (AnyFrameModule(CUDA),)
96-
@test_opt stacktrace_types_limit=4 ignored_modules = cuda column_integral_indefinite!(
96+
@test_opt ignored_modules = cuda column_integral_indefinite!(
9797
fn,
9898
ᶠ∫u_test,
9999
)
@@ -132,7 +132,7 @@ function test_column_reduce_and_accumulate!(center_space)
132132
set_output! = () -> column_reduce!(f, output, input; init, transform)
133133
set_output!()
134134
@test output == reference_output
135-
@test_opt stacktrace_types_limit=4 ignored_modules = (AnyFrameModule(CUDA),) set_output!()
135+
@test_opt ignored_modules = (AnyFrameModule(CUDA),) set_output!()
136136
test_allocs(@allocated set_output!())
137137
end
138138

@@ -148,7 +148,7 @@ function test_column_reduce_and_accumulate!(center_space)
148148
() -> column_accumulate!(f, output, input; init, transform)
149149
set_output!()
150150
@test output == reference_output
151-
@test_opt stacktrace_types_limit=4 ignored_modules = (AnyFrameModule(CUDA),) set_output!()
151+
@test_opt ignored_modules = (AnyFrameModule(CUDA),) set_output!()
152152
test_allocs(@allocated set_output!())
153153
end
154154
end

‎test/aqua.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ end
3131

3232
@testset "Aqua tests (additional)" begin
3333
Aqua.test_undefined_exports(ClimaCore)
34-
Aqua.test_stale_deps(ClimaCore)
34+
Aqua.test_stale_deps(ClimaCore; ignore=[:ClimaCartesianIndices])
3535
Aqua.test_deps_compat(ClimaCore)
3636
Aqua.test_project_extras(ClimaCore)
3737
# Aqua.test_project_toml_formatting(ClimaCore) # failing

0 commit comments

Comments
 (0)