From 14712c3fef2188f5369405d1a2f95e9b72ea10e4 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Thu, 20 Jul 2023 21:19:36 -0700 Subject: [PATCH 1/4] update ClimaCore --- examples/Manifest.toml | 110 ++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/examples/Manifest.toml b/examples/Manifest.toml index ba50b98829..3402d31df7 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -68,9 +68,9 @@ version = "0.1.29" [[deps.ArrayLayouts]] deps = ["FillArrays", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "f86b3bed71295314311c5628dc8d4a22c352e5f8" +git-tree-sha1 = "06fb6abc448771b8eac175fd675c2e4453c4e7bd" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" -version = "1.0.11" +version = "1.0.13" [[deps.ArtifactWrappers]] deps = ["Downloads", "Pkg"] @@ -249,7 +249,9 @@ version = "0.5.3" [[deps.ClimaCore]] deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"] -git-tree-sha1 = "8924d212a697d3d075f95fb4aed8b1b88424bc6a" +git-tree-sha1 = "fb6eb213f983dbf917ff0018d3216e025607b6a5" +repo-rev = "ck/1376" +repo-url = "https://github.com/CliMA/ClimaCore.jl.git" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" version = "0.10.43" @@ -378,9 +380,9 @@ version = "2.2.1" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "738fec4d684a9a6ee9598a8bfee305b26831f28c" +git-tree-sha1 = "fe2838a593b5f776e1597e086dcd47560d94e816" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.5.2" +version = "1.5.3" [[deps.Contour]] git-tree-sha1 = "d05d9e7b7aedff4e5b51a029dced05cfb6125781" @@ -411,9 +413,9 @@ version = "4.1.1" [[deps.Cthulhu]] deps = ["CodeTracking", "FoldingTrees", "InteractiveUtils", "JuliaSyntax", "PrecompileTools", "Preferences", "REPL", "TypedSyntax", "UUIDs", "Unicode", "WidthLimitedIO"] -git-tree-sha1 = "9b804378bbe126f64ca3b4cd4b5dc9e44ea02f70" +git-tree-sha1 = "a086f0e6bad863055df8aca3dc3786505d5cf06c" uuid = "f68482b8-f384-11e8-15f7-abe071a5a75f" -version = "2.9.1" +version = "2.9.2" [[deps.CubedSphere]] deps = ["Elliptic", "FFTW", "Printf", "ProgressBars", "SpecialFunctions", "TaylorSeries", "Test"] @@ -601,9 +603,9 @@ version = "3.3.10+0" [[deps.FastBroadcast]] deps = ["ArrayInterface", "LinearAlgebra", "Polyester", "Static", "StaticArrayInterface", "StrideArraysCore"] -git-tree-sha1 = "d1248fceea0b26493fd33e8e9e8c553270da03bd" +git-tree-sha1 = "aa9925a229d45fe3018715238956766fa21804d1" uuid = "7034ab61-46d4-4ed7-9d0f-46aef9175898" -version = "0.2.5" +version = "0.2.6" [[deps.FastClosures]] git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef" @@ -633,9 +635,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] -git-tree-sha1 = "e5556303fd8c9ad4a8fceccd406ef3433ddb4c45" +git-tree-sha1 = "f0af9b12329a637e8fba7d6543f915fff6ba0090" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "1.4.0" +version = "1.4.2" [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "Setfield", "SparseArrays", "StaticArrays"] @@ -744,15 +746,15 @@ version = "0.21.4" [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "UUIDs", "p7zip_jll"] -git-tree-sha1 = "8e2d86e06ceb4580110d9e716be26658effc5bfd" +git-tree-sha1 = "d73afa4a2bb9de56077242d98cf763074ab9a970" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.72.8" +version = "0.72.9" [[deps.GR_jll]] -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"] -git-tree-sha1 = "da121cbdc95b065da07fbb93638367737969693f" +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "f61f768bf090d97c532d24b64e07b237e9bb7b6b" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.72.8+0" +version = "0.72.9+0" [[deps.GaussQuadrature]] deps = ["SpecialFunctions"] @@ -773,10 +775,10 @@ uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" version = "1.3.1" [[deps.GeometryBasics]] -deps = ["EarCut_jll", "GeoInterface", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "659140c9375afa2f685e37c1a0b9c9a60ef56b40" +deps = ["EarCut_jll", "Extents", "GeoInterface", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] +git-tree-sha1 = "424a5a6ce7c5d97cca7bcc4eac551b97294c54af" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.4.7" +version = "0.4.9" [[deps.Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] @@ -872,9 +874,9 @@ version = "0.1.1" [[deps.ImageAxes]] deps = ["AxisArrays", "ImageBase", "ImageCore", "Reexport", "SimpleTraits"] -git-tree-sha1 = "c54b581a83008dc7f292e205f4c409ab5caa0f04" +git-tree-sha1 = "2e4520d67b0cef90865b3ef727594d2a58e0e1f8" uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.10" +version = "0.6.11" [[deps.ImageBase]] deps = ["ImageCore", "Reexport"] @@ -902,9 +904,9 @@ version = "0.6.6" [[deps.ImageMetadata]] deps = ["AxisArrays", "ImageAxes", "ImageBase", "ImageCore"] -git-tree-sha1 = "36cbaebed194b292590cba2593da27b34763804a" +git-tree-sha1 = "355e2b974f2e3212a75dfb60519de21361ad3cb7" uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.9.8" +version = "0.9.9" [[deps.Imath_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1009,9 +1011,9 @@ version = "0.21.4" [[deps.JpegTurbo]] deps = ["CEnum", "FileIO", "ImageCore", "JpegTurbo_jll", "TOML"] -git-tree-sha1 = "106b6aa272f294ba47e96bd3acbabdc0407b5c60" +git-tree-sha1 = "327713faef2a3e5c80f96bf38d1fa26f7a6ae29e" uuid = "b835a17e-a41a-41e7-81f0-2f016b05efe0" -version = "0.1.2" +version = "0.1.3" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1056,9 +1058,9 @@ version = "0.6.7" [[deps.Krylov]] deps = ["LinearAlgebra", "Printf", "SparseArrays"] -git-tree-sha1 = "0356a64062656b0cbb43c504ad5de338251f4bda" +git-tree-sha1 = "6dc4ad9cd74ad4ca0a8e219e945dbd22039f2125" uuid = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7" -version = "0.9.1" +version = "0.9.2" [[deps.LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1239,9 +1241,9 @@ version = "2.5.2" [[deps.LinearSolve]] deps = ["ArrayInterface", "DocStringExtensions", "EnumX", "FastLapackInterface", "GPUArraysCore", "InteractiveUtils", "KLU", "Krylov", "LinearAlgebra", "PrecompileTools", "Preferences", "RecursiveFactorization", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Sparspak", "SuiteSparse", "UnPack"] -git-tree-sha1 = "93f3a0d88c8f5498bed3ad37ddd844b939fdf899" +git-tree-sha1 = "1b55771f2c211583ad52af5a5ca6475be374c961" uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae" -version = "2.3.0" +version = "2.4.1" [[deps.LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] @@ -1260,9 +1262,9 @@ version = "1.0.0" [[deps.LoopVectorization]] deps = ["ArrayInterface", "ArrayInterfaceCore", "CPUSummary", "ChainRulesCore", "CloseOpenIntervals", "DocStringExtensions", "ForwardDiff", "HostCPUFeatures", "IfElse", "LayoutPointers", "LinearAlgebra", "OffsetArrays", "PolyesterWeave", "PrecompileTools", "SIMDTypes", "SLEEFPirates", "SpecialFunctions", "Static", "StaticArrayInterface", "ThreadingUtilities", "UnPack", "VectorizationBase"] -git-tree-sha1 = "24e6c5697a6c93b5e10af2acf95f0b2e15303332" +git-tree-sha1 = "b206c084b224dc16dbd8fce63dd34d5050e1e130" uuid = "bdcacae8-1622-11e9-2a5c-532679323890" -version = "0.12.163" +version = "0.12.164" [[deps.LoweredCodeUtils]] deps = ["JuliaInterpreter"] @@ -1445,9 +1447,9 @@ version = "400.902.206+0" [[deps.Netpbm]] deps = ["FileIO", "ImageCore", "ImageMetadata"] -git-tree-sha1 = "5ae7ca23e13855b3aba94550f26146c01d259267" +git-tree-sha1 = "d92b107dbb887293622df7697a2223f9f8176fcd" uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" -version = "1.1.0" +version = "1.1.1" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -1562,6 +1564,12 @@ git-tree-sha1 = "f809158b27eba0c18c269cf2a2be6ed751d3e81d" uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" version = "0.3.17" +[[deps.PackageExtensionCompat]] +deps = ["Requires", "TOML"] +git-tree-sha1 = "32f3d52212a8d1c5d589a58851b1f04c97339110" +uuid = "65ce6f38-6b18-4e1d-a461-8949797d7930" +version = "1.0.0" + [[deps.Packing]] deps = ["GeometryBasics"] git-tree-sha1 = "ec3edfe723df33528e085e632414499f26650501" @@ -1640,9 +1648,9 @@ version = "0.4.4" [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] -git-tree-sha1 = "0fe4e7c4d8ff4c70bfa507f0dd96fa161b115777" +git-tree-sha1 = "0c6a162cb9a0ab8b7345793dd8369b595cb30db8" uuid = "f517fe37-dbe3-4b94-8317-1923a5111588" -version = "0.7.3" +version = "0.7.4" [[deps.PolyesterWeave]] deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"] @@ -1723,11 +1731,11 @@ git-tree-sha1 = "be2449911f4d6cfddacdf7efc895eceda3eee5c1" uuid = "784f63db-0788-585a-bace-daefebcd302b" version = "8.0.1003+0" -[[deps.Qt5Base_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] -git-tree-sha1 = "0c03844e2231e12fda4d0086fd7cbe4098ee8dc5" -uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" -version = "5.15.3+2" +[[deps.Qt6Base_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] +git-tree-sha1 = "364898e8f13f7eaaceec55fd3d08680498c0aa6e" +uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56" +version = "6.4.2+3" [[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -1890,9 +1898,9 @@ version = "0.1.8" [[deps.SciMLOperators]] deps = ["ArrayInterface", "DocStringExtensions", "Lazy", "LinearAlgebra", "Setfield", "SparseArrays", "StaticArraysCore", "Tricks"] -git-tree-sha1 = "b1fe33c9984c6789b58419e62e7a2b92f9aa813e" +git-tree-sha1 = "745755a5b932c9a664d7e9e4beb60c692b211d4b" uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961" -version = "0.3.3" +version = "0.3.5" [[deps.Scratch]] deps = ["Dates"] @@ -1931,10 +1939,10 @@ uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.1.0" [[deps.SimpleNonlinearSolve]] -deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PrecompileTools", "Reexport", "Requires", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "56aa73a93cdca493af5155a0338a864ed314222b" +deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PackageExtensionCompat", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] +git-tree-sha1 = "d4005f0ada4442c0cd7a63705d6043b442d41990" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.16" +version = "0.1.17" [[deps.SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] @@ -1949,9 +1957,9 @@ version = "1.1.0" [[deps.Sixel]] deps = ["Dates", "FileIO", "ImageCore", "IndirectArrays", "OffsetArrays", "REPL", "libsixel_jll"] -git-tree-sha1 = "8fb59825be681d451c246a795117f317ecbcaa28" +git-tree-sha1 = "2da10356e31327c7096832eb9cd86307a50b1eb6" uuid = "45858cf5-a6b0-47a3-bbea-62219f50df47" -version = "0.1.2" +version = "0.1.3" [[deps.SnoopCompile]] deps = ["AbstractTrees", "Cthulhu", "FlameGraphs", "InteractiveUtils", "JET", "OrderedCollections", "Pkg", "Printf", "Profile", "Requires", "Serialization", "SnoopCompileCore", "YAML"] @@ -2016,9 +2024,9 @@ version = "0.1.1" [[deps.Static]] deps = ["IfElse"] -git-tree-sha1 = "dbde6766fc677423598138a5951269432b0fcc90" +git-tree-sha1 = "f295e0a1da4ca425659c57441bcb59abb035a4bc" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.8.7" +version = "0.8.8" [[deps.StaticArrayInterface]] deps = ["ArrayInterface", "Compat", "IfElse", "LinearAlgebra", "Requires", "SnoopPrecompile", "SparseArrays", "Static", "SuiteSparse"] @@ -2033,9 +2041,9 @@ uuid = "90137ffa-7385-5640-81b9-e52037218182" version = "1.6.1" [[deps.StaticArraysCore]] -git-tree-sha1 = "1d5708d926c76a505052d0d24a846d5da08bc3a4" +git-tree-sha1 = "36b3d696ce6366023a0ea192b4cd442268995a0d" uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" -version = "1.4.1" +version = "1.4.2" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] From ee9d826842ba3398654fcfab89f173090b815839 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Fri, 21 Jul 2023 09:17:00 -0700 Subject: [PATCH 2/4] move const outside broadcast expression --- .../microphysics/precipitation.jl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/parameterized_tendencies/microphysics/precipitation.jl b/src/parameterized_tendencies/microphysics/precipitation.jl index ac8fd950f3..89d8ee4b32 100644 --- a/src/parameterized_tendencies/microphysics/precipitation.jl +++ b/src/parameterized_tendencies/microphysics/precipitation.jl @@ -94,10 +94,12 @@ function precipitation_tendency!( # update precip in cache for coupler's use # 3d rain and snow @. ᶜT[colidx] = TD.air_temperature(thermo_params, ᶜts[colidx]) + # $(FT(const)) is to workaround https://github.com/JuliaGPU/CUDA.jl/issues/1761 + # can remove once we upgrade CUDA @. ᶜ3d_rain[colidx] = - ifelse(ᶜT[colidx] >= FT(273.15), ᶜS_ρq_tot[colidx], FT(0)) + ifelse(ᶜT[colidx] >= $(FT(273.15)), ᶜS_ρq_tot[colidx], $(FT(0))) @. ᶜ3d_snow[colidx] = - ifelse(ᶜT[colidx] < FT(273.15), ᶜS_ρq_tot[colidx], FT(0)) + ifelse(ᶜT[colidx] < $(FT(273.15)), ᶜS_ρq_tot[colidx], $(FT(0))) Operators.column_integral_definite!( col_integrated_rain[colidx], ᶜ3d_rain[colidx], @@ -188,8 +190,8 @@ function compute_precipitation_cache!( rain_type = CM.CommonTypes.RainType() snow_type = CM.CommonTypes.SnowType() @. ᶜT[colidx] = TD.air_temperature(thermo_params, ᶜts[colidx]) - @. ᶜq_rai[colidx] = max(FT(0), Y.c.ρq_rai[colidx] / Y.c.ρ[colidx]) - @. ᶜq_sno[colidx] = max(FT(0), Y.c.ρq_sno[colidx] / Y.c.ρ[colidx]) + @. ᶜq_rai[colidx] = max($(FT(0)), Y.c.ρq_rai[colidx] / Y.c.ρ[colidx]) + @. ᶜq_sno[colidx] = max($(FT(0)), Y.c.ρq_sno[colidx] / Y.c.ρ[colidx]) # Sinks of precipitation (evaporation, melting, deposition/sublimation) # Limiting the tendency by tracer/dt should be handeled in a better way @@ -219,7 +221,7 @@ function compute_precipitation_cache!( ᶜT[colidx], ) @. ᶜS_q_sno_sub_dep[colidx] = ifelse( - ᶜS_q_sno_sub_dep[colidx] > FT(0), + ᶜS_q_sno_sub_dep[colidx] > $(FT(0)), min( TD.vapor_specific_humidity(thermo_params, ᶜts[colidx]) / dt, ᶜS_q_sno_sub_dep[colidx], From b1416a52868adaa400acdbf9ceb2f9da12d616ac Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Fri, 21 Jul 2023 10:24:24 -0700 Subject: [PATCH 3/4] disable type assertion --- src/prognostic_equations/implicit/schur_complement_W.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prognostic_equations/implicit/schur_complement_W.jl b/src/prognostic_equations/implicit/schur_complement_W.jl index be1c5a0301..6eb18b9ecd 100644 --- a/src/prognostic_equations/implicit/schur_complement_W.jl +++ b/src/prognostic_equations/implicit/schur_complement_W.jl @@ -341,7 +341,7 @@ function _ldiv_serial!( Base.@_inline_meta xᶜ𝕋 = getproperty(xc, ᶜ𝕋_name)::typeof(xc.ρ) bᶜ𝕋 = getproperty(bc, ᶜ𝕋_name)::typeof(xc.ρ) - ∂ᶜ𝕋ₜ∂ᶠ𝕄 = getproperty(∂ᶜ𝕋ₜ∂ᶠ𝕄_field, ᶜ𝕋_name)::∂ᶜ𝕋ₜ∂ᶠ𝕄_field_eltype(A) + ∂ᶜ𝕋ₜ∂ᶠ𝕄 = getproperty(∂ᶜ𝕋ₜ∂ᶠ𝕄_field, ᶜ𝕋_name) #::∂ᶜ𝕋ₜ∂ᶠ𝕄_field_eltype(A) @. xᶜ𝕋 = -bᶜ𝕋 + dtγ * apply(∂ᶜ𝕋ₜ∂ᶠ𝕄, xᶠ𝕄) end if :turbconv in propertynames(xc) From 249dd9916b0b3b0c2aab316fafc635f4c641f2ef Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Fri, 21 Jul 2023 13:43:26 -0700 Subject: [PATCH 4/4] profile moist --- .buildkite/pipeline.yml | 3 +-- examples/Manifest.toml | 52 ++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7a13345395..7739eb1d49 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -810,9 +810,8 @@ steps: - label: "Perf: GPU implicit baro wave moist" command: - "julia --project -e 'using CUDA; CUDA.versioninfo()'" - - "julia --color=yes --project=examples perf/benchmark_step.jl --job_id gpu_implicit_barowave_moist --z_elem 25 --h_elem 12 --initial_condition MoistBaroclinicWave --t_end 1mins --dt 1secs --dt_save_to_sol Inf --dt_save_to_disk Inf --moist equil --precip 0M --apply_limiter false" + - "nsys profile --trace=nvtx,cuda --output=gpu_implicit_barowave_moist/report julia --color=yes --project=examples perf/benchmark_step.jl --job_id gpu_implicit_barowave_moist --z_elem 25 --h_elem 12 --initial_condition MoistBaroclinicWave --t_end 1mins --dt 1secs --dt_save_to_sol Inf --dt_save_to_disk Inf --moist equil --precip 0M --apply_limiter false" artifact_paths: "gpu_implicit_barowave_moist/*" - soft_fail: true agents: slurm_gpus: 1 diff --git a/examples/Manifest.toml b/examples/Manifest.toml index 3402d31df7..fef0269906 100644 --- a/examples/Manifest.toml +++ b/examples/Manifest.toml @@ -107,9 +107,9 @@ version = "1.0.1" [[deps.AxisArrays]] deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] -git-tree-sha1 = "1dd4d9f5beebac0c03446918741b1a03dc5e5788" +git-tree-sha1 = "16351be62963a67ac4083f748fdb3cca58bfd52f" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" -version = "0.4.6" +version = "0.4.7" [[deps.BFloat16s]] deps = ["LinearAlgebra", "Printf", "Random", "Test"] @@ -156,9 +156,9 @@ version = "0.1.2" [[deps.CLIMAParameters]] deps = ["DocStringExtensions", "TOML", "Test"] -git-tree-sha1 = "119ef280867dde6b8a3f351b36b1f5748db12faf" +git-tree-sha1 = "ab87deb4712d1df9391c8dc69c7d82a18ad093cb" uuid = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" -version = "0.7.5" +version = "0.7.6" [[deps.CPUSummary]] deps = ["CpuId", "IfElse", "PrecompileTools", "Static"] @@ -249,11 +249,11 @@ version = "0.5.3" [[deps.ClimaCore]] deps = ["Adapt", "BlockArrays", "CUDA", "ClimaComms", "CubedSphere", "DataStructures", "DiffEqBase", "DocStringExtensions", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "LinearAlgebra", "PkgVersion", "RecursiveArrayTools", "Requires", "RootSolvers", "SparseArrays", "Static", "StaticArrays", "Statistics", "UnPack"] -git-tree-sha1 = "fb6eb213f983dbf917ff0018d3216e025607b6a5" -repo-rev = "ck/1376" +git-tree-sha1 = "6d3ea05148235667c3e51bd0d8b03cd6416ce919" +repo-rev = "main" repo-url = "https://github.com/CliMA/ClimaCore.jl.git" uuid = "d414da3d-4745-48bb-8d80-42e94e092884" -version = "0.10.43" +version = "0.10.44" [[deps.ClimaCoreMakie]] deps = ["ClimaCore", "Makie"] @@ -323,9 +323,9 @@ version = "0.4.0" [[deps.ColorSchemes]] deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"] -git-tree-sha1 = "be6ab11021cd29f0344d5c4357b163af05a48cba" +git-tree-sha1 = "dd3000d954d483c1aad05fe1eb9e6a715c97013e" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.21.0" +version = "3.22.0" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -472,9 +472,9 @@ version = "0.1.0+0" [[deps.DiffEqBase]] deps = ["ArrayInterface", "ChainRulesCore", "DataStructures", "Distributions", "DocStringExtensions", "EnumX", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "Printf", "RecursiveArrayTools", "Reexport", "Requires", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces", "ZygoteRules"] -git-tree-sha1 = "62c41421bd0facc43dfe4e9776135fe21fd1e1b9" +git-tree-sha1 = "c5692436e7f8279503466db216c74165d1b301e4" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.126.0" +version = "6.127.0" [[deps.DiffEqCallbacks]] deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "LinearAlgebra", "Markdown", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] @@ -891,16 +891,16 @@ uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" version = "0.9.4" [[deps.ImageFiltering]] -deps = ["CatIndices", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageBase", "ImageCore", "LinearAlgebra", "OffsetArrays", "Reexport", "SnoopPrecompile", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "d90867cbe037730a73c9a9499b3591eedbe387a0" +deps = ["CatIndices", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageBase", "ImageCore", "LinearAlgebra", "OffsetArrays", "PrecompileTools", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] +git-tree-sha1 = "3447781d4c80dbe6d71d239f7cfb1f8049d4c84f" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.7.5" +version = "0.7.6" [[deps.ImageIO]] deps = ["FileIO", "IndirectArrays", "JpegTurbo", "LazyModules", "Netpbm", "OpenEXR", "PNGFiles", "QOI", "Sixel", "TiffImages", "UUIDs"] -git-tree-sha1 = "342f789fd041a55166764c351da1710db97ce0e0" +git-tree-sha1 = "bca20b2f5d00c4fbc192c3212da8fa79f4688009" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.6.6" +version = "0.6.7" [[deps.ImageMetadata]] deps = ["AxisArrays", "ImageAxes", "ImageBase", "ImageCore"] @@ -1560,9 +1560,9 @@ version = "0.11.17" [[deps.PNGFiles]] deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] -git-tree-sha1 = "f809158b27eba0c18c269cf2a2be6ed751d3e81d" +git-tree-sha1 = "9b02b27ac477cad98114584ff964e3052f656a0f" uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" -version = "0.3.17" +version = "0.4.0" [[deps.PackageExtensionCompat]] deps = ["Requires", "TOML"] @@ -1683,9 +1683,9 @@ version = "1.4.0" [[deps.PrettyTables]] deps = ["Crayons", "Formatting", "LaTeXStrings", "Markdown", "Reexport", "StringManipulation", "Tables"] -git-tree-sha1 = "331cc8048cba270591eab381e7aa3e2e3fef7f5e" +git-tree-sha1 = "542b1bd03329c1d235110f96f1bb0eeffc48a87d" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "2.2.5" +version = "2.2.6" [[deps.Printf]] deps = ["Unicode"] @@ -1886,9 +1886,9 @@ version = "0.4.0" [[deps.SciMLBase]] 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"] -git-tree-sha1 = "ddf8d14762bac98d035453b33b9c5952f36c3b79" +git-tree-sha1 = "92f8e23b4a5eb7e45bffe09027fcdda44a949a51" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "1.93.2" +version = "1.93.4" [[deps.SciMLNLSolve]] deps = ["DiffEqBase", "LineSearches", "NLsolve", "Reexport", "SciMLBase"] @@ -1940,9 +1940,9 @@ version = "1.1.0" [[deps.SimpleNonlinearSolve]] deps = ["ArrayInterface", "DiffEqBase", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "PackageExtensionCompat", "PrecompileTools", "Reexport", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "d4005f0ada4442c0cd7a63705d6043b442d41990" +git-tree-sha1 = "91fcc402c4ab978ad5759489db9a9c5a71732f2d" uuid = "727e6d20-b764-4bd8-a329-72de5adea6c7" -version = "0.1.17" +version = "0.1.18" [[deps.SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] @@ -2036,9 +2036,9 @@ version = "1.4.0" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "fffc14c695c17bfdbfa92a2a01836cdc542a1e46" +git-tree-sha1 = "9cabadf6e7cd2349b6cf49f1915ad2028d65e881" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.6.1" +version = "1.6.2" [[deps.StaticArraysCore]] git-tree-sha1 = "36b3d696ce6366023a0ea192b4cd442268995a0d"