Skip to content

Commit

Permalink
Clean up some environments
Browse files Browse the repository at this point in the history
This commits removes some of the unused dependencies in various environments.

It also removes the direct dependency on CUDA and MPI (as for ClimaComms 0.6)
  • Loading branch information
Sbozzolo committed Aug 25, 2024
1 parent 0585711 commit d1c729b
Show file tree
Hide file tree
Showing 23 changed files with 907 additions and 968 deletions.
6 changes: 2 additions & 4 deletions .buildkite/amip/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ steps:

- echo "--- Instantiate AMIP env"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"

- echo "--- Download artifacts"
- "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
- "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
- "julia --project=artifacts artifacts/download_artifacts.jl"
- "julia --project=experiments/ClimaEarth/ artifacts/download_artifacts.jl"

agents:
slurm_gpus: 1
Expand Down
7 changes: 3 additions & 4 deletions .buildkite/benchmarks/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ steps:
command:
- echo "--- Instantiate experiments/ClimaEarth"
- julia --project=experiments/ClimaEarth -e 'using Pkg; Pkg.instantiate(;verbose=true)'
- julia --project=experiments/ClimaEarth -e 'using Pkg; Pkg.add("MPI"); Pkg.add("CUDA")'
- julia --project=experiments/ClimaEarth -e 'using Pkg; Pkg.precompile()'
- julia --project=experiments/ClimaEarth -e 'using Pkg; Pkg.status()'

- echo "--- Instantiate test env"
- "julia --project=test/ -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=test/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=test/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=test/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=test/ -e 'using Pkg; Pkg.status()'"

- echo "--- Download artifacts"
- "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
- "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
- "julia --project=artifacts artifacts/download_artifacts.jl"
- "julia --project=experiments/ClimaEarth artifacts/download_artifacts.jl"

agents:
slurm_gpus: 1
Expand Down
8 changes: 3 additions & 5 deletions .buildkite/hierarchies/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ steps:

- echo "--- Instantiate AMIP env"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"

- echo "--- Download artifacts"
- "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
- "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
- "julia --project=artifacts artifacts/download_artifacts.jl"
- "julia --project=experiments/ClimaEarth/ artifacts/download_artifacts.jl"

agents:
queue: clima
Expand Down Expand Up @@ -106,4 +104,4 @@ steps:
queue: clima
slurm_mem: 20GB
slurm_gpus: 1
modules: common
modules: common
10 changes: 6 additions & 4 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,39 @@ steps:

- echo "--- Instantiate sea breeze env"
- "julia --project=experiments/ClimaCore/sea_breeze -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/ClimaCore/sea_breeze -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=experiments/ClimaCore/sea_breeze -e 'using Pkg; Pkg.precompile()'"
- "julia --project=experiments/ClimaCore/sea_breeze -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate climacore exp env"
- "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=experiments/ClimaCore/ -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate ClimaEarth env"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=experiments/ClimaEarth/ -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate perf env"
- "julia --project=perf/ -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=perf/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=perf/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=perf/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=perf/ -e 'using Pkg; Pkg.status()'"

- echo "--- Instantiate test env"
- "julia --project=test/ -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=test/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=test/ -e 'using Pkg; Pkg.add(\"MPI\"); Pkg.add(\"CUDA\")'"
- "julia --project=test/ -e 'using Pkg; Pkg.precompile()'"
- "julia --project=test/ -e 'using Pkg; Pkg.status()'"

- echo "--- Download artifacts"
- "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
- "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
- "julia --project=artifacts artifacts/download_artifacts.jl"
- "julia --project=experiments/ClimaEarth/ artifacts/download_artifacts.jl"

concurrency: 1
concurrency_group: 'depot/climacoupler-ci'
Expand Down
10 changes: 0 additions & 10 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,26 @@ authors = ["CliMA Contributors <clima-software@caltech.edu>"]
version = "0.1.1"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
TempestRemap_jll = "8573a8c5-1df0-515e-a024-abad257ee284"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"

[compat]
CUDA = "5"
ClimaComms = "0.5.6, 0.6"
ClimaCore = "0.14.6"
ClimaCoreTempestRemap = "0.3"
Dates = "1"
DocStringExtensions = "0.8, 0.9"
JLD2 = "0.4"
NCDatasets = "0.11, 0.12, 0.13, 0.14.2"
Plots = "1.39.0"
SciMLBase = "1, 2"
StaticArrays = "1"
Statistics = "1"
SurfaceFluxes = "0.11"
TempestRemap_jll = "2"
Thermodynamics = "0.12.4"
julia = "1.8"
3 changes: 1 addition & 2 deletions docs/src/conservation.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ Note that kinetic energy is not included in the calculation of the global energy
ClimaCoupler.ConservationChecker.EnergyConservationCheck
ClimaCoupler.ConservationChecker.WaterConservationCheck
ClimaCoupler.ConservationChecker.check_conservation!
ClimaCoupler.ConservationChecker.plot_global_conservation
```

## ConservationChecker Internal Functions
```@docs
ClimaCoupler.ConservationChecker.surface_water_gain_from_rates
```
```
Loading

0 comments on commit d1c729b

Please sign in to comment.