Skip to content

Commit

Permalink
Merge pull request #556 from CliMA/js/atmos-v0180
Browse files Browse the repository at this point in the history
dependency updates
  • Loading branch information
juliasloan25 authored Jan 18, 2024
2 parents ef0dabc + 0d3382a commit 3df1d4c
Show file tree
Hide file tree
Showing 17 changed files with 1,636 additions and 951 deletions.
11 changes: 1 addition & 10 deletions .buildkite/longruns/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
agents:
queue: central
slurm_time: 24:00:00
modules: julia/1.9.4 cuda/12.2 ucx/1.14.1_cuda-12.2 openmpi/4.1.5_cuda-12.2 nsight-systems/2023.3.1
modules: julia/1.10.0 cuda/12.2 ucx/1.14.1_cuda-12.2 openmpi/4.1.5_cuda-12.2 nsight-systems/2023.4.1

env:
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
Expand All @@ -27,15 +27,6 @@ steps:
- label: "init :computer:"
key: "init_cpu_env"
command:

# Local MPIPreferences take precedence over the one set by JuliaProject.toml,
# so we make sure that we remove them to use MPITrampoline.
#
# TODO: This can be removed once all the branches that use MPIPreferences
# are deleted
- echo "--- Remove MPIPreferences"
- "rm -f ${JULIA_DEPOT_PATH}/environments/v1.9/LocalPreferences.toml"

- echo "--- Instantiate AMIP env"
- "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'"
Expand Down
10 changes: 1 addition & 9 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
agents:
queue: central
slurm_time: 24:00:00
modules: julia/1.9.4 cuda/12.2 ucx/1.14.1_cuda-12.2 openmpi/4.1.5_cuda-12.2 nsight-systems/2023.3.1
modules: julia/1.10.0 cuda/12.2 ucx/1.14.1_cuda-12.2 openmpi/4.1.5_cuda-12.2 nsight-systems/2023.4.1

env:
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
Expand Down Expand Up @@ -34,14 +34,6 @@ steps:
rm -rf ${JULIA_DEPOT_PATH}
fi
# Local MPIPreferences take precedence over the one set by JuliaProject.toml,
# so we make sure that we remove them to use MPITrampoline.
#
# TODO: This can be removed once all the branches that use MPIPreferences
# are deleted
- echo "--- Remove MPIPreferences"
- "rm -f ${JULIA_DEPOT_PATH}/environments/v1.9/LocalPreferences.toml"

- echo "--- Instantiate package env"
- "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project -e 'using Pkg; Pkg.precompile()'"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CodeCoverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Julia
uses: julia-actions/setup-julia@latest
with:
version: 1.9
version: '1.10'

- name: Test with coverage
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: 1.9
version: '1.10'
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/JuliaFormatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: julia-actions/setup-julia@latest
if: steps.filter.outputs.julia_file_change == 'true'
with:
version: 1.9
version: '1.10'

- name: Apply JuliaFormatter
if: steps.filter.outputs.julia_file_change == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1.10'
os:
- ubuntu-latest
- macOS-latest
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
CLIMAParameters = "0.4, 0.5, 0.6, 0.7"
ClimaAtmos = "0.17.1"
ClimaAtmos = "0.19.1"
ClimaComms = "0.5.6"
ClimaCore = "0.11.3"
ClimaCore = "0.11.8"
ClimaCoreTempestRemap = "0.3"
ClimaLSM = "0.4"
ClimaLSM = "0.5"
Dates = "1"
DocStringExtensions = "0.8, 0.9"
Insolation = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Coupler Specific Shared Development
Provides coupled system time stepping control and support for mapping import and export
boundary information between components.

Recommended Julia Version: Stable release v1.9.4. CI no longer tests earlier versions of Julia.
Recommended Julia Version: Stable release v1.10.0. CI no longer tests earlier versions of Julia.
Loading

0 comments on commit 3df1d4c

Please sign in to comment.