Merge pull request #1372 from CliMA/up_deps_112

Update dependencies
CliMA · Nov 10, 2023 · 5714eea · 5714eea
2 parents 23c4613 + b1ff508
commit 5714eea
Show file tree

Hide file tree

Showing 8 changed files with 858 additions and 334 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -2,6 +2,8 @@ env:
   JULIA_VERSION: "1.9.3"
   OPENMPI_VERSION: "4.0.4"
   CUDA_VERSION: "11.2"
+  CLIMACOMMS_DEVICE: "CPU"
+  JULIA_CPU_TARGET: 'broadwell;skylake'
   OPENBLAS_NUM_THREADS: 1
   CLIMATEMACHINE_SETTINGS_FIX_RNG_SEED: "true"
   BUILDKITE_COMMIT: "${BUILDKITE_COMMIT}"
@@ -16,7 +18,7 @@ agents:
 
 steps:
 
-  # Clear depot
+  # # Clear depot
   # - label: "clear depot"
   #   command:
   #     - "rm -rf /central/scratch/esm/slurm-buildkite/turbulenceconvection-ci/depot/cpu"
@@ -29,6 +31,9 @@ steps:
     command:
       - "echo $$JULIA_DEPOT_PATH"
 
+      - echo "--- Configure MPI"
+      - julia -e 'using Pkg; Pkg.add("MPIPreferences"); using MPIPreferences; use_system_binary()'
+
       - echo "--- Instantiate integration_tests"
       - "julia --project=integration_tests -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project=integration_tests -e 'using Pkg; Pkg.precompile()'"

diff --git a/Project.toml b/Project.toml
@@ -29,20 +29,20 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 CLIMAParameters = "0.7"
 ClimaCore = "0.10"
 ClimaComms = ">= 0.5.6"
-CloudMicrophysics = "0.10"
+CloudMicrophysics = "0.10, 0.11, 0.12"
 Dierckx = "0.5"
 Distributions = "0.25"
 DocStringExtensions = "0.8, 0.9"
-FastGaussQuadrature = "0.4, 0.5"
-Flux = "0.12, 0.13"
+FastGaussQuadrature = "0.4, 0.5, 1"
+Flux = "0.12, 0.13, 0.14"
 LambertW = "0.4"
 OperatorFlux = "0.1"
-SciMLBase = "1"
+SciMLBase = "1, 2"
 StaticArrays = "1.2"
-StatsBase = "0.33"
-StochasticDiffEq = "6.41"
-SurfaceFluxes = "0.4"
-Thermodynamics = "0.9, 0.10"
+StatsBase = "0.33, 0.34"
+StochasticDiffEq = "6"
+SurfaceFluxes = "0.6, 0.7, 0.8"
+Thermodynamics = "0.9, 0.10, 0.11"
 UnPack = "1.0"
 julia = "1.7"
 

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
diff --git a/integration_tests/Manifest.toml b/integration_tests/Manifest.toml
diff --git a/integration_tests/Project.toml b/integration_tests/Project.toml
@@ -54,12 +54,12 @@ AtmosphericProfilesLibrary = "0.1"
 CLIMAParameters = "0.7"
 ClimaCore = "0.10"
 ClimaComms = ">= 0.5.6"
-CloudMicrophysics = "0.10"
+CloudMicrophysics = "0.10, 0.11, 0.12"
 Dierckx = "0.5"
 Distributions = "0.25"
 DocStringExtensions = "0.8, 0.9"
-FastGaussQuadrature = "0.4, 0.5"
-Flux = "0.12, 0.13"
+FastGaussQuadrature = "0.4, 0.5, 1"
+Flux = "0.12, 0.13, 0.14"
 ForwardDiff = "0.10"
 Glob = "1.3"
 JSON = "0.21"
@@ -72,13 +72,13 @@ PoissonRandom = "0.4"
 PrettyTables = "1.2"
 RootSolvers = "0.2, 0.3"
 SOCRATESSingleColumnForcings = "0.9"
-SciMLBase = "1"
+SciMLBase = "1, 2"
 StaticArrays = "1.2"
-StatsBase = "0.33"
-StochasticDiffEq = "6.41"
-SurfaceFluxes = "0.4"
+StatsBase = "0.33, 0.34"
+StochasticDiffEq = "6"
+SurfaceFluxes = "0.6, 0.7, 0.8"
 TerminalLoggers = "0.1"
-Thermodynamics = "0.9, 0.10"
+Thermodynamics = "0.9, 0.10, 0.11"
 UnPack = "1.0"
 julia = "1.7"