Skip to content

Commit

Permalink
Merge pull request #143 from CliMA/gb/update_ci
Browse files Browse the repository at this point in the history 
Hide code branch that leads to GPU incompatibilities in Julia 1.10
  • Loading branch information
@Sbozzolo
Sbozzolo authored Jan 8, 2024
2 parents 95f5f05 + 7ebe141 commit f83dc86
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 0 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

7 changes: 6 additions & 1 deletion src/SurfaceFluxes.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

2 comments on commit f83dc86

@Sbozzolo
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/98473

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.8.1 -m "<description of version>" f83dc8642b032184c3b31b2c444ed1a6f43168f1
git push origin v0.8.1

Please sign in to comment.