Skip to content

Commit 0b617ad

Browse files
Merge #1261
1261: Conditionally overload Krylov.ktypeof r=charleskawczynski a=charleskawczynski This PR conditionally overloads `Krylov.ktypeof` using Requires. This is added here to avoid type piracy in ClimaAtmos. Alternatively to this PR, we could wait until we upgrade to Julia 1.9 and use package extensions. Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>
2 parents cc958cc + 948729b commit 0b617ad

File tree

8 files changed

+485
-397
lines changed

8 files changed

+485
-397
lines changed

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
2121
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
2222
PkgVersion = "eebad327-c553-4316-9ea0-9fa01ccd7688"
2323
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
24+
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2425
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
2526
Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
2627
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

benchmarks/bickleyjet/Manifest.toml

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
julia_version = "1.8.5"
44
manifest_format = "2.0"
5-
project_hash = "2b1751ff832859a4a7e7a2eb2c5c9cb339ac5238"
5+
project_hash = "08c83b032e138c0186ad354ce66e1930ea00b8ee"
6+
7+
[[deps.ADTypes]]
8+
git-tree-sha1 = "dcfdf328328f2645531c4ddebf841228aef74130"
9+
uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
10+
version = "0.1.3"
611

712
[[deps.AbstractFFTs]]
813
deps = ["ChainRulesCore", "LinearAlgebra"]
@@ -22,9 +27,9 @@ version = "1.1.1"
2227

2328
[[deps.ArrayInterface]]
2429
deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"]
25-
git-tree-sha1 = "917286faa2abb288796e75b88ca67edc016f3219"
30+
git-tree-sha1 = "d3f758863a47ceef2248d136657cb9c033603641"
2631
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
27-
version = "7.4.5"
32+
version = "7.4.8"
2833

2934
[[deps.ArrayLayouts]]
3035
deps = ["FillArrays", "LinearAlgebra", "SparseArrays"]
@@ -69,9 +74,9 @@ version = "0.1.5"
6974

7075
[[deps.BlockArrays]]
7176
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra"]
72-
git-tree-sha1 = "c7d7789c2c6ec98ec78ea5e017485549a95b051e"
77+
git-tree-sha1 = "14d688a2254ca2242d834176a385cc9b3bceeb02"
7378
uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
74-
version = "0.16.27"
79+
version = "0.16.28"
7580

7681
[[deps.Bzip2_jll]]
7782
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -85,16 +90,16 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
8590
version = "0.4.2"
8691

8792
[[deps.CPUSummary]]
88-
deps = ["CpuId", "IfElse", "Static"]
89-
git-tree-sha1 = "2c144ddb46b552f72d7eafe7cc2f50746e41ea21"
93+
deps = ["CpuId", "IfElse", "PrecompileTools", "Static"]
94+
git-tree-sha1 = "89e0654ed8c7aebad6d5ad235d6242c2d737a928"
9095
uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
91-
version = "0.2.2"
96+
version = "0.2.3"
9297

9398
[[deps.CUDA]]
9499
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "CompilerSupportLibraries_jll", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Preferences", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "UnsafeAtomicsLLVM"]
95-
git-tree-sha1 = "280893f920654ebfaaaa1999fbd975689051f890"
100+
git-tree-sha1 = "beb01266a709235d8d9be1382d695a25f0b75bd3"
96101
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
97-
version = "4.2.0"
102+
version = "4.3.0"
98103

99104
[[deps.CUDA_Driver_jll]]
100105
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"]
@@ -145,10 +150,10 @@ uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
145150
version = "0.4.2"
146151

147152
[[deps.ClimaCore]]
148-
deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "Rotations", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"]
153+
deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "Rotations", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"]
149154
path = "../.."
150155
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
151-
version = "0.10.33"
156+
version = "0.10.36"
152157

153158
[[deps.CloseOpenIntervals]]
154159
deps = ["Static", "StaticArrayInterface"]
@@ -291,9 +296,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
291296

292297
[[deps.Distributions]]
293298
deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsAPI", "StatsBase", "StatsFuns", "Test"]
294-
git-tree-sha1 = "5eeb2bd01e5065090ad591a205d8cad432ae6cb6"
299+
git-tree-sha1 = "c72970914c8a21b36bbc244e9df0ed1834a0360b"
295300
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
296-
version = "0.25.93"
301+
version = "0.25.95"
297302

298303
[[deps.DocStringExtensions]]
299304
deps = ["LibGit2"]
@@ -368,9 +373,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
368373

369374
[[deps.FillArrays]]
370375
deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"]
371-
git-tree-sha1 = "3cce72ec679a5e8e6a84ff09dd03b721de420cfe"
376+
git-tree-sha1 = "ed569cb9e7e3590d5ba884da7edc50216aac5811"
372377
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
373-
version = "1.0.1"
378+
version = "1.1.0"
374379

375380
[[deps.FixedPointNumbers]]
376381
deps = ["Statistics"]
@@ -443,21 +448,21 @@ version = "0.1.4"
443448

444449
[[deps.GPUCompiler]]
445450
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"]
446-
git-tree-sha1 = "5737dc242dadd392d934ee330c69ceff47f0259c"
451+
git-tree-sha1 = "11b2d77f29a85f3649c273a38f6618121c6b1c51"
447452
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
448-
version = "0.19.4"
453+
version = "0.20.2"
449454

450455
[[deps.GR]]
451456
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"]
452-
git-tree-sha1 = "efaac003187ccc71ace6c755b197284cd4811bfe"
457+
git-tree-sha1 = "8b8a2fd4536ece6e554168c21860b6820a8a83db"
453458
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
454-
version = "0.72.4"
459+
version = "0.72.7"
455460

456461
[[deps.GR_jll]]
457462
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt5Base_jll", "Zlib_jll", "libpng_jll"]
458-
git-tree-sha1 = "4486ff47de4c18cb511a0da420efebb314556316"
463+
git-tree-sha1 = "19fad9cd9ae44847fe842558a744748084a722d1"
459464
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
460-
version = "0.72.4+0"
465+
version = "0.72.7+0"
461466

462467
[[deps.GaussQuadrature]]
463468
deps = ["SpecialFunctions"]
@@ -495,9 +500,9 @@ version = "1.0.2"
495500

496501
[[deps.HDF5]]
497502
deps = ["Compat", "HDF5_jll", "Libdl", "Mmap", "Random", "Requires", "UUIDs"]
498-
git-tree-sha1 = "3dab31542b3da9f25a6a1d11159d4af8fdce7d67"
503+
git-tree-sha1 = "c73fdc3d9da7700691848b78c61841274076932a"
499504
uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
500-
version = "0.16.14"
505+
version = "0.16.15"
501506

502507
[[deps.HDF5_jll]]
503508
deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"]
@@ -507,9 +512,9 @@ version = "1.12.2+2"
507512

508513
[[deps.HTTP]]
509514
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
510-
git-tree-sha1 = "41f7dfb2b20e7e8bf64f6b6fae98f4d2df027b06"
515+
git-tree-sha1 = "5e77dbf117412d4f164a464d610ee6050cc75272"
511516
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
512-
version = "1.9.4"
517+
version = "1.9.6"
513518

514519
[[deps.HarfBuzz_jll]]
515520
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
@@ -940,10 +945,10 @@ uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043"
940945
version = "1.3.5"
941946

942947
[[deps.Plots]]
943-
deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Preferences", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"]
944-
git-tree-sha1 = "6c7f47fd112001fc95ea1569c2757dffd9e81328"
948+
deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Preferences", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"]
949+
git-tree-sha1 = "ad59edfb711a4751e0b8271454df47f84a47a29e"
945950
uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
946-
version = "1.38.11"
951+
version = "1.38.14"
947952

948953
[[deps.Polyester]]
949954
deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"]
@@ -1094,9 +1099,9 @@ version = "1.5.1"
10941099

10951100
[[deps.RuntimeGeneratedFunctions]]
10961101
deps = ["ExprTools", "SHA", "Serialization"]
1097-
git-tree-sha1 = "d7d9ebe28062161c1e314ed643097b0c6fe657d9"
1102+
git-tree-sha1 = "0b9b18d6236e9ab2b092defaacdffd929d572642"
10981103
uuid = "7e49a35a-f44a-4d26-94aa-eba1b4ca6b47"
1099-
version = "0.5.7"
1104+
version = "0.5.9"
11001105

11011106
[[deps.SHA]]
11021107
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -1108,16 +1113,16 @@ uuid = "94e857df-77ce-4151-89e5-788b33177be4"
11081113
version = "0.1.0"
11091114

11101115
[[deps.SciMLBase]]
1111-
deps = ["ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"]
1112-
git-tree-sha1 = "e803672f8d58e9937f59923dd3b159c9b7e1838b"
1116+
deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"]
1117+
git-tree-sha1 = "75552338dda481baeb9b9e171f73ecd0171e8f34"
11131118
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1114-
version = "1.92.0"
1119+
version = "1.92.2"
11151120

11161121
[[deps.SciMLOperators]]
11171122
deps = ["ArrayInterface", "DocStringExtensions", "Lazy", "LinearAlgebra", "Setfield", "SparseArrays", "StaticArraysCore", "Tricks"]
1118-
git-tree-sha1 = "90163ebc767cba9f126ea00aeef1d75ed74fe7b0"
1123+
git-tree-sha1 = "d23f7a1c3b0a79bc6ed1b6d0d132636e1861362c"
11191124
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
1120-
version = "0.2.8"
1125+
version = "0.2.10"
11211126

11221127
[[deps.Scratch]]
11231128
deps = ["Dates"]
@@ -1205,9 +1210,9 @@ version = "1.6.0"
12051210

12061211
[[deps.StatsBase]]
12071212
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
1208-
git-tree-sha1 = "d1bf48bfcc554a3761a133fe3a9bb01488e06916"
1213+
git-tree-sha1 = "75ebe04c5bed70b91614d684259b661c9e6274a4"
12091214
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1210-
version = "0.33.21"
1215+
version = "0.34.0"
12111216

12121217
[[deps.StatsFuns]]
12131218
deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
@@ -1321,6 +1326,18 @@ git-tree-sha1 = "53915e50200959667e78a92a418594b428dffddf"
13211326
uuid = "1cfade01-22cf-5700-b092-accc4b62d6e1"
13221327
version = "0.4.1"
13231328

1329+
[[deps.Unitful]]
1330+
deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"]
1331+
git-tree-sha1 = "ba4aa36b2d5c98d6ed1f149da916b3ba46527b2b"
1332+
uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
1333+
version = "1.14.0"
1334+
1335+
[[deps.UnitfulLatexify]]
1336+
deps = ["LaTeXStrings", "Latexify", "Unitful"]
1337+
git-tree-sha1 = "e2d817cc500e960fdbafcf988ac8436ba3208bfd"
1338+
uuid = "45397f5d-5981-4c77-b2b3-fc36d6e9b728"
1339+
version = "1.6.3"
1340+
13241341
[[deps.UnsafeAtomics]]
13251342
git-tree-sha1 = "6331ac3440856ea1988316b46045303bef658278"
13261343
uuid = "013be700-e6cd-48c3-b4a1-df204f14c38f"

0 commit comments

Comments
 (0)