From 00d4bd412a4fe8c14ff6bb7b52f148ceb4ef6636 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Wed, 3 Jan 2024 09:19:03 -0800 Subject: [PATCH 1/4] Extend CPU targets --- .buildkite/pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 62d51d73..f39e1a11 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -7,6 +7,7 @@ env: JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite" OPENBLAS_NUM_THREADS: 1 JULIA_NVTX_CALLBACKS: gc + JULIA_CPU_TARGET: 'broadwell;skylake;icelake;cascadelake;epyc' OMPI_MCA_opal_warn_on_missing_libcuda: 0 MPITRAMPOLINE_LIB: '/groups/esm/software/MPIwrapper/ompi4.1.5_cuda-12.2/lib64/libmpiwrapper.so' MPITRAMPOLINE_MPIEXEC: '/groups/esm/software/MPIwrapper/ompi4.1.5_cuda-12.2/bin/mpiwrapperexec' From 5057b32bc9b307449da668b36c39cde744e1bb39 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Thu, 4 Jan 2024 11:02:20 -0800 Subject: [PATCH 2/4] Add workaround for julia 1.10 and CUDA As of CUDA 5.1.1, there are some issues with ClimaAtmos and Julia 1.10. It seems that the issue is with this particular function and the error is due to added calles to gc_frame functions that cannot be compiled on a GPU. For unknown reasons, the code compiles when we remove the keyword arguments. While the issue is being investigated, we can work around it by excluding the offending branch --- src/SurfaceFluxes.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/SurfaceFluxes.jl b/src/SurfaceFluxes.jl index 3cd12e5e..8f90cb1f 100644 --- a/src/SurfaceFluxes.jl +++ b/src/SurfaceFluxes.jl @@ -291,7 +291,12 @@ function surface_conditions( noniterative_stable_sol::Bool = true, ) where {FT} uft = SFP.universal_func_type(param_set) - L_MO = obukhov_length(param_set, sc, uft, scheme; tol, tol_neutral, maxiter, soltype, noniterative_stable_sol) + # FIXME: Workaround for julia 1.10 and GPUs. + if sc isa Coefficients || sc isa FluxesAndFrictionVelocity + L_MO = obukhov_length(param_set, sc, uft, scheme) + else + L_MO = obukhov_length(param_set, sc, uft, scheme; tol, tol_neutral, maxiter, soltype, noniterative_stable_sol) + end ustar = compute_ustar(param_set, L_MO, sc, uft, scheme) Cd = momentum_exchange_coefficient(param_set, L_MO, sc, uft, scheme, tol_neutral) Ch = heat_exchange_coefficient(param_set, L_MO, sc, uft, scheme, tol_neutral) From c26f9dbe33e335d07350336b648a4d4255da353a Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Thu, 4 Jan 2024 12:30:25 -0800 Subject: [PATCH 3/4] Bump to 0.8.1 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7bf2eb08..6b8214b6 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "SurfaceFluxes" uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f" authors = ["Climate Modeling Alliance"] -version = "0.8.0" +version = "0.8.1" [deps] CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53" From 7ebe14193b8da056eb3a788dd9d7d104bf4d4324 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Fri, 5 Jan 2024 10:20:56 -0800 Subject: [PATCH 4/4] Remove mention of bors --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 230df2e5..9c1d3183 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ A package for computing surface fluxes between the atmosphere, ocean and land mo | **Documentation** | [![dev][docs-dev-img]][docs-dev-url] | | **GHA CI** | [![gha ci][gha-ci-img]][gha-ci-url] | | **Code Coverage** | [![codecov][codecov-img]][codecov-url] | -| **Bors enabled** | [![bors][bors-img]][bors-url] | [docs-bld-img]: https://github.com/CliMA/SurfaceFluxes.jl/actions/workflows/docs.yml/badge.svg [docs-bld-url]: https://github.com/CliMA/SurfaceFluxes.jl/actions/workflows/docs.yml @@ -21,7 +20,3 @@ A package for computing surface fluxes between the atmosphere, ocean and land mo [codecov-img]: https://codecov.io/gh/CliMA/SurfaceFluxes.jl/branch/main/graph/badge.svg [codecov-url]: https://codecov.io/gh/CliMA/SurfaceFluxes.jl - -[bors-img]: https://bors.tech/images/badge_small.svg -[bors-url]: https://app.bors.tech/repositories/35311 -