Skip to content

Commit 36060bc

Browse files
authored
Merge pull request #1163 from CliMA/js/eisenman_test
move experiment-related tests into experiments/
2 parents 60b272d + b273f77 commit 36060bc

35 files changed

+100
-85
lines changed

.buildkite/pipeline.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,28 @@ steps:
8787
slurm_ntasks: 2
8888
slurm_mem: 16GB
8989

90-
- group: "GPU: unit tests and global bucket"
90+
- group: "GPU: unit tests"
9191
steps:
9292
- label: "GPU runtests"
9393
command: "julia --color=yes --project=test/ test/runtests.jl"
94+
timeout_in_minutes: 10
9495
env:
9596
CLIMACOMMS_DEVICE: "CUDA"
9697
agents:
9798
slurm_ntasks: 1
9899
slurm_gres: "gpu:1"
99100

101+
- group: "GPU: experiments/ClimaEarth/ unit tests and global bucket"
102+
steps:
103+
- label: "GPU ClimaEarth runtests"
104+
command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/test/runtests.jl"
105+
env:
106+
CLIMACOMMS_DEVICE: "CUDA"
107+
agents:
108+
slurm_ntasks: 1
109+
slurm_gres: "gpu:1"
110+
slurm_mem: 20GB
111+
100112
- group: "Integration Tests"
101113
steps:
102114
# SLABPLANET EXPERIMENTS

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ jobs:
4242
with:
4343
token: ${{secrets.CODECOV_TOKEN}}
4444
file: lcov.info
45-
# Run own downstream test
4645
- run: |
4746
julia --color=yes --project=experiments/ClimaEarth -e 'using Pkg; Pkg.instantiate()'
4847
julia --color=yes --project=experiments/ClimaEarth -e 'using Pkg; Pkg.develop(; path = ".")'
4948
julia --color=yes --project=experiments/ClimaEarth experiments/ClimaEarth/test/runtests.jl
49+
- run: |
50+
julia --color=yes --project=experiments/ClimaCore -e 'using Pkg; Pkg.instantiate()'
51+
julia --color=yes --project=experiments/ClimaCore -e 'using Pkg; Pkg.develop(; path = ".")'
52+
julia --color=yes --project=experiments/ClimaCore experiments/ClimaCore/test/runtests.jl

NEWS.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@ Simulation constructor functions have been renamed to use the simulation name
6161
itself, following general convention for constructor naming. For example,
6262
`atmos_init` is now `ClimaAtmosSimulation`, and `bucket_init` is now `BucketSimulation`.
6363

64+
### Maintenance
65+
66+
#### Experiment-related tests moved into `experiments/`
67+
68+
Tests for code in the `experiments/` folder, including for component models and
69+
debug plotting have been moved into the `experiments/ClimaEarth/` and
70+
`experiments/ClimaCore` folders. This allows us to remove packages from the `test/`
71+
environment and keep the `experiments/` environments more self-contained.
72+
Github Actions have been added for the new `experiments/ClimaCore/` tests.
73+
6474
v0.1.2
6575
-------
6676
### ClimaEarth features

experiments/ClimaCore/Manifest-v1.11.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.3"
44
manifest_format = "2.0"
5-
project_hash = "b6cbe13d934b7f3ccadeae41de95b2b7ff9f5a93"
5+
project_hash = "ad754c4de2c5018aafa70f420d0cb2fa7d55629c"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "e1ce448a0d7f88168ffe2eeac4549c32d45a42d1"

experiments/ClimaCore/Manifest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.8"
44
manifest_format = "2.0"
5-
project_hash = "d3b37da9bc41e3d502bc74f4602d49a5270bcbe0"
5+
project_hash = "64dfae3f3aedb6050f0e3adb679ec45b4a536fac"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "e1ce448a0d7f88168ffe2eeac4549c32d45a42d1"

experiments/ClimaCore/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
3+
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
34
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
45
ClimaCoreMakie = "908f55d8-4145-4867-9c14-5dad1a479e4d"
56
ClimaCoupler = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
@@ -11,6 +12,7 @@ PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
1112
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1213
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1314
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
15+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1416

1517
[compat]
1618
ClimaTimeSteppers = "0.7, 0.8"

test/experiment_tests/coupled_sims.jl renamed to experiments/ClimaCore/test/coupled_sims.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ClimaComms
44
import ClimaCore as CC
55

66
# Load file to test
7-
include("../../experiments/ClimaCore/CoupledSims/coupled_sim.jl")
7+
include("../CoupledSims/coupled_sim.jl")
88

99
@testset "Clock" begin
1010
time_info = (start = 0.0, dt = 0.5, stop = 2.0)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include("coupled_sims.jl")

experiments/ClimaEarth/Artifacts.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[land_mask]
22
git-tree-sha1 = "e41bc8c44124f867b64a9d70f1599515ae27f38a"
33

4-
[test]
5-
git-tree-sha1 = "b377e7c997804b47720b8e7243361d399d108441"
6-
74
[cmip_model_rmse]
85
git-tree-sha1 = "53a27731c0a2ec60756af24e4c60ac37da4a32bc"
96

experiments/ClimaEarth/Manifest-v1.11.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.3"
44
manifest_format = "2.0"
5-
project_hash = "3415332e21aefaec4a8b7eaa296b17c06ec5dc6f"
5+
project_hash = "596da7323d701a422b47dcfa22865cd7882d77e2"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "e1ce448a0d7f88168ffe2eeac4549c32d45a42d1"
@@ -2030,6 +2030,11 @@ git-tree-sha1 = "9a325057cdb9b066f1f96dc77218df60fe3007cb"
20302030
uuid = "76ed43ae-9a5d-5a62-8c75-30186b810ce8"
20312031
version = "3.48.0+0"
20322032

2033+
[[deps.SafeTestsets]]
2034+
git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3"
2035+
uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
2036+
version = "0.1.0"
2037+
20332038
[[deps.SciMLBase]]
20342039
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
20352040
git-tree-sha1 = "46c4a97031b9437d5adbb382958820a8ee188c64"

0 commit comments

Comments
 (0)