From 331179ac1b5dc81abb39f8c2431d30ea97c1805a Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Tue, 24 Oct 2023 07:52:15 -0700 Subject: [PATCH 1/2] Update dependencies --- Project.toml | 2 +- docs/Manifest.toml | 42 +++++++++++++++++++++--------------------- examples/Manifest.toml | 42 +++++++++++++++++++++--------------------- perf/Manifest.toml | 42 +++++++++++++++++++++--------------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Project.toml b/Project.toml index 947088c54f..99ab5822ed 100644 --- a/Project.toml +++ b/Project.toml @@ -56,7 +56,7 @@ AtmosphericProfilesLibrary = "0.1" CLIMAParameters = "0.7.24" CUDA = "4" ClimaComms = "0.5.5" -ClimaCore = "0.10.53" +ClimaCore = "0.10.55" ClimaTimeSteppers = "0.7.14" CloudMicrophysics = "0.14.0" Colors = "0.12" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index e0b3b0a158..e05deb473f 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -38,9 +38,9 @@ version = "0.4.4" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "76289dc51920fdc6e0013c872ba9551d54961c24" +git-tree-sha1 = "68c4c187a232e7abe00ac29e3b03e09af9d77317" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.6.2" +version = "3.7.0" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] @@ -264,9 +264,9 @@ version = "0.5.5" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"] -git-tree-sha1 = "8174265fe74081f378b11e36962c3b9cbb11c44f" +git-tree-sha1 = "4a5138604b65cfa2d30b90ddf5252106874940c3" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.10.54" +version = "0.10.55" [[deps.ClimaTimeSteppers]] deps = ["CUDA", "ClimaComms", "Colors", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"] @@ -516,9 +516,9 @@ version = "0.9.3" [[deps.Documenter]] deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "Dates", "DocStringExtensions", "Downloads", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "Test", "Unicode"] -git-tree-sha1 = "147a3cbb6ddcd9448fe5e6c426b347efc68f9c86" +git-tree-sha1 = "662fb21ae7fad33e044c2b59ece832fdce32c171" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "1.1.1" +version = "1.1.2" [[deps.DocumenterCitations]] deps = ["AbstractTrees", "Bibliography", "Documenter", "Markdown", "MarkdownAST", "OrderedCollections", "Unicode"] @@ -805,9 +805,9 @@ version = "0.14.7" [[deps.IntervalSets]] deps = ["Dates", "Random"] -git-tree-sha1 = "8e59ea773deee525c99a8018409f64f19fb719e6" +git-tree-sha1 = "3d8866c029dd6b16e69e0d4a939c4dfcb98fac47" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.7" +version = "0.7.8" weakdeps = ["Statistics"] [deps.IntervalSets.extensions] @@ -824,10 +824,10 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[deps.JLD2]] -deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "572d024660119ee626938419c14db0db5f3f3283" +deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] +git-tree-sha1 = "ebec83429b5dea3857e071d927156207ebd6d617" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.36" +version = "0.4.37" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] @@ -988,9 +988,9 @@ version = "2.5.2" [[deps.LinearSolve]] deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "EnzymeCore", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "SuiteSparse", "UnPack"] -git-tree-sha1 = "31353ba539d14a342908f765407abffd8db5f3c7" +git-tree-sha1 = "158e45dd35cec1ecade0e554c0104ee89e772d82" uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" -version = "2.11.0" +version = "2.11.1" [deps.LinearSolve.extensions] LinearSolveBandedMatricesExt = "BandedMatrices" @@ -1195,9 +1195,9 @@ version = "1.2.0" [[deps.NonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "EnumX", "FiniteDiff", "ForwardDiff", "LineSearches", "LinearAlgebra", "LinearSolve", "PrecompileTools", "RecursiveArrayTools", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "SparseArrays", "SparseDiffTools", "StaticArraysCore", "UnPack"] -git-tree-sha1 = "ee92770e0832314ccd424d83a0ab4c75fc6dc91f" +git-tree-sha1 = "9203b3333c9610664de2e8cbc23cfd726663df7d" uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "2.3.0" +version = "2.4.0" [deps.NonlinearSolve.extensions] NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt" @@ -1481,9 +1481,9 @@ version = "0.6.39" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "ChainRulesCore", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces", "ZygoteRules"] -git-tree-sha1 = "6134c8970f82f23c43d3580d79c3e47acf232083" +git-tree-sha1 = "151c322c309d879d114d1c0bee69c61d5933357f" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.4.1" +version = "2.4.3" [deps.SciMLBase.extensions] SciMLBasePyCallExt = "PyCall" @@ -1530,9 +1530,9 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[deps.SimpleNonlinearSolve]] deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PackageExtensionCompat", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "e308d089f5d0e733a017b61784c5813e672f760d" +git-tree-sha1 = "15ff97fa4881133caa324dacafe28b5ac47ad8a2" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.22" +version = "0.1.23" [deps.SimpleNonlinearSolve.extensions] SimpleNonlinearSolveNNlibExt = "NNlib" @@ -1729,9 +1729,9 @@ version = "1.0.1" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits"] -git-tree-sha1 = "a1f34829d5ac0ef499f6d84428bd6b4c71f02ead" +git-tree-sha1 = "cb76cf677714c095e535e3501ac7954732aeea2d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.11.0" +version = "1.11.1" [[deps.Tar]] deps = ["ArgTools", "SHA"] diff --git a/examples/Manifest.toml b/examples/Manifest.toml index 980a4f992e..61fa358f61 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -38,9 +38,9 @@ version = "0.4.4" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "76289dc51920fdc6e0013c872ba9551d54961c24" +git-tree-sha1 = "68c4c187a232e7abe00ac29e3b03e09af9d77317" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.6.2" +version = "3.7.0" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] @@ -303,9 +303,9 @@ version = "0.5.5" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"] -git-tree-sha1 = "8174265fe74081f378b11e36962c3b9cbb11c44f" +git-tree-sha1 = "4a5138604b65cfa2d30b90ddf5252106874940c3" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.10.54" +version = "0.10.55" [[deps.ClimaCoreMakie]] deps = ["ClimaCore", "Makie"] @@ -1102,9 +1102,9 @@ version = "0.20.9" [[deps.IntervalSets]] deps = ["Dates", "Random"] -git-tree-sha1 = "8e59ea773deee525c99a8018409f64f19fb719e6" +git-tree-sha1 = "3d8866c029dd6b16e69e0d4a939c4dfcb98fac47" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.7" +version = "0.7.8" weakdeps = ["Statistics"] [deps.IntervalSets.extensions] @@ -1138,10 +1138,10 @@ uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" version = "0.8.15" [[deps.JLD2]] -deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "572d024660119ee626938419c14db0db5f3f3283" +deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] +git-tree-sha1 = "ebec83429b5dea3857e071d927156207ebd6d617" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.36" +version = "0.4.37" [[deps.JLFzf]] deps = ["Pipe", "REPL", "Random", "fzf_jll"] @@ -1406,9 +1406,9 @@ version = "2.5.2" [[deps.LinearSolve]] deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "EnzymeCore", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "SuiteSparse", "UnPack"] -git-tree-sha1 = "31353ba539d14a342908f765407abffd8db5f3c7" +git-tree-sha1 = "158e45dd35cec1ecade0e554c0104ee89e772d82" uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" -version = "2.11.0" +version = "2.11.1" [deps.LinearSolve.extensions] LinearSolveBandedMatricesExt = "BandedMatrices" @@ -1675,9 +1675,9 @@ version = "1.2.0" [[deps.NonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "EnumX", "FiniteDiff", "ForwardDiff", "LineSearches", "LinearAlgebra", "LinearSolve", "PrecompileTools", "RecursiveArrayTools", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "SparseArrays", "SparseDiffTools", "StaticArraysCore", "UnPack"] -git-tree-sha1 = "ee92770e0832314ccd424d83a0ab4c75fc6dc91f" +git-tree-sha1 = "9203b3333c9610664de2e8cbc23cfd726663df7d" uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "2.3.0" +version = "2.4.0" [deps.NonlinearSolve.extensions] NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt" @@ -2171,9 +2171,9 @@ version = "0.6.39" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "ChainRulesCore", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces", "ZygoteRules"] -git-tree-sha1 = "6134c8970f82f23c43d3580d79c3e47acf232083" +git-tree-sha1 = "151c322c309d879d114d1c0bee69c61d5933357f" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.4.1" +version = "2.4.3" [deps.SciMLBase.extensions] SciMLBasePyCallExt = "PyCall" @@ -2254,9 +2254,9 @@ version = "0.8.4" [[deps.SimpleNonlinearSolve]] deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PackageExtensionCompat", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "e308d089f5d0e733a017b61784c5813e672f760d" +git-tree-sha1 = "15ff97fa4881133caa324dacafe28b5ac47ad8a2" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.22" +version = "0.1.23" [deps.SimpleNonlinearSolve.extensions] SimpleNonlinearSolveNNlibExt = "NNlib" @@ -2352,9 +2352,9 @@ weakdeps = ["ChainRulesCore"] [[deps.StableHashTraits]] deps = ["Compat", "SHA", "Tables", "TupleTools"] -git-tree-sha1 = "19df33ca14f24a3ad2df9e89124bd5f5cc8467a2" +git-tree-sha1 = "30edbce1c797dc7d4c74bc07b2b6a57b891bead3" uuid = "c5dd0088-6c3f-4803-b00e-f31a60c170fa" -version = "1.0.1" +version = "1.1.0" [[deps.StackViews]] deps = ["OffsetArrays"] @@ -2483,9 +2483,9 @@ version = "1.0.1" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits"] -git-tree-sha1 = "a1f34829d5ac0ef499f6d84428bd6b4c71f02ead" +git-tree-sha1 = "cb76cf677714c095e535e3501ac7954732aeea2d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.11.0" +version = "1.11.1" [[deps.Tar]] deps = ["ArgTools", "SHA"] diff --git a/perf/Manifest.toml b/perf/Manifest.toml index 47404f500d..b28aaa44c6 100644 --- a/perf/Manifest.toml +++ b/perf/Manifest.toml @@ -38,9 +38,9 @@ version = "0.4.4" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "76289dc51920fdc6e0013c872ba9551d54961c24" +git-tree-sha1 = "68c4c187a232e7abe00ac29e3b03e09af9d77317" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.6.2" +version = "3.7.0" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] @@ -314,9 +314,9 @@ version = "0.5.5" [[deps.ClimaCore]] deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"] -git-tree-sha1 = "8174265fe74081f378b11e36962c3b9cbb11c44f" +git-tree-sha1 = "4a5138604b65cfa2d30b90ddf5252106874940c3" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.10.54" +version = "0.10.55" [[deps.ClimaCoreMakie]] deps = ["ClimaCore", "Makie"] @@ -1149,9 +1149,9 @@ version = "0.20.9" [[deps.IntervalSets]] deps = ["Dates", "Random"] -git-tree-sha1 = "8e59ea773deee525c99a8018409f64f19fb719e6" +git-tree-sha1 = "3d8866c029dd6b16e69e0d4a939c4dfcb98fac47" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.7.7" +version = "0.7.8" weakdeps = ["Statistics"] [deps.IntervalSets.extensions] @@ -1185,10 +1185,10 @@ uuid = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" version = "0.8.15" [[deps.JLD2]] -deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "572d024660119ee626938419c14db0db5f3f3283" +deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] +git-tree-sha1 = "ebec83429b5dea3857e071d927156207ebd6d617" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.36" +version = "0.4.37" [[deps.JLFzf]] deps = ["Pipe", "REPL", "Random", "fzf_jll"] @@ -1458,9 +1458,9 @@ version = "2.5.2" [[deps.LinearSolve]] deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "EnzymeCore", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "SuiteSparse", "UnPack"] -git-tree-sha1 = "31353ba539d14a342908f765407abffd8db5f3c7" +git-tree-sha1 = "158e45dd35cec1ecade0e554c0104ee89e772d82" uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" -version = "2.11.0" +version = "2.11.1" [deps.LinearSolve.extensions] LinearSolveBandedMatricesExt = "BandedMatrices" @@ -1721,9 +1721,9 @@ version = "1.2.0" [[deps.NonlinearSolve]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "DiffEqBase", "EnumX", "FiniteDiff", "ForwardDiff", "LineSearches", "LinearAlgebra", "LinearSolve", "PrecompileTools", "RecursiveArrayTools", "Reexport", "SciMLBase", "SimpleNonlinearSolve", "SparseArrays", "SparseDiffTools", "StaticArraysCore", "UnPack"] -git-tree-sha1 = "ee92770e0832314ccd424d83a0ab4c75fc6dc91f" +git-tree-sha1 = "9203b3333c9610664de2e8cbc23cfd726663df7d" uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec" -version = "2.3.0" +version = "2.4.0" [deps.NonlinearSolve.extensions] NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt" @@ -2241,9 +2241,9 @@ version = "0.6.39" [[deps.SciMLBase]] deps = ["ADTypes", "ArrayInterface", "ChainRulesCore", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces", "ZygoteRules"] -git-tree-sha1 = "6134c8970f82f23c43d3580d79c3e47acf232083" +git-tree-sha1 = "151c322c309d879d114d1c0bee69c61d5933357f" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.4.1" +version = "2.4.3" [deps.SciMLBase.extensions] SciMLBasePyCallExt = "PyCall" @@ -2324,9 +2324,9 @@ version = "0.8.4" [[deps.SimpleNonlinearSolve]] deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PackageExtensionCompat", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "e308d089f5d0e733a017b61784c5813e672f760d" +git-tree-sha1 = "15ff97fa4881133caa324dacafe28b5ac47ad8a2" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.22" +version = "0.1.23" [deps.SimpleNonlinearSolve.extensions] SimpleNonlinearSolveNNlibExt = "NNlib" @@ -2434,9 +2434,9 @@ weakdeps = ["ChainRulesCore"] [[deps.StableHashTraits]] deps = ["Compat", "SHA", "Tables", "TupleTools"] -git-tree-sha1 = "19df33ca14f24a3ad2df9e89124bd5f5cc8467a2" +git-tree-sha1 = "30edbce1c797dc7d4c74bc07b2b6a57b891bead3" uuid = "c5dd0088-6c3f-4803-b00e-f31a60c170fa" -version = "1.0.1" +version = "1.1.0" [[deps.StackViews]] deps = ["OffsetArrays"] @@ -2565,9 +2565,9 @@ version = "1.0.1" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits"] -git-tree-sha1 = "a1f34829d5ac0ef499f6d84428bd6b4c71f02ead" +git-tree-sha1 = "cb76cf677714c095e535e3501ac7954732aeea2d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.11.0" +version = "1.11.1" [[deps.Tar]] deps = ["ArgTools", "SHA"] From 40f483f1e7e9d9a7be3e3553a45ee1f346b3ac75 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Tue, 24 Oct 2023 07:50:48 -0700 Subject: [PATCH 2/2] Use ClimaCore operators --- .../indefinite_integral_and_mapreduce.jl | 192 ------------------ .../radiation/radiation.jl | 6 +- 2 files changed, 2 insertions(+), 196 deletions(-) delete mode 100644 src/parameterized_tendencies/radiation/indefinite_integral_and_mapreduce.jl diff --git a/src/parameterized_tendencies/radiation/indefinite_integral_and_mapreduce.jl b/src/parameterized_tendencies/radiation/indefinite_integral_and_mapreduce.jl deleted file mode 100644 index eb8b0f2d88..0000000000 --- a/src/parameterized_tendencies/radiation/indefinite_integral_and_mapreduce.jl +++ /dev/null @@ -1,192 +0,0 @@ -# TDOO: Move this entire file to ClimaCore. - -import ClimaCore.RecursiveApply: rzero, radd, rmul -import CUDA: @cuda - -""" - column_indefinite_integral!(ᶠintegral::Field, ᶜintegrand::Field) - -Set `ᶠintegral(z) = ∫_0^z ᶜintegrand(z) dz`, where `ᶠintegral` is on cell -faces and `ᶜintegrand` is on cell centers. -""" -column_indefinite_integral!(ᶠintegral::Fields.Field, ᶜintegrand::Fields.Field) = - column_indefinite_integral!( - ClimaComms.device(ᶠintegral), - ᶠintegral, - ᶜintegrand, - ) - -function column_indefinite_integral!( - ::ClimaComms.CUDADevice, - ᶠintegral::Fields.Field, - ᶜintegrand::Fields.Field, -) - Ni, Nj, _, _, Nh = size(Fields.field_values(ᶠintegral)) - nthreads, nblocks = Spaces._configure_threadblock(Ni * Nj * Nh) - @cuda threads = nthreads blocks = nblocks column_indefinite_integral_kernel!( - ᶠintegral, - ᶜintegrand, - ) -end - -function column_indefinite_integral_kernel!( - ᶠintegral::Fields.FaceExtrudedFiniteDifferenceField, - ᶜintegrand::Fields.CenterExtrudedFiniteDifferenceField, -) - idx = threadIdx().x + (blockIdx().x - 1) * blockDim().x - Ni, Nj, _, _, Nh = size(Fields.field_values(ᶜintegrand)) - if idx <= Ni * Nj * Nh - i, j, h = Spaces._get_idx((Ni, Nj, Nh), idx) - ᶠintegral_column = Spaces.column(ᶠintegral, i, j, h) - ᶜintegrand_column = Spaces.column(ᶜintegrand, i, j, h) - _column_indefinite_integral!(ᶠintegral_column, ᶜintegrand_column) - end - return nothing -end - -column_indefinite_integral_kernel!( - ᶠintegral::Fields.FaceFiniteDifferenceField, - ᶜintegrand::Fields.CenterFiniteDifferenceField, -) = _column_indefinite_integral!(ᶠintegral, ᶜintegrand) - -function column_indefinite_integral!( - ::ClimaComms.AbstractCPUDevice, - ᶠintegral::Fields.FaceExtrudedFiniteDifferenceField, - ᶜintegrand::Fields.CenterExtrudedFiniteDifferenceField, -) - Fields.bycolumn(axes(ᶜintegrand)) do colidx - _column_indefinite_integral!(ᶠintegral[colidx], ᶜintegrand[colidx]) - nothing - end - return nothing -end - -column_indefinite_integral!( - ::ClimaComms.AbstractCPUDevice, - ᶠintegral::Fields.FaceFiniteDifferenceField, - ᶜintegrand::Fields.CenterFiniteDifferenceField, -) = _column_indefinite_integral!(ᶠintegral, ᶜintegrand) - -function _column_indefinite_integral!( - ᶠintegral::Fields.ColumnField, - ᶜintegrand::Fields.ColumnField, -) - face_space = axes(ᶠintegral) - first_level = Operators.left_idx(face_space) - last_level = Operators.right_idx(face_space) - ᶜΔz = Fields.Δz_field(ᶜintegrand) - @inbounds Fields.level(ᶠintegral, first_level)[] = rzero(eltype(ᶜintegrand)) - for level in (first_level + 1):last_level - @inbounds Fields.level(ᶠintegral, level)[] = radd( - Fields.level(ᶠintegral, level - 1)[], - rmul( - Fields.level(ᶜintegrand, level - half)[], - Fields.level(ᶜΔz, level - half)[], - ), - ) - end - return nothing -end - -""" - column_mapreduce!(fn, op, reduced_field::Field, fields::Field...) - -Applies mapreduce along the vertical direction. -""" -column_mapreduce!( - fn::F, - op::O, - reduced_field::Fields.Field, - fields::Fields.Field..., -) where {F, O} = column_mapreduce_device!( - ClimaComms.device(reduced_field), - fn, - op, - reduced_field, - fields..., -) - -function column_mapreduce_device!( - ::ClimaComms.CUDADevice, - fn::F, - op::O, - reduced_field::Fields.Field, - fields::Fields.Field..., -) where {F, O} - Ni, Nj, _, _, Nh = size(Fields.field_values(reduced_field)) - nthreads, nblocks = Spaces._configure_threadblock(Ni * Nj * Nh) - @cuda threads = nthreads blocks = nblocks column_mapreduce_kernel!( - fn, - op, - reduced_field, - fields..., - ) -end - -function column_mapreduce_kernel!( - fn::F, - op::O, - reduced_field::Fields.SpectralElementField, - fields::Fields.ExtrudedFiniteDifferenceField..., -) where {F, O} - idx = threadIdx().x + (blockIdx().x - 1) * blockDim().x - Ni, Nj, _, _, Nh = size(Fields.field_values(field)) - if idx <= Ni * Nj * Nh - i, j, h = Spaces._get_idx((Ni, Nj, Nh), idx) - column_reduced_field = Spaces.column(reduced_field, i, j, h) - column_fields = map(field -> Spaces.column(field, i, j, h), fields) - _column_mapreduce!(fn, op, column_reduced_field, column_fields...) - end - return nothing -end - -column_mapreduce_kernel!( - fn::F, - op::O, - reduced_field::Fields.PointField, - fields::Fields.FiniteDifferenceField..., -) where {F, O} = _column_mapreduce!(fn, op, reduced_field, fields...) - -function column_mapreduce_device!( - ::ClimaComms.AbstractCPUDevice, - fn::F, - op::O, - reduced_field::Fields.SpectralElementField, - fields::Fields.ExtrudedFiniteDifferenceField..., -) where {F, O} - Fields.bycolumn(axes(reduced_field)) do colidx - column_fields = map(field -> field[colidx], fields) - _column_mapreduce!(fn, op, reduced_field[colidx], column_fields...) - nothing - end - return nothing -end - -column_mapreduce_device!( - ::ClimaComms.AbstractCPUDevice, - fn::F, - op::O, - reduced_field::Fields.PointField, - fields::Fields.FiniteDifferenceField..., -) where {F, O} = _column_mapreduce!(fn, op, reduced_field, fields...) - -function _column_mapreduce!( - fn::F, - op::O, - reduced_field::Fields.PointField, - fields::Fields.ColumnField..., -) where {F, O} - space = axes(fields[1]) - all(field -> axes(field) === space, fields[2:end]) || - error("All input fields for column_mapreduce must be on the same space") - get_value(level) = field -> @inbounds Fields.level(field, level)[] - first_level = Operators.left_idx(space) - last_level = Operators.right_idx(space) - first_level_values = map(get_value(first_level), fields) - @inbounds reduced_field[] = fn(first_level_values...) - for level in (first_level + 1):last_level - level_values = map(get_value(level), fields) - @inbounds reduced_field[] = op(reduced_field[], fn(level_values...)) - end - return nothing -end diff --git a/src/parameterized_tendencies/radiation/radiation.jl b/src/parameterized_tendencies/radiation/radiation.jl index b11cb245dc..cc3b09aa80 100644 --- a/src/parameterized_tendencies/radiation/radiation.jl +++ b/src/parameterized_tendencies/radiation/radiation.jl @@ -230,8 +230,6 @@ end ##### DYCOMS_RF01 radiation ##### -include("indefinite_integral_and_mapreduce.jl") - function radiation_model_cache(Y, params, radiation_mode::RadiationDYCOMS_RF01;) FT = Spaces.undertype(axes(Y.c)) NT = NamedTuple{(:z, :ρ, :q_tot), NTuple{3, FT}} @@ -273,11 +271,11 @@ function radiation_tendency!( Operators.column_integral_definite!(∫_0_∞_κρq[colidx], ᶜκρq[colidx]) - column_indefinite_integral!(ᶠ∫_0_z_κρq[colidx], ᶜκρq[colidx]) + Operators.column_integral_indefinite!(ᶠ∫_0_z_κρq[colidx], ᶜκρq[colidx]) # Find the values of (z, ρ, q_tot) at the q_tot = 0.008 isoline, i.e., at # the level whose value of q_tot is closest to 0.008. - column_mapreduce!( + Operators.column_mapreduce!( (z, ρ, q_tot) -> (; z, ρ, q_tot), (nt1, nt2) -> abs(nt1.q_tot - FT(0.008)) < abs(nt2.q_tot - FT(0.008)) ? nt1 : nt2,