Merge pull request #2383 from CliMA/sk/reduce_mem_footprint

Reduce memory footprint
CliMA · Nov 25, 2023 · 2b54064 · 2b54064
2 parents 02837da + 581f016
commit 2b54064
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 27 deletions.
diff --git a/Project.toml b/Project.toml
@@ -72,7 +72,7 @@ NCDatasets = "0.11, 0.12, 0.13"
 NVTX = "0.3"
 Pkg = "1.8"
 Printf = "1"
-RRTMGP = "0.9.3"
+RRTMGP = "0.10.0"
 Random = "1"
 RootSolvers = "0.2, 0.3, 0.4"
 SciMLBase = "1, 2"

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
@@ -270,6 +270,7 @@ version = "0.5.6"
 
 [[deps.ClimaCore]]
 deps = ["Adapt", "BandedMatrices", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "Memoize", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "WeakValueDicts"]
+git-tree-sha1 = "5c3809c5da88a3b01b8fe18558f50470fd3c33ed"
 uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
 version = "0.11.0"
 
@@ -1279,9 +1280,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.RRTMGP]]
 deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"]
-git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670"
+git-tree-sha1 = "40ea97b2334725cef9b7f9e2fc2f76b35596807d"
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
-version = "0.9.3"
+version = "0.10.0"
 
 [[deps.Random]]
 deps = ["SHA", "Serialization"]

diff --git a/examples/Manifest.toml b/examples/Manifest.toml
@@ -135,10 +135,10 @@ uuid = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
 version = "0.1.0"
 
 [[deps.Automa]]
-deps = ["TranscodingStreams"]
-git-tree-sha1 = "ef9997b3d5547c48b41c7bd8899e812a917b409d"
+deps = ["PrecompileTools", "TranscodingStreams"]
+git-tree-sha1 = "0da671c730d79b8f9a88a391556ec695ea921040"
 uuid = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b"
-version = "0.8.4"
+version = "1.0.2"
 
 [[deps.AxisAlgorithms]]
 deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"]
@@ -1404,9 +1404,9 @@ version = "2.36.0+0"
 
 [[deps.LightXML]]
 deps = ["Libdl", "XML2_jll"]
-git-tree-sha1 = "e129d9391168c677cd4800f5c0abb1ed8cb3794f"
+git-tree-sha1 = "3a994404d3f6709610701c7dabfc03fed87a81f8"
 uuid = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
-version = "0.9.0"
+version = "0.9.1"
 
 [[deps.LineSearches]]
 deps = ["LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "Printf"]
@@ -1532,10 +1532,10 @@ deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[deps.MathTeXEngine]]
-deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "Test", "UnicodeFun"]
-git-tree-sha1 = "8f52dbaa1351ce4cb847d95568cb29e62a307d93"
+deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"]
+git-tree-sha1 = "96ca8a313eb6437db5ffe946c457a401bbb8ce1d"
 uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53"
-version = "0.5.6"
+version = "0.5.7"
 
 [[deps.MbedTLS]]
 deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
@@ -1999,9 +1999,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.RRTMGP]]
 deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"]
-git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670"
+git-tree-sha1 = "40ea97b2334725cef9b7f9e2fc2f76b35596807d"
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
-version = "0.9.3"
+version = "0.10.0"
 
 [[deps.Random]]
 deps = ["SHA", "Serialization"]

diff --git a/perf/Manifest.toml b/perf/Manifest.toml
@@ -135,10 +135,10 @@ uuid = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
 version = "0.1.0"
 
 [[deps.Automa]]
-deps = ["TranscodingStreams"]
-git-tree-sha1 = "ef9997b3d5547c48b41c7bd8899e812a917b409d"
+deps = ["PrecompileTools", "TranscodingStreams"]
+git-tree-sha1 = "0da671c730d79b8f9a88a391556ec695ea921040"
 uuid = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b"
-version = "0.8.4"
+version = "1.0.2"
 
 [[deps.AxisAlgorithms]]
 deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"]
@@ -1462,9 +1462,9 @@ version = "2.36.0+0"
 
 [[deps.LightXML]]
 deps = ["Libdl", "XML2_jll"]
-git-tree-sha1 = "e129d9391168c677cd4800f5c0abb1ed8cb3794f"
+git-tree-sha1 = "3a994404d3f6709610701c7dabfc03fed87a81f8"
 uuid = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
-version = "0.9.0"
+version = "0.9.1"
 
 [[deps.LineSearches]]
 deps = ["LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "Printf"]
@@ -1590,10 +1590,10 @@ deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[deps.MathTeXEngine]]
-deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "Test", "UnicodeFun"]
-git-tree-sha1 = "8f52dbaa1351ce4cb847d95568cb29e62a307d93"
+deps = ["AbstractTrees", "Automa", "DataStructures", "FreeTypeAbstraction", "GeometryBasics", "LaTeXStrings", "REPL", "RelocatableFolders", "UnicodeFun"]
+git-tree-sha1 = "96ca8a313eb6437db5ffe946c457a401bbb8ce1d"
 uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53"
-version = "0.5.6"
+version = "0.5.7"
 
 [[deps.MbedTLS]]
 deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
@@ -2069,9 +2069,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.RRTMGP]]
 deps = ["Adapt", "CUDA", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"]
-git-tree-sha1 = "ba6fe2d8e3648f27cdc29de64fb634a1846ba670"
+git-tree-sha1 = "40ea97b2334725cef9b7f9e2fc2f76b35596807d"
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
-version = "0.9.3"
+version = "0.10.0"
 
 [[deps.Random]]
 deps = ["SHA", "Serialization"]

diff --git a/src/parameterized_tendencies/radiation/RRTMGPInterface.jl b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl
@@ -839,10 +839,10 @@ function RRTMGPModel(
             set_and_save!(cld_path_ice, name, t..., dict)
             cld_frac = DA{FT}(undef, nlay, ncol)
             set_and_save!(cld_frac, "center_cloud_fraction", t..., dict)
-            random_lw = DA{FT}(undef, ngpt_lw, nlay, ncol)
-            random_sw = DA{FT}(undef, ngpt_sw, nlay, ncol)
-            cld_mask_lw = DA{Bool}(undef, ngpt_lw, nlay, ncol)
-            cld_mask_sw = DA{Bool}(undef, ngpt_sw, nlay, ncol)
+            random_lw = DA{FT}(undef, nlay, ncol)
+            random_sw = DA{FT}(undef, nlay, ncol)
+            cld_mask_lw = DA{Bool}(undef, nlay, ncol)
+            cld_mask_sw = DA{Bool}(undef, nlay, ncol)
             cld_overlap = RRTMGP.AtmosphericStates.MaxRandomOverlap()
 
             # ice_roughness is a constant, so don't use set_and_save! to get it