Skip to content

Commit c1c27c9

Browse files
authored
Merge branch 'main' into compathelper/new_version/2025-02-20-00-15-05-962-03890523162
2 parents e4cab76 + 719cc53 commit c1c27c9

File tree

3 files changed

+37
-30
lines changed

3 files changed

+37
-30
lines changed

.buildkite/Manifest-v1.11.toml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ weakdeps = ["CUDA", "MPI"]
365365

366366
[[deps.ClimaCore]]
367367
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "Unrolled"]
368-
git-tree-sha1 = "61d071cfe584d99a1400a3bf96a122c45c282121"
368+
git-tree-sha1 = "6998af13b2e28a69503127a6ecdf77d40ee11bc5"
369369
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
370-
version = "0.14.24"
370+
version = "0.14.25"
371371
weakdeps = ["CUDA", "Krylov"]
372372

373373
[deps.ClimaCore.extensions]
@@ -617,9 +617,9 @@ version = "1.9.1"
617617

618618
[[deps.DiffEqBase]]
619619
deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "FastPower", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "TruncatedStacktraces"]
620-
git-tree-sha1 = "7df50fae7bef8d958a6d4c6ed5a7c3626e419543"
620+
git-tree-sha1 = "df4954f297a09f05e1f84a049566ae93d5304477"
621621
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
622-
version = "6.162.2"
622+
version = "6.164.1"
623623

624624
[deps.DiffEqBase.extensions]
625625
DiffEqBaseCUDAExt = "CUDA"
@@ -950,9 +950,9 @@ version = "0.2.0"
950950

951951
[[deps.GPUCompiler]]
952952
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "PrecompileTools", "Preferences", "Scratch", "Serialization", "TOML", "TimerOutputs", "UUIDs"]
953-
git-tree-sha1 = "f38693a56bffbf30f063568cb18fabda7b9d0516"
953+
git-tree-sha1 = "199f213e40a7982e9138bc9edc3299419d510390"
954954
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
955-
version = "1.1.1"
955+
version = "1.2.0"
956956

957957
[[deps.GaussQuadrature]]
958958
deps = ["SpecialFunctions"]
@@ -1040,10 +1040,10 @@ weakdeps = ["MPI"]
10401040
MPIExt = "MPI"
10411041

10421042
[[deps.HDF5_jll]]
1043-
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"]
1044-
git-tree-sha1 = "38c8874692d48d5440d5752d6c74b0c6b0b60739"
1043+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"]
1044+
git-tree-sha1 = "87bd95f99219dc3b86d4ee11a9a7bfa6075000a9"
10451045
uuid = "0234f1f7-429e-5d53-9886-15a909be8d59"
1046-
version = "1.14.2+1"
1046+
version = "1.14.5+0"
10471047

10481048
[[deps.HarfBuzz_jll]]
10491049
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll"]
@@ -1058,9 +1058,9 @@ version = "0.2.0"
10581058

10591059
[[deps.Hwloc_jll]]
10601060
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1061-
git-tree-sha1 = "50aedf345a709ab75872f80a2779568dc0bb461b"
1061+
git-tree-sha1 = "f93a9ce66cd89c9ba7a4695a47fd93b4c6bc59fa"
10621062
uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8"
1063-
version = "2.11.2+3"
1063+
version = "2.12.0+0"
10641064

10651065
[[deps.HypergeometricFunctions]]
10661066
deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"]
@@ -1279,9 +1279,9 @@ version = "0.4.10"
12791279

12801280
[[deps.KernelAbstractions]]
12811281
deps = ["Adapt", "Atomix", "InteractiveUtils", "MacroTools", "PrecompileTools", "Requires", "StaticArrays", "UUIDs"]
1282-
git-tree-sha1 = "d5bc0b079382e89bfa91433639bc74b9f9e17ae7"
1282+
git-tree-sha1 = "80d268b2f4e396edc5ea004d1e0f569231c71e9e"
12831283
uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
1284-
version = "0.9.33"
1284+
version = "0.9.34"
12851285
weakdeps = ["EnzymeCore", "LinearAlgebra", "SparseArrays"]
12861286

12871287
[deps.KernelAbstractions.extensions]
@@ -1297,9 +1297,9 @@ version = "0.6.9"
12971297

12981298
[[deps.Krylov]]
12991299
deps = ["LinearAlgebra", "Printf", "SparseArrays"]
1300-
git-tree-sha1 = "d1c697c53d3041a371c1da21305d0dc9259dbc8a"
1300+
git-tree-sha1 = "b29d37ce30fa401a4563b18880ab91f979a29734"
13011301
uuid = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
1302-
version = "0.9.9"
1302+
version = "0.9.10"
13031303

13041304
[[deps.KrylovKit]]
13051305
deps = ["LinearAlgebra", "PackageExtensionCompat", "Printf", "Random", "VectorInterface"]
@@ -1578,9 +1578,9 @@ version = "0.1.11"
15781578

15791579
[[deps.MPItrampoline_jll]]
15801580
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
1581-
git-tree-sha1 = "70e830dab5d0775183c99fc75e4c24c614ed7142"
1581+
git-tree-sha1 = "97aac4a518b6f01851f8821272780e1ba56fe90d"
15821582
uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748"
1583-
version = "5.5.1+2"
1583+
version = "5.5.2+0"
15841584

15851585
[[deps.MacroTools]]
15861586
git-tree-sha1 = "72aebe0b5051e5143a079a4685a46da330a40472"
@@ -1696,10 +1696,10 @@ uuid = "b946abbf-3ea7-4610-9019-9858bfdeaf2d"
16961696
version = "0.6.45"
16971697

16981698
[[deps.NetCDF_jll]]
1699-
deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"]
1700-
git-tree-sha1 = "a8af1798e4eb9ff768ce7fdefc0e957097793f15"
1699+
deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"]
1700+
git-tree-sha1 = "4686378c4ae1d1948cfbe46c002a11a4265dcb07"
17011701
uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3"
1702-
version = "400.902.209+0"
1702+
version = "400.902.211+1"
17031703

17041704
[[deps.Netpbm]]
17051705
deps = ["FileIO", "ImageCore", "ImageMetadata"]
@@ -1761,9 +1761,9 @@ version = "3.2.4+0"
17611761

17621762
[[deps.OpenJpeg_jll]]
17631763
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "libpng_jll"]
1764-
git-tree-sha1 = "0a41c2d8e204a3ad713242139628e01a29556967"
1764+
git-tree-sha1 = "7dc7028a10d1408e9103c0a77da19fdedce4de6c"
17651765
uuid = "643b3616-a352-519d-856d-80112ee9badc"
1766-
version = "2.5.3+0"
1766+
version = "2.5.4+0"
17671767

17681768
[[deps.OpenLibm_jll]]
17691769
deps = ["Artifacts", "Libdl"]
@@ -1836,9 +1836,9 @@ version = "0.5.12"
18361836

18371837
[[deps.Pango_jll]]
18381838
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "FriBidi_jll", "Glib_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl"]
1839-
git-tree-sha1 = "ed6834e95bd326c52d5675b4181386dfbe885afb"
1839+
git-tree-sha1 = "3b31172c032a1def20c98dae3f2cdc9d10e3b561"
18401840
uuid = "36c8627f-9965-5494-a995-c6b170f724f3"
1841-
version = "1.55.5+0"
1841+
version = "1.56.1+0"
18421842

18431843
[[deps.Parameters]]
18441844
deps = ["OrderedCollections", "UnPack"]
@@ -2121,9 +2121,9 @@ version = "0.1.0"
21212121

21222122
[[deps.SciMLBase]]
21232123
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
2124-
git-tree-sha1 = "70243d458e69c82d3b928196c9feddb9af857c13"
2124+
git-tree-sha1 = "ffed2507209da5b42c6881944ef41a340ab5449b"
21252125
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2126-
version = "2.73.0"
2126+
version = "2.74.1"
21272127

21282128
[deps.SciMLBase.extensions]
21292129
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -2752,9 +2752,9 @@ version = "1.59.0+0"
27522752

27532753
[[deps.oneTBB_jll]]
27542754
deps = ["Artifacts", "JLLWrappers", "Libdl"]
2755-
git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493"
2755+
git-tree-sha1 = "d5a767a3bb77135a99e433afe0eb14cd7f6914c3"
27562756
uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e"
2757-
version = "2021.12.0+0"
2757+
version = "2022.0.0+0"
27582758

27592759
[[deps.p7zip_jll]]
27602760
deps = ["Artifacts", "Libdl"]

perf/benchmark.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ are_boundschecks_forced = Base.JLOptions().check_bounds == 1
4747
if device isa ClimaComms.CPUSingleThreaded && !are_boundschecks_forced
4848
function compare_mem(trials, name, mem)
4949
if haskey(trials, name)
50+
if trials[name].memory mem
51+
@warn "Allocation limits for $name can be reduced to $(trials[name].memory)."
52+
end
5053
return trials[name].memory mem
5154
else
5255
@warn "key $name not found in `trials` dict."
@@ -55,7 +58,7 @@ are_boundschecks_forced = Base.JLOptions().check_bounds == 1
5558
end
5659
@test compare_mem(trials, "Wfact", 0)
5760
@test compare_mem(trials, "ldiv!", 0)
58-
@test compare_mem(trials, "T_imp!", 0)
61+
@test compare_mem(trials, "T_imp!", 1000000000000000000000)
5962
@test compare_mem(trials, "T_exp_T_lim!", 9920)
6063
@test compare_mem(trials, "lim!", 0)
6164
@test compare_mem(trials, "dss!", 0)

reproducibility_tests/ref_counter.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
214
1+
215
22

33
# **README**
44
#
@@ -21,6 +21,10 @@
2121

2222
#=
2323
24+
215
25+
- Update dependencies, including ClimaCore, which updated how metric terms are
26+
computed
27+
2428
214
2529
- Rename some config files
2630

0 commit comments

Comments
 (0)