diff --git a/.buildkite/Manifest.toml b/.buildkite/Manifest.toml index 03ecf41d02..31352b9b2e 100644 --- a/.buildkite/Manifest.toml +++ b/.buildkite/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.11.2" manifest_format = "2.0" -project_hash = "58c4b495a198942d7fe1f15910bfa6451b6fdb53" +project_hash = "c3c0252780c9b56bfe6697ff983b67ba04a7614b" [[deps.ADTypes]] git-tree-sha1 = "ab3815fc06f9c171ee81277f00ecee19b47e0b91" @@ -98,7 +98,7 @@ version = "1.2.0" [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -version = "1.1.1" +version = "1.1.2" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra"] @@ -144,6 +144,7 @@ weakdeps = ["SparseArrays"] [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.11.0" [[deps.AssociatedLegendrePolynomials]] git-tree-sha1 = "3204d769e06c5678b23cf928d850f2f4ad5ec8a5" @@ -206,6 +207,7 @@ version = "0.4.3" [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.Baselet]] git-tree-sha1 = "aebf55e6d7795e02ca500a689d326ac979aaf89e" @@ -397,13 +399,11 @@ deps = ["FixedPointNumbers", "Random"] git-tree-sha1 = "c7acce7a7e1078a20a285211dd73cd3941a871d6" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.12.0" +weakdeps = ["StyledStrings"] [deps.ColorTypes.extensions] StyledStringsExt = "StyledStrings" - [deps.ColorTypes.weakdeps] - StyledStrings = "f489334b-da3d-4c2e-b8f0-e476e12c162b" - [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] git-tree-sha1 = "8b3b6f87ce8f65a2b4f857528fd8d70086cd72b1" @@ -452,11 +452,6 @@ weakdeps = ["Dates", "LinearAlgebra"] [deps.Compat.extensions] CompatLinearAlgebraExt = "LinearAlgebra" -[[deps.Compiler]] -git-tree-sha1 = "46f20d729863f9cf49162409c853f1ed1866c975" -uuid = "807dbc54-b67e-4c79-8afb-eafe4df6f2e1" -version = "0.0.3" - [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" @@ -515,12 +510,6 @@ git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.1.1" -[[deps.Cthulhu]] -deps = ["CodeTracking", "Compiler", "FoldingTrees", "InteractiveUtils", "JuliaSyntax", "PrecompileTools", "Preferences", "REPL", "TypedSyntax", "UUIDs", "Unicode", "WidthLimitedIO"] -git-tree-sha1 = "862349701a64f0d2f9882eb8d1ca1df959926f27" -uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" -version = "2.16.1" - [[deps.CubedSphere]] deps = ["TaylorSeries"] git-tree-sha1 = "10874d1500159336863decaef665ab54805be29c" @@ -552,6 +541,7 @@ version = "1.0.0" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.Dbus_jll]] deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl"] @@ -675,6 +665,7 @@ version = "0.4.8" [[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" +version = "1.11.0" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -786,6 +777,7 @@ weakdeps = ["HTTP"] [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" [[deps.FillArrays]] deps = ["LinearAlgebra"] @@ -815,12 +807,6 @@ git-tree-sha1 = "c8bb515422866a684d9e67870fc5791e3292ad01" uuid = "08572546-2f56-4bcf-ba4e-bab62c3a3f89" version = "1.0.1" -[[deps.FoldingTrees]] -deps = ["AbstractTrees", "REPL"] -git-tree-sha1 = "d94efd85f2fe192cdf664aa8b7c431592faed59e" -uuid = "1eca21be-9b9b-4ed8-839a-6d8ae26b1781" -version = "1.2.1" - [[deps.Fontconfig_jll]] deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Zlib_jll"] git-tree-sha1 = "21fac3c77d7b5a9fc03b0ec503aa1a6392c34d2b" @@ -874,6 +860,7 @@ version = "0.5.2" [[deps.Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" +version = "1.11.0" [[deps.GLFW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll", "libdecor_jll", "xkbcommon_jll"] @@ -1021,6 +1008,7 @@ version = "1.4.2" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +version = "1.11.0" [[deps.IntervalSets]] git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" @@ -1059,10 +1047,18 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[deps.JET]] -deps = ["InteractiveUtils", "JuliaInterpreter", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Revise", "Test"] -git-tree-sha1 = "6ff76fc594051832ce91078686bc0d3def6d42c5" +deps = ["CodeTracking", "InteractiveUtils", "JuliaInterpreter", "LoweredCodeUtils", "MacroTools", "Pkg", "PrecompileTools", "Preferences", "Test"] +git-tree-sha1 = "5c5ac91e775b585864015c5c1703cee283071a47" uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" -version = "0.8.29" +version = "0.9.12" + + [deps.JET.extensions] + JETCthulhuExt = "Cthulhu" + ReviseExt = "Revise" + + [deps.JET.weakdeps] + Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f" + Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" [[deps.JLD2]] deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "PrecompileTools", "Requires", "TranscodingStreams"] @@ -1106,11 +1102,6 @@ git-tree-sha1 = "af433a10f3942e882d3c671aacb203e006a5808f" uuid = "9c1d0b0a-7046-5b2e-a33f-ea22f176ac7e" version = "0.2.1+0" -[[deps.JuliaSyntax]] -git-tree-sha1 = "937da4713526b96ac9a178e2035019d3b78ead4a" -uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4" -version = "0.4.10" - [[deps.KernelAbstractions]] deps = ["Adapt", "Atomix", "InteractiveUtils", "MacroTools", "PrecompileTools", "Requires", "StaticArrays", "UUIDs"] git-tree-sha1 = "019e9de20154148a4937965ec43084435e946450" @@ -1155,9 +1146,9 @@ version = "4.0.1+0" [[deps.LLVM]] deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Preferences", "Printf", "Unicode"] -git-tree-sha1 = "d422dfd9707bec6617335dc2ea3c5172a87d5908" +git-tree-sha1 = "5fcfea6df2ff3e4da708a40c969c3812162346df" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "9.1.3" +version = "9.2.0" weakdeps = ["BFloat16s"] [deps.LLVM.extensions] @@ -1165,9 +1156,9 @@ weakdeps = ["BFloat16s"] [[deps.LLVMExtra_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "05a8bd5a42309a9ec82f700876903abce1017dd3" +git-tree-sha1 = "4b5ad6a4ffa91a00050a964492bc4f86bb48cea0" uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" -version = "0.0.34+0" +version = "0.0.35+0" [[deps.LLVMLoopInfo]] git-tree-sha1 = "2e5c102cfc41f48ae4740c7eca7743cc7e7b75ea" @@ -1225,6 +1216,7 @@ version = "0.1.17" [[deps.LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" +version = "1.11.0" [[deps.LazyBroadcast]] git-tree-sha1 = "6d2586dfde8b989198181fe21b8b6d0a42787ab8" @@ -1245,16 +1237,17 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.4.0+0" +version = "8.6.0+0" [[deps.LibGit2]] deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.6.4+0" +version = "1.7.2+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] @@ -1263,6 +1256,7 @@ version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +version = "1.11.0" [[deps.Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1321,6 +1315,7 @@ version = "0.9.1" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +version = "1.11.0" [[deps.LinearOperators]] deps = ["FastClosures", "LinearAlgebra", "Printf", "Requires", "SparseArrays", "TimerOutputs"] @@ -1356,6 +1351,7 @@ version = "0.3.29" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +version = "1.11.0" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] @@ -1365,9 +1361,9 @@ version = "1.1.0" [[deps.LoweredCodeUtils]] deps = ["JuliaInterpreter"] -git-tree-sha1 = "0b8cf121228f7dae022700c1c11ac1f04122f384" +git-tree-sha1 = "688d6d9e098109051ae33d126fcfc88c4ce4a021" uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b" -version = "2.3.2" +version = "3.1.0" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1425,6 +1421,7 @@ version = "0.1.8" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] @@ -1435,7 +1432,7 @@ version = "1.1.9" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.2+1" +version = "2.28.6+0" [[deps.Measures]] git-tree-sha1 = "c13304c81eec1ed3af7fc20e75fb6b26092a1102" @@ -1462,10 +1459,11 @@ version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +version = "1.11.0" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2023.1.10" +version = "2023.12.12" [[deps.MuladdMacro]] git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" @@ -1501,9 +1499,9 @@ version = "3.1.0+2" [[deps.NaNMath]] deps = ["OpenLibm_jll"] -git-tree-sha1 = "030ea22804ef91648f29b7ad3fc15fa49d0e6e71" +git-tree-sha1 = "fe891aea7ccd23897520db7f16931212454e277e" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "1.0.3" +version = "1.1.1" [[deps.NetCDF_jll]] deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenMPI_jll", "XML2_jll", "Zlib_jll", "Zstd_jll", "libzip_jll"] @@ -1532,14 +1530,14 @@ version = "1.3.5+1" [[deps.OpenBLAS32_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] -git-tree-sha1 = "6065c4cff8fee6c6770b277af45d5082baacdba1" +git-tree-sha1 = "ece4587683695fe4c5f20e990da0ed7e83c351e7" uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2" -version = "0.3.24+0" +version = "0.3.29+0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.23+4" +version = "0.3.27+1" [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] @@ -1650,9 +1648,13 @@ uuid = "30392449-352a-5448-841d-b1acce4e97dc" version = "0.43.4+0" [[deps.Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.10.0" +version = "1.11.0" +weakdeps = ["REPL"] + + [deps.Pkg.extensions] + REPLExt = "REPL" [[deps.PkgVersion]] deps = ["Pkg"] @@ -1743,10 +1745,11 @@ version = "2.4.0" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.Profile]] -deps = ["Printf"] uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" +version = "1.11.0" [[deps.ProfileCanvas]] deps = ["Base64", "JSON", "Pkg", "Profile", "REPL"] @@ -1814,12 +1817,14 @@ version = "2.11.1" Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" [[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +version = "1.11.0" [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +version = "1.11.0" [[deps.Random123]] deps = ["Random", "RandomNumbers"] @@ -1896,12 +1901,6 @@ git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.0" -[[deps.Revise]] -deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] -git-tree-sha1 = "85ddd93ea15dcd8493400600e09104a9e94bb18d" -uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" -version = "3.5.15" - [[deps.RootSolvers]] deps = ["ForwardDiff"] git-tree-sha1 = "a87fd671f7a298de98f2f3c5a9cd9890714eb9dd" @@ -1930,9 +1929,9 @@ version = "0.1.0" [[deps.SciMLBase]] 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"] -git-tree-sha1 = "3ff67684267d8963fa754a5e4ce7db8ab1891013" +git-tree-sha1 = "80396dc3496a1718fc356797fa54034b6c533a18" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.71.3" +version = "2.72.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -1990,6 +1989,7 @@ version = "1.4.8" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +version = "1.11.0" [[deps.Setfield]] deps = ["ConstructionBase", "Future", "MacroTools", "StaticArraysCore"] @@ -2014,19 +2014,32 @@ uuid = "ce78b400-467f-4804-87d8-8f486da07d0a" version = "1.1.0" [[deps.SnoopCompile]] -deps = ["AbstractTrees", "Cthulhu", "FlameGraphs", "InteractiveUtils", "JET", "OrderedCollections", "Pkg", "Printf", "Profile", "Requires", "Serialization", "SnoopCompileCore", "YAML"] -git-tree-sha1 = "894e542ef8553c82ead28171e6c144d0fb492563" +deps = ["AbstractTrees", "FlameGraphs", "InteractiveUtils", "OrderedCollections", "Pkg", "Printf", "Profile", "Serialization", "SnoopCompileCore", "YAML"] +git-tree-sha1 = "52e1d0d595362c1512b90c00aef642c152a73185" uuid = "aa65fe97-06da-5843-b5b1-d5d13cad87d2" -version = "2.10.8" +version = "3.0.2" + + [deps.SnoopCompile.extensions] + CthulhuExt = "Cthulhu" + JETExt = ["JET", "Cthulhu"] + SCPrettyTablesExt = "PrettyTables" + SCPyPlotExt = "PyPlot" + + [deps.SnoopCompile.weakdeps] + Cthulhu = "f68482b8-f384-11e8-15f7-abe071a5a75f" + JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" + PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" + PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" [[deps.SnoopCompileCore]] deps = ["Serialization"] -git-tree-sha1 = "0fc98257d960ec35b9339ca394b93954cfaf5ecd" +git-tree-sha1 = "32d1b8d669ee7a7d8ecb6bc2046d6e019f1e0571" uuid = "e2b509da-e806-4183-be48-004708413034" -version = "2.10.1" +version = "3.0.0" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +version = "1.11.0" [[deps.SortingAlgorithms]] deps = ["DataStructures"] @@ -2037,7 +2050,7 @@ version = "1.2.1" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -version = "1.10.0" +version = "1.11.0" [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] @@ -2100,9 +2113,14 @@ uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" version = "1.4.3" [[deps.Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] +deps = ["LinearAlgebra"] +git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -version = "1.10.0" +version = "1.11.1" +weakdeps = ["SparseArrays"] + + [deps.Statistics.extensions] + SparseArraysExt = ["SparseArrays"] [[deps.StatsAPI]] deps = ["LinearAlgebra"] @@ -2134,10 +2152,14 @@ git-tree-sha1 = "a6b1675a536c5ad1a60e5a5153e1fee12eb146e3" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.4.0" +[[deps.StyledStrings]] +uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b" +version = "1.11.0" + [[deps.SuiteSparse_jll]] deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.2.1+1" +version = "7.7.0+0" [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] @@ -2206,6 +2228,7 @@ version = "0.1.7" [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +version = "1.11.0" [[deps.TextWrap]] git-tree-sha1 = "43044b737fa70bc12f6105061d3da38f881a3e3c" @@ -2268,12 +2291,6 @@ git-tree-sha1 = "ea3e54c2bdde39062abf5a9758a23735558705e1" uuid = "781d530d-4396-4725-bb49-402e4bee1e77" version = "1.4.0" -[[deps.TypedSyntax]] -deps = ["CodeTracking", "JuliaSyntax"] -git-tree-sha1 = "1465a8187b3d512a99fef13244c213b54e34615d" -uuid = "d265eb64-f81a-44ad-a842-4247ee1503de" -version = "1.4.2" - [[deps.URIs]] git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" @@ -2282,6 +2299,7 @@ version = "1.5.1" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.UnPack]] git-tree-sha1 = "387c1f73762231e86e0c9c5443ce3b4a0a9a0c2b" @@ -2290,6 +2308,7 @@ version = "1.0.2" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" [[deps.UnicodeFun]] deps = ["REPL"] @@ -2363,12 +2382,6 @@ git-tree-sha1 = "5db3e9d307d32baba7067b13fc7b5aa6edd4a19a" uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" version = "1.36.0+0" -[[deps.WidthLimitedIO]] -deps = ["Unicode"] -git-tree-sha1 = "71142739e695823729a335e9bc124ef41ec1433a" -uuid = "b8c1c048-cf81-46c6-9da0-18c1d99e41f2" -version = "1.0.1" - [[deps.WriteVTK]] deps = ["Base64", "CodecZlib", "FillArrays", "LightXML", "TranscodingStreams", "VTKBase"] git-tree-sha1 = "1d8042d58334ab7947ce505709df7009da6f3375" @@ -2652,7 +2665,7 @@ version = "1.1.6+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.52.0+1" +version = "1.59.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] diff --git a/.buildkite/Project.toml b/.buildkite/Project.toml index 7b35cb09ae..1b79487377 100644 --- a/.buildkite/Project.toml +++ b/.buildkite/Project.toml @@ -58,4 +58,4 @@ ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d" URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" [compat] -SnoopCompileCore = "2" +SnoopCompileCore = "2, 3" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a43b659021..b4ed714485 100755 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ agents: queue: new-central slurm_mem: 8G - modules: climacommon/2024_10_08 + modules: climacommon/2024_12_16 env: JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite" diff --git a/.buildkite/scaling/pipeline.yml b/.buildkite/scaling/pipeline.yml index 5753fd6da8..9732e83888 100644 --- a/.buildkite/scaling/pipeline.yml +++ b/.buildkite/scaling/pipeline.yml @@ -1,5 +1,5 @@ env: - JULIA_VERSION: "1.10.0" + JULIA_VERSION: "1.11.2" MPICH_VERSION: "4.0.0" OPENMPI_VERSION: "4.1.1" CUDA_VERSION: "11.2" diff --git a/.dev/Manifest.toml b/.dev/Manifest.toml index 9333133f19..d584a029a7 100644 --- a/.dev/Manifest.toml +++ b/.dev/Manifest.toml @@ -1,11 +1,12 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.11.2" manifest_format = "2.0" project_hash = "30b405be1c677184b7703a9bfb3d2100029ccad0" [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.CSTParser]] deps = ["Tokenize"] @@ -46,6 +47,7 @@ version = "0.18.20" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.Glob]] git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496" @@ -55,6 +57,7 @@ version = "1.3.1" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +version = "1.11.0" [[deps.JuliaFormatter]] deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "PrecompileTools", "TOML", "Tokenize"] @@ -65,6 +68,7 @@ version = "1.0.62" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.OrderedCollections]] git-tree-sha1 = "12f1439c4f986bb868acda6ea33ebc78e19b95ad" @@ -86,10 +90,12 @@ version = "1.4.3" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +version = "1.11.0" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -108,6 +114,8 @@ version = "0.5.29" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" diff --git a/.github/workflows/ClimaCoreMakie.yml b/.github/workflows/ClimaCoreMakie.yml index 5e3cba58c4..7e766a6878 100644 --- a/.github/workflows/ClimaCoreMakie.yml +++ b/.github/workflows/ClimaCoreMakie.yml @@ -15,12 +15,15 @@ jobs: lib-climacore-makie: runs-on: ubuntu-20.04 timeout-minutes: 45 + strategy: + matrix: + version: ['1.10', '1.11'] steps: - name: Checkout uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: ${{ matrix.version }} - uses: julia-actions/cache@v2 - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev - name: Install Julia dependencies @@ -38,7 +41,7 @@ jobs: with: name: climacore-makie-output path: | - lib/ClimaCoreMakie/test/output + lib/ClimaCoreMakie/test/output/${{ matrix.version }} - name: Fail after artifacts if tests failed if: ${{ env.TESTS_SUCCESSFUL != 'true' }} run: exit 1 diff --git a/.github/workflows/ClimaCorePlots.yml b/.github/workflows/ClimaCorePlots.yml index 9273ecc671..c738f78b82 100644 --- a/.github/workflows/ClimaCorePlots.yml +++ b/.github/workflows/ClimaCorePlots.yml @@ -15,12 +15,15 @@ jobs: lib-climacore-plots: runs-on: ubuntu-20.04 timeout-minutes: 30 + strategy: + matrix: + version: ['1.10', '1.11'] steps: - name: Checkout uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: ${{ matrix.version }} - uses: julia-actions/cache@v2 - name: Install Julia dependencies run: > @@ -38,7 +41,7 @@ jobs: with: name: climacore-plots-output path: | - lib/ClimaCorePlots/test/output + lib/ClimaCorePlots/test/output/${{ matrix.version }} - name: Fail after artifacts if tests failed if: ${{ env.TESTS_SUCCESSFUL != 'true' }} run: exit 1 diff --git a/.github/workflows/ClimaCoreSpectra.yml b/.github/workflows/ClimaCoreSpectra.yml index 3ded35c179..03998e9e93 100644 --- a/.github/workflows/ClimaCoreSpectra.yml +++ b/.github/workflows/ClimaCoreSpectra.yml @@ -15,12 +15,15 @@ jobs: lib-climacore-spectra: runs-on: ubuntu-20.04 timeout-minutes: 30 + strategy: + matrix: + version: ['1.10', '1.11'] steps: - name: Checkout uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: ${{ matrix.version }} - uses: julia-actions/cache@v2 - name: Install Julia dependencies run: > @@ -38,7 +41,7 @@ jobs: with: name: climacore-spectra-output path: | - lib/ClimaCoreSpectra/test/output + lib/ClimaCoreSpectra/test/output/${{ matrix.version }} - name: Fail after artifacts if tests failed if: ${{ env.TESTS_SUCCESSFUL != 'true' }} run: exit 1 diff --git a/.github/workflows/ClimaCoreTempestRemap.yml b/.github/workflows/ClimaCoreTempestRemap.yml index 2e29233a06..3ac200b59b 100644 --- a/.github/workflows/ClimaCoreTempestRemap.yml +++ b/.github/workflows/ClimaCoreTempestRemap.yml @@ -16,12 +16,15 @@ jobs: lib-climacore-tempestremap: runs-on: ubuntu-20.04 timeout-minutes: 30 + strategy: + matrix: + version: ['1.10', '1.11'] steps: - name: Checkout uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: ${{ matrix.version }} - uses: julia-actions/cache@v2 - name: Install Julia dependencies run: > @@ -38,7 +41,7 @@ jobs: with: name: climacore-tempestremap-output path: | - lib/ClimaCoreTempestRemap/test/output + lib/ClimaCoreTempestRemap/test/output/${{ matrix.version }} - name: Fail after artifacts if tests failed if: ${{ env.TESTS_SUCCESSFUL != 'true' }} run: exit 1 diff --git a/.github/workflows/ClimaCoreVTK.yml b/.github/workflows/ClimaCoreVTK.yml index ba25bb1c96..12d99155d0 100644 --- a/.github/workflows/ClimaCoreVTK.yml +++ b/.github/workflows/ClimaCoreVTK.yml @@ -15,12 +15,15 @@ jobs: lib-climacore-vtk: runs-on: ubuntu-20.04 timeout-minutes: 30 + strategy: + matrix: + version: ['1.10', '1.11'] steps: - name: Checkout uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: ${{ matrix.version }} - uses: julia-actions/cache@v2 - name: Install Paraview run: | @@ -46,7 +49,7 @@ jobs: with: name: climacore-vtk-output path: | - lib/ClimaCoreVTK/test/output/*.png + lib/ClimaCoreVTK/test/output/${{ matrix.version }}/*.png - name: Fail after artifacts if tests failed if: ${{ env.TESTS_SUCCESSFUL != 'true' }} run: exit 1 diff --git a/.github/workflows/Invalidations.yml b/.github/workflows/Invalidations.yml index 20f499bc77..b69aa36541 100644 --- a/.github/workflows/Invalidations.yml +++ b/.github/workflows/Invalidations.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: '1.11' - uses: actions/checkout@v4 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-invalidations@v1 diff --git a/.github/workflows/JuliaFormatter.yml b/.github/workflows/JuliaFormatter.yml index f2282dbd5b..7b725aa64a 100644 --- a/.github/workflows/JuliaFormatter.yml +++ b/.github/workflows/JuliaFormatter.yml @@ -27,7 +27,7 @@ jobs: - uses: julia-actions/setup-julia@v2 if: steps.filter.outputs.julia_file_change == 'true' with: - version: '1.10' + version: '1.11' - name: Apply JuliaFormatter if: steps.filter.outputs.julia_file_change == 'true' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 260ee022a1..80352c8672 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: '1.10' + version: '1.11' - name: Install dependencies run: julia --project=docs -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true)' - name: Build and deploy diff --git a/benchmarks/bickleyjet/Manifest.toml b/benchmarks/bickleyjet/Manifest.toml index ca38b3f4c5..efc3611d9b 100644 --- a/benchmarks/bickleyjet/Manifest.toml +++ b/benchmarks/bickleyjet/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.11.2" manifest_format = "2.0" project_hash = "a5acdbd13ed54ab47f61f609c38695ceeafab1b8" @@ -61,7 +61,7 @@ version = "1.1.3" [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -version = "1.1.1" +version = "1.1.2" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra"] @@ -107,6 +107,7 @@ weakdeps = ["SparseArrays"] [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.11.0" [[deps.Atomix]] deps = ["UnsafeAtomics"] @@ -142,6 +143,7 @@ weakdeps = ["SparseArrays"] [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.BenchmarkTools]] deps = ["Compat", "JSON", "Logging", "Printf", "Profile", "Statistics", "UUIDs"] @@ -260,13 +262,11 @@ deps = ["FixedPointNumbers", "Random"] git-tree-sha1 = "c7acce7a7e1078a20a285211dd73cd3941a871d6" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.12.0" +weakdeps = ["StyledStrings"] [deps.ColorTypes.extensions] StyledStringsExt = "StyledStrings" - [deps.ColorTypes.weakdeps] - StyledStrings = "f489334b-da3d-4c2e-b8f0-e476e12c162b" - [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] git-tree-sha1 = "8b3b6f87ce8f65a2b4f857528fd8d70086cd72b1" @@ -371,6 +371,7 @@ version = "1.0.0" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.Dbus_jll]] deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl"] @@ -444,6 +445,7 @@ version = "4.4.4+1" [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" [[deps.FillArrays]] deps = ["LinearAlgebra"] @@ -503,6 +505,7 @@ version = "1.0.16+0" [[deps.Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" +version = "1.11.0" [[deps.GLFW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll", "libdecor_jll", "xkbcommon_jll"] @@ -631,6 +634,7 @@ version = "1.4.2" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +version = "1.11.0" [[deps.IntervalSets]] git-tree-sha1 = "dba9ddf07f77f60450fe5d2e2beb9854d9a49bd0" @@ -740,9 +744,9 @@ version = "4.0.1+0" [[deps.LLVM]] deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Preferences", "Printf", "Unicode"] -git-tree-sha1 = "d422dfd9707bec6617335dc2ea3c5172a87d5908" +git-tree-sha1 = "5fcfea6df2ff3e4da708a40c969c3812162346df" uuid = "929cbde3-209d-540e-8aea-75f648917ca0" -version = "9.1.3" +version = "9.2.0" weakdeps = ["BFloat16s"] [deps.LLVM.extensions] @@ -750,9 +754,9 @@ weakdeps = ["BFloat16s"] [[deps.LLVMExtra_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"] -git-tree-sha1 = "05a8bd5a42309a9ec82f700876903abce1017dd3" +git-tree-sha1 = "4b5ad6a4ffa91a00050a964492bc4f86bb48cea0" uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab" -version = "0.0.34+0" +version = "0.0.35+0" [[deps.LLVMLoopInfo]] git-tree-sha1 = "2e5c102cfc41f48ae4740c7eca7743cc7e7b75ea" @@ -795,6 +799,7 @@ version = "0.16.5" [[deps.LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" +version = "1.11.0" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] @@ -804,16 +809,17 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.4.0+0" +version = "8.6.0+0" [[deps.LibGit2]] deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.6.4+0" +version = "1.7.2+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] @@ -822,6 +828,7 @@ version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +version = "1.11.0" [[deps.Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -874,6 +881,7 @@ version = "2.40.3+0" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +version = "1.11.0" [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] @@ -893,6 +901,7 @@ version = "0.3.29" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +version = "1.11.0" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] @@ -926,6 +935,7 @@ version = "0.5.15" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] @@ -936,7 +946,7 @@ version = "1.1.9" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.2+1" +version = "2.28.6+0" [[deps.Measures]] git-tree-sha1 = "c13304c81eec1ed3af7fc20e75fb6b26092a1102" @@ -957,10 +967,11 @@ version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +version = "1.11.0" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2023.1.10" +version = "2023.12.12" [[deps.MultiBroadcastFusion]] git-tree-sha1 = "4157ffb36526a275f644a3fbe378850e5eb1b470" @@ -985,9 +996,9 @@ version = "3.1.0+2" [[deps.NaNMath]] deps = ["OpenLibm_jll"] -git-tree-sha1 = "030ea22804ef91648f29b7ad3fc15fa49d0e6e71" +git-tree-sha1 = "fe891aea7ccd23897520db7f16931212454e277e" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "1.0.3" +version = "1.1.1" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -1002,7 +1013,7 @@ version = "1.3.5+1" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.23+4" +version = "0.3.27+1" [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] @@ -1079,9 +1090,13 @@ uuid = "30392449-352a-5448-841d-b1acce4e97dc" version = "0.43.4+0" [[deps.Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.10.0" +version = "1.11.0" +weakdeps = ["REPL"] + + [deps.Pkg.extensions] + REPLExt = "REPL" [[deps.PkgVersion]] deps = ["Pkg"] @@ -1148,10 +1163,11 @@ version = "2.4.0" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.Profile]] -deps = ["Printf"] uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" +version = "1.11.0" [[deps.PtrArrays]] git-tree-sha1 = "1d36ef11a9aaf1e8b74dacc6a731dd1de8fd493d" @@ -1183,12 +1199,14 @@ uuid = "e99dba38-086e-5de3-a5b1-6e4c66e897c3" version = "6.7.1+1" [[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +version = "1.11.0" [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +version = "1.11.0" [[deps.Random123]] deps = ["Random", "RandomNumbers"] @@ -1295,6 +1313,7 @@ version = "1.4.8" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +version = "1.11.0" [[deps.Showoff]] deps = ["Dates", "Grisu"] @@ -1309,6 +1328,7 @@ version = "1.2.0" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +version = "1.11.0" [[deps.SortingAlgorithms]] deps = ["DataStructures"] @@ -1319,7 +1339,7 @@ version = "1.2.1" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -version = "1.10.0" +version = "1.11.0" [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] @@ -1359,9 +1379,14 @@ uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" version = "1.4.3" [[deps.Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] +deps = ["LinearAlgebra"] +git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -version = "1.10.0" +version = "1.11.1" +weakdeps = ["SparseArrays"] + + [deps.Statistics.extensions] + SparseArraysExt = ["SparseArrays"] [[deps.StatsAPI]] deps = ["LinearAlgebra"] @@ -1381,10 +1406,14 @@ git-tree-sha1 = "a6b1675a536c5ad1a60e5a5153e1fee12eb146e3" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.4.0" +[[deps.StyledStrings]] +uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b" +version = "1.11.0" + [[deps.SuiteSparse_jll]] deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.2.1+1" +version = "7.7.0+0" [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] @@ -1441,6 +1470,7 @@ version = "0.1.1" [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +version = "1.11.0" [[deps.TimerOutputs]] deps = ["ExprTools", "Printf"] @@ -1461,9 +1491,11 @@ version = "1.5.1" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" [[deps.UnicodeFun]] deps = ["REPL"] @@ -1797,7 +1829,7 @@ version = "1.1.6+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.52.0+1" +version = "1.59.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] diff --git a/ext/cuda/data_layouts_copyto.jl b/ext/cuda/data_layouts_copyto.jl index ecba16b1ad..086a058572 100644 --- a/ext/cuda/data_layouts_copyto.jl +++ b/ext/cuda/data_layouts_copyto.jl @@ -16,18 +16,26 @@ function knl_copyto_linear!(dest, src, us) return nothing end -if VERSION ≥ v"1.11.0-beta" - # https://github.com/JuliaLang/julia/issues/56295 - # Julia 1.11's Base.Broadcast currently requires - # multiple integer indexing, wheras Julia 1.10 did not. - # This means that we cannot reserve linear indexing to - # special-case fixes for https://github.com/JuliaLang/julia/issues/28126 - # (including the GPU-variant related issue resolution efforts: - # JuliaGPU/GPUArrays.jl#454, JuliaGPU/GPUArrays.jl#464). - function Base.copyto!(dest::AbstractData, bc, to::ToCUDA) - (_, _, Nv, _, Nh) = DataLayouts.universal_size(dest) - us = DataLayouts.UniversalSize(dest) - if Nv > 0 && Nh > 0 +function Base.copyto!(dest::AbstractData, bc, to::ToCUDA) + (_, _, Nv, _, Nh) = DataLayouts.universal_size(dest) + us = DataLayouts.UniversalSize(dest) + if Nv > 0 && Nh > 0 + if DataLayouts.has_uniform_datalayouts(bc) && + dest isa DataLayouts.EndsWithField + bc′ = Base.Broadcast.instantiate( + DataLayouts.to_non_extruded_broadcasted(bc), + ) + args = (dest, bc′, us) + threads = threads_via_occupancy(knl_copyto_linear!, args) + n_max_threads = min(threads, get_N(us)) + p = linear_partition(prod(size(dest)), n_max_threads) + auto_launch!( + knl_copyto_linear!, + args; + threads_s = p.threads, + blocks_s = p.blocks, + ) + else args = (dest, bc, us) threads = threads_via_occupancy(knl_copyto!, args) n_max_threads = min(threads, get_N(us)) @@ -39,45 +47,9 @@ if VERSION ≥ v"1.11.0-beta" blocks_s = p.blocks, ) end - call_post_op_callback() && post_op_callback(dest, dest, bc, to) - return dest - end -else - function Base.copyto!(dest::AbstractData, bc, to::ToCUDA) - (_, _, Nv, _, Nh) = DataLayouts.universal_size(dest) - us = DataLayouts.UniversalSize(dest) - if Nv > 0 && Nh > 0 - if DataLayouts.has_uniform_datalayouts(bc) && - dest isa DataLayouts.EndsWithField - bc′ = Base.Broadcast.instantiate( - DataLayouts.to_non_extruded_broadcasted(bc), - ) - args = (dest, bc′, us) - threads = threads_via_occupancy(knl_copyto_linear!, args) - n_max_threads = min(threads, get_N(us)) - p = linear_partition(prod(size(dest)), n_max_threads) - auto_launch!( - knl_copyto_linear!, - args; - threads_s = p.threads, - blocks_s = p.blocks, - ) - else - args = (dest, bc, us) - threads = threads_via_occupancy(knl_copyto!, args) - n_max_threads = min(threads, get_N(us)) - p = partition(dest, n_max_threads) - auto_launch!( - knl_copyto!, - args; - threads_s = p.threads, - blocks_s = p.blocks, - ) - end - end - call_post_op_callback() && post_op_callback(dest, dest, bc, to) - return dest end + call_post_op_callback() && post_op_callback(dest, dest, bc, to) + return dest end # broadcasting scalar assignment diff --git a/ext/cuda/data_layouts_fill.jl b/ext/cuda/data_layouts_fill.jl index 92abf97088..f721ec49ff 100644 --- a/ext/cuda/data_layouts_fill.jl +++ b/ext/cuda/data_layouts_fill.jl @@ -19,7 +19,7 @@ function Base.fill!(dest::AbstractData, bc, to::ToCUDA) us = DataLayouts.UniversalSize(dest) args = (dest, bc, us) if Nv > 0 && Nh > 0 - if !(VERSION ≥ v"1.11.0-beta") && dest isa DataLayouts.EndsWithField + if dest isa DataLayouts.EndsWithField threads = threads_via_occupancy(knl_fill_linear!, args) n_max_threads = min(threads, get_N(us)) p = linear_partition(prod(size(dest)), n_max_threads) diff --git a/ext/cuda/data_layouts_fused_copyto.jl b/ext/cuda/data_layouts_fused_copyto.jl index 9ef9b30432..4c898e2653 100644 --- a/ext/cuda/data_layouts_fused_copyto.jl +++ b/ext/cuda/data_layouts_fused_copyto.jl @@ -120,8 +120,7 @@ function launch_fused_copyto!(fmb::FusedMultiBroadcast) destinations = map(p -> p.first, fmb.pairs) bcs = map(p -> p.second, fmb.pairs) if all(bc -> DataLayouts.has_uniform_datalayouts(bc), bcs) && - all(d -> d isa DataLayouts.EndsWithField, destinations) && - !(VERSION ≥ v"1.11.0-beta") + all(d -> d isa DataLayouts.EndsWithField, destinations) pairs′ = map(fmb.pairs) do p bc′ = DataLayouts.to_non_extruded_broadcasted(p.second) Pair(p.first, Base.Broadcast.instantiate(bc′)) diff --git a/lib/ClimaCoreMakie/examples/Manifest.toml b/lib/ClimaCoreMakie/examples/Manifest.toml index 7394f4713f..6b490f4846 100644 --- a/lib/ClimaCoreMakie/examples/Manifest.toml +++ b/lib/ClimaCoreMakie/examples/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.11.2" manifest_format = "2.0" project_hash = "d088a1372f5f159971622e9e73fad4fdf04746c7" @@ -74,7 +74,7 @@ version = "0.4.2" [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -version = "1.1.1" +version = "1.1.2" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra"] @@ -120,6 +120,7 @@ weakdeps = ["SparseArrays"] [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.11.0" [[deps.Automa]] deps = ["PrecompileTools", "SIMD", "TranscodingStreams"] @@ -151,6 +152,7 @@ weakdeps = ["SparseArrays"] [[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +version = "1.11.0" [[deps.BitFlags]] git-tree-sha1 = "0691e34b3bb8be9307330f88d1a3c3f25466c24d" @@ -186,6 +188,7 @@ version = "0.5.0" [[deps.CRC32c]] uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc" +version = "1.11.0" [[deps.CRlibm_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -372,6 +375,7 @@ version = "1.0.0" [[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +version = "1.11.0" [[deps.Dbus_jll]] deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl"] @@ -406,6 +410,7 @@ version = "1.15.1" [[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" +version = "1.11.0" [[deps.Distributions]] deps = ["AliasTables", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsAPI", "StatsBase", "StatsFuns"] @@ -487,9 +492,9 @@ version = "6.1.2+0" [[deps.FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "4820348781ae578893311153d69049a93d05f39d" +git-tree-sha1 = "7de7c78d681078f027389e067864a8d53bd7c3c9" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.8.0" +version = "1.8.1" [[deps.FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -526,6 +531,7 @@ weakdeps = ["Mmap", "Test"] [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" +version = "1.11.0" [[deps.FillArrays]] deps = ["LinearAlgebra"] @@ -765,9 +771,9 @@ version = "2.11.2+3" [[deps.HypergeometricFunctions]] deps = ["LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"] -git-tree-sha1 = "b1c2585431c382e3fe5805874bda6aea90a95de9" +git-tree-sha1 = "2bd56245074fab4015b9174f24ceba8293209053" uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a" -version = "0.3.25" +version = "0.3.27" [[deps.Hyperscript]] deps = ["Test"] @@ -829,13 +835,14 @@ version = "0.1.5" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] -git-tree-sha1 = "10bd689145d2c3b2a9844005d01087cc1194e79e" +git-tree-sha1 = "0f14a5456bdc6b9731a5682f439a672750a09e48" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.2.1+0" +version = "2025.0.4+0" [[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +version = "1.11.0" [[deps.Interpolations]] deps = ["Adapt", "AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] @@ -992,6 +999,7 @@ version = "1.4.0" [[deps.LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" +version = "1.11.0" [[deps.LazyModules]] git-tree-sha1 = "a560dd966b386ac9ae60bdd3a3d3a326062d3c3e" @@ -1006,16 +1014,17 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.4.0+0" +version = "8.6.0+0" [[deps.LibGit2]] deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.6.4+0" +version = "1.7.2+0" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] @@ -1024,6 +1033,7 @@ version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +version = "1.11.0" [[deps.Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1076,6 +1086,7 @@ version = "2.40.3+0" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +version = "1.11.0" [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] @@ -1095,6 +1106,7 @@ version = "0.3.29" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +version = "1.11.0" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] @@ -1104,9 +1116,9 @@ version = "1.1.0" [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] -git-tree-sha1 = "f046ccd0c6db2832a9f639e2c669c6fe867e5f4f" +git-tree-sha1 = "5de60bc6cb3899cd318d80d627560fae2e2d99ae" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.2.0+0" +version = "2025.0.1+1" [[deps.MPICH_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] @@ -1151,6 +1163,7 @@ version = "0.4.2" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +version = "1.11.0" [[deps.MathTeXEngine]] deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"] @@ -1167,7 +1180,7 @@ version = "1.1.9" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.2+1" +version = "2.28.6+0" [[deps.MeshIO]] deps = ["ColorTypes", "FileIO", "GeometryBasics", "Printf"] @@ -1189,6 +1202,7 @@ version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +version = "1.11.0" [[deps.ModernGL]] deps = ["Libdl"] @@ -1204,7 +1218,7 @@ version = "0.3.4" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2023.1.10" +version = "2023.12.12" [[deps.MsgPack]] deps = ["Serialization"] @@ -1238,9 +1252,9 @@ version = "3.1.0+2" [[deps.NaNMath]] deps = ["OpenLibm_jll"] -git-tree-sha1 = "030ea22804ef91648f29b7ad3fc15fa49d0e6e71" +git-tree-sha1 = "fe891aea7ccd23897520db7f16931212454e277e" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "1.0.3" +version = "1.1.1" [[deps.NaturalEarth]] deps = ["Downloads", "GeoJSON", "Pkg", "Scratch"] @@ -1281,7 +1295,7 @@ version = "1.3.5+1" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.23+4" +version = "0.3.27+1" [[deps.OpenEXR]] deps = ["Colors", "FileIO", "OpenEXR_jll"] @@ -1395,9 +1409,13 @@ uuid = "30392449-352a-5448-841d-b1acce4e97dc" version = "0.43.4+0" [[deps.Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.10.0" +version = "1.11.0" +weakdeps = ["REPL"] + + [deps.Pkg.extensions] + REPLExt = "REPL" [[deps.PkgVersion]] deps = ["Pkg"] @@ -1431,6 +1449,7 @@ version = "1.4.3" [[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +version = "1.11.0" [[deps.ProgressMeter]] deps = ["Distributed", "Printf"] @@ -1468,12 +1487,14 @@ version = "2.11.1" Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" [[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +version = "1.11.0" [[deps.Random]] deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +version = "1.11.0" [[deps.RangeArrays]] git-tree-sha1 = "b9039e93773ddcfc828f12aadf7115b4b4d225f5" @@ -1594,6 +1615,7 @@ version = "1.2.1" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +version = "1.11.0" [[deps.ShaderAbstractions]] deps = ["ColorTypes", "FixedPointNumbers", "GeometryBasics", "LinearAlgebra", "Observables", "StaticArrays", "StructArrays", "Tables"] @@ -1604,6 +1626,7 @@ version = "0.4.1" [[deps.SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" +version = "1.11.0" [[deps.Showoff]] deps = ["Dates", "Grisu"] @@ -1636,6 +1659,7 @@ version = "0.1.3" [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +version = "1.11.0" [[deps.SoftGlobalScope]] deps = ["REPL"] @@ -1658,7 +1682,7 @@ version = "1.2.1" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -version = "1.10.0" +version = "1.11.0" [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] @@ -1699,9 +1723,14 @@ uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" version = "1.4.3" [[deps.Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] +deps = ["LinearAlgebra"] +git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -version = "1.10.0" +version = "1.11.1" +weakdeps = ["SparseArrays"] + + [deps.Statistics.extensions] + SparseArraysExt = ["SparseArrays"] [[deps.StatsAPI]] deps = ["LinearAlgebra"] @@ -1753,6 +1782,10 @@ git-tree-sha1 = "159331b30e94d7b11379037feeb9b690950cace8" uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" version = "1.11.0" +[[deps.StyledStrings]] +uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b" +version = "1.11.0" + [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" @@ -1760,7 +1793,7 @@ uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" [[deps.SuiteSparse_jll]] deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.2.1+1" +version = "7.7.0+0" [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] @@ -1805,6 +1838,7 @@ version = "0.1.1" [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +version = "1.11.0" [[deps.ThreadPools]] deps = ["Printf", "RecipesBase", "Statistics"] @@ -1836,9 +1870,11 @@ version = "1.5.1" [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" +version = "1.11.0" [[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +version = "1.11.0" [[deps.UnicodeFun]] deps = ["REPL"] @@ -2121,7 +2157,7 @@ version = "1.5.0+0" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.52.0+1" +version = "1.59.0+0" [[deps.oneTBB_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] diff --git a/perf/Project.toml b/perf/Project.toml index 62e7431a24..2bc6ccb9ad 100644 --- a/perf/Project.toml +++ b/perf/Project.toml @@ -38,4 +38,4 @@ URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" [compat] Plots = "1" SciMLBase = "1, 2" -SnoopCompileCore = "2" +SnoopCompileCore = "2, 3" diff --git a/src/DataLayouts/DataLayouts.jl b/src/DataLayouts/DataLayouts.jl index 9c1682ea57..8ea2ec2d92 100644 --- a/src/DataLayouts/DataLayouts.jl +++ b/src/DataLayouts/DataLayouts.jl @@ -2052,88 +2052,23 @@ end const EndsWithField{S} = Union{IJHF{S}, IHF{S}, IJF{S}, IF{S}, VF{S}, VIJHF{S}, VIHF{S}} -if VERSION ≥ v"1.11.0-beta" - ### --------------- Support for multi-dimensional indexing - # TODO: can we remove this? It's not needed for Julia 1.10, - # but seems needed in Julia 1.11. - @inline Base.getindex( - data::Union{ - IJF, - IJFH, - IJHF, - IFH, - IHF, - VIJFH, - VIJHF, - VIFH, - VIHF, - VF, - IF, - }, - I::Vararg{Int, N}, - ) where {N} = Base.getindex( - data, - CartesianIndex(to_universal_index(singleton(data), I)), - ) - - @inline Base.setindex!( - data::Union{ - IJF, - IJFH, - IJHF, - IFH, - IHF, - VIJFH, - VIJHF, - VIFH, - VIHF, - VF, - IF, - }, - val, - I::Vararg{Int, N}, - ) where {N} = Base.setindex!( - data, - val, - CartesianIndex(to_universal_index(singleton(data), I)), - ) - - # Certain datalayouts support special indexing. - # Like VF datalayouts with `getindex(::VF, v::Integer)` - #! format: off - @inline to_universal_index(::VFSingleton, I::NTuple{1, T}) where {T} = (T(1), T(1), T(1), I[1], T(1)) - @inline to_universal_index(::IFSingleton, I::NTuple{1, T}) where {T} = (I[1], T(1), T(1), T(1), T(1)) - @inline to_universal_index(::IFSingleton, I::NTuple{2, T}) where {T} = (I[1], T(1), T(1), T(1), T(1)) - @inline to_universal_index(::IFSingleton, I::NTuple{3, T}) where {T} = (I[1], T(1), T(1), T(1), T(1)) - @inline to_universal_index(::IFSingleton, I::NTuple{4, T}) where {T} = (I[1], T(1), T(1), T(1), T(1)) - @inline to_universal_index(::IFSingleton, I::NTuple{5, T}) where {T} = (I[1], T(1), T(1), T(1), T(1)) - @inline to_universal_index(::IJFSingleton, I::NTuple{2, T}) where {T} = (I[1], I[2], T(1), T(1), T(1)) - @inline to_universal_index(::IJFSingleton, I::NTuple{3, T}) where {T} = (I[1], I[2], T(1), T(1), T(1)) - @inline to_universal_index(::IJFSingleton, I::NTuple{4, T}) where {T} = (I[1], I[2], T(1), T(1), T(1)) - @inline to_universal_index(::IJFSingleton, I::NTuple{5, T}) where {T} = (I[1], I[2], T(1), T(1), T(1)) - @inline to_universal_index(::AbstractDataSingleton, I::NTuple{5}) = I - #! format: on - ### --------------- -else - # Only support datalayouts that end with fields, since those - # are the only layouts where we can efficiently compute the - # strides. - @propagate_inbounds function Base.getindex( - data::EndsWithField{S}, - I::Integer, - ) where {S} - s_array = farray_size(data) - @inbounds get_struct_linear(parent(data), S, I, s_array) - end - @propagate_inbounds function Base.setindex!( - data::EndsWithField{S}, - val, - I::Integer, - ) where {S} - s_array = farray_size(data) - @inbounds set_struct_linear!(parent(data), convert(S, val), I, s_array) - end - +# Only support datalayouts that end with fields, since those +# are the only layouts where we can efficiently compute the +# strides. +@propagate_inbounds function Base.getindex( + data::EndsWithField{S}, + I::Integer, +) where {S} + s_array = farray_size(data) + @inbounds get_struct_linear(parent(data), S, I, s_array) +end +@propagate_inbounds function Base.setindex!( + data::EndsWithField{S}, + val, + I::Integer, +) where {S} + s_array = farray_size(data) + @inbounds set_struct_linear!(parent(data), convert(S, val), I, s_array) end """ diff --git a/src/DataLayouts/copyto.jl b/src/DataLayouts/copyto.jl index 3a2b9242ae..0ff6e4302b 100644 --- a/src/DataLayouts/copyto.jl +++ b/src/DataLayouts/copyto.jl @@ -1,43 +1,25 @@ ##### ##### Dispatching and edge cases ##### -if VERSION ≥ v"1.11.0-beta" - # https://github.com/JuliaLang/julia/issues/56295 - # Julia 1.11's Base.Broadcast currently requires - # multiple integer indexing, wheras Julia 1.10 did not. - # This means that we cannot reserve linear indexing to - # special-case fixes for https://github.com/JuliaLang/julia/issues/28126 - # (including the GPU-variant related issue resolution efforts: - # JuliaGPU/GPUArrays.jl#454, JuliaGPU/GPUArrays.jl#464). - function Base.copyto!( - dest::AbstractData{S}, - bc::Union{AbstractData, Base.Broadcast.Broadcasted}, - ) where {S} - Base.copyto!(dest, bc, device_dispatch(parent(dest))) - call_post_op_callback() && post_op_callback(dest, dest, bc) - dest - end -else - function Base.copyto!( - dest::AbstractData{S}, - bc::Union{AbstractData, Base.Broadcast.Broadcasted}, - ) where {S} - dev = device_dispatch(parent(dest)) - if dev isa ToCPU && - has_uniform_datalayouts(bc) && - dest isa EndsWithField && - !(dest isa DataF) - # Specialize on linear indexing when possible: - bc′ = Base.Broadcast.instantiate(to_non_extruded_broadcasted(bc)) - @inbounds @simd for I in 1:get_N(UniversalSize(dest)) - dest[I] = convert(S, bc′[I]) - end - else - Base.copyto!(dest, bc, device_dispatch(parent(dest))) +function Base.copyto!( + dest::AbstractData{S}, + bc::Union{AbstractData, Base.Broadcast.Broadcasted}, +) where {S} + dev = device_dispatch(parent(dest)) + if dev isa ToCPU && + has_uniform_datalayouts(bc) && + dest isa EndsWithField && + !(dest isa DataF) + # Specialize on linear indexing when possible: + bc′ = Base.Broadcast.instantiate(to_non_extruded_broadcasted(bc)) + @inbounds @simd for I in 1:get_N(UniversalSize(dest)) + dest[I] = convert(S, bc′[I]) end - call_post_op_callback() && post_op_callback(dest, dest, bc) - return dest + else + Base.copyto!(dest, bc, device_dispatch(parent(dest))) end + call_post_op_callback() && post_op_callback(dest, dest, bc) + return dest end # Specialize on non-Broadcasted objects diff --git a/src/DataLayouts/fill.jl b/src/DataLayouts/fill.jl index 5c729fe577..f57235f452 100644 --- a/src/DataLayouts/fill.jl +++ b/src/DataLayouts/fill.jl @@ -1,8 +1,6 @@ function Base.fill!(dest::AbstractData, val) dev = device_dispatch(parent(dest)) - if !(VERSION ≥ v"1.11.0-beta") && - dest isa EndsWithField && - dev isa ClimaComms.AbstractCPUDevice + if dest isa EndsWithField && dev isa ClimaComms.AbstractCPUDevice @inbounds @simd for I in 1:get_N(UniversalSize(dest)) dest[I] = val end diff --git a/src/DataLayouts/fused_copyto.jl b/src/DataLayouts/fused_copyto.jl index 13fcaa7f28..4c60ba5976 100644 --- a/src/DataLayouts/fused_copyto.jl +++ b/src/DataLayouts/fused_copyto.jl @@ -52,8 +52,7 @@ function Base.copyto!( dev = device_dispatch(parent(dest1)) if dev isa ClimaComms.AbstractCPUDevice && all(bc -> has_uniform_datalayouts(bc), bcs) && - all(d -> d isa EndsWithField, destinations) && - !(VERSION ≥ v"1.11.0-beta") + all(d -> d isa EndsWithField, destinations) pairs′ = map(fmb_inst.pairs) do p bc′ = to_non_extruded_broadcasted(p.second) Pair(p.first, bc′)