Skip to content

Commit 70741aa

Browse files
Merge #121
121: reconfigure testing suite to match climacore r=nefrathenrici a=nefrathenrici ## Content - Updates the test project and pipeline to match climacore format - Remove old versions of thermodynamics, since they break the tests - Increase the minor version because this is a breaking change Co-authored-by: nefrathenrici <[email protected]>
2 parents 9126968 + ce4ad77 commit 70741aa

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@ steps:
77
key: "init_cpu_env"
88
command:
99
- "echo $JULIA_DEPOT_PATH"
10-
- "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
11-
- "julia --project -e 'using Pkg; Pkg.precompile()'"
12-
- "julia --project -e 'using Pkg; Pkg.status()'"
13-
14-
- "julia --project=test/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
15-
- "julia --project=test/ -e 'using Pkg; Pkg.precompile()'"
16-
- "julia --project=test/ -e 'using Pkg; Pkg.status()'"
10+
- "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.precompile()'"
11+
- "julia --project=test/ -e 'using Pkg; Pkg.develop(path=\".\"); Pkg.instantiate(;verbose=true); Pkg.precompile(); '"
1712

1813
agents:
1914
config: cpu
@@ -40,15 +35,15 @@ steps:
4035

4136
- label: "CPU tests"
4237
command:
43-
- "julia --project -e 'using Pkg; Pkg.test()'"
38+
- "julia --project=test --color=yes test/runtests.jl"
4439
agents:
4540
config: cpu
4641
queue: central
4742
slurm_ntasks: 1
4843

4944
- label: "GPU tests"
5045
command:
51-
- "julia --project -e 'using Pkg; Pkg.test(;test_args=[\"CuArray\"])'"
46+
- "julia --project=test --color=yes test/runtests.jl CuArray"
5247
agents:
5348
config: gpu
5449
queue: central

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "SurfaceFluxes"
22
uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
33
authors = ["Climate Modeling Alliance"]
4-
version = "0.6.4"
4+
version = "0.7.0"
55

66
[deps]
77
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
@@ -17,5 +17,5 @@ DocStringExtensions = "0.8, 0.9"
1717
KernelAbstractions = "0.5, 0.6, 0.7, 0.8, 0.9"
1818
RootSolvers = "0.2, 0.3"
1919
StaticArrays = "1"
20-
Thermodynamics = "0.9, 0.10, 0.11"
21-
julia = "1.6"
20+
Thermodynamics = "0.11"
21+
julia = "1.9"

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1212
RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74"
1313
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1414
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
15+
SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
1516
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1617
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
1718
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"

test/runtests.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ thermo_params = SFP.thermodynamics_params(param_set)
2020
uft = SFP.universal_func_type(param_set)
2121

2222
const TD = Thermodynamics
23+
device(::T) where {T <: Array} = CPU()
2324

2425
# FIXME: Refactor tests to work on GPUs as in `Thermodynamics.jl`
25-
#if get(ARGS, 1, "Array") == "CuArray"
26+
# if get(ARGS, 1, "Array") == "CuArray"
2627
# using CUDA
2728
# import CUDAKernels: CUDADevice
2829
# ArrayType = CUDA.CuArray
29-
# CUDA.allowscalar(false)
3030
# device(::T) where {T <: CuArray} = CUDADevice()
31-
#else
31+
# CUDA.allowscalar(false)
32+
# else
3233
ArrayType = Array
33-
device(::T) where {T <: Array} = CPU()
34-
#end
34+
# end
3535

3636
@show ArrayType
3737

0 commit comments

Comments
 (0)