Skip to content

Commit

Permalink
fix docstring,typo in e2e test
Browse files Browse the repository at this point in the history
  • Loading branch information
@nefrathenrici
nefrathenrici committed Jul 2, 2024
1 parent ab76c23 commit 85ee7da
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
test:
name: ci ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: 45
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions calibration/model_interface.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ClimaCalibrate:

"""
set_up_forward_model(member, iteration, experiment_dir::AbstractString)
set_up_forward_model(member, iteration, ::ExperimentConfig)
set_up_forward_model(member, iteration, config_dict::AbstractDict)
Return an AtmosConfig object for the given member and iteration.
Expand Down
44 changes: 22 additions & 22 deletions calibration/test/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ manifest_format = "2.0"
project_hash = "89884ed7a225cc54d4e13a752a3036d05d402c43"

[[deps.ADTypes]]
git-tree-sha1 = "fa0822e5baee6e23081c2685ae27265dabee23d8"
git-tree-sha1 = "3a6511b6e54550bcbc986c560921a8cd7761fcd8"
uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
version = "1.4.0"
version = "1.5.1"
weakdeps = ["ChainRulesCore", "EnzymeCore"]

[deps.ADTypes.extensions]
Expand Down Expand Up @@ -137,9 +137,9 @@ version = "7.11.0"

[[deps.ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra"]
git-tree-sha1 = "420e2853770f50e5306b9d96b5a66f26e7c73bc6"
git-tree-sha1 = "600078184f7de14b3e60efe13fc0ba5c59f6dca5"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "1.9.4"
version = "1.10.0"
weakdeps = ["SparseArrays"]

[deps.ArrayLayouts.extensions]
Expand All @@ -156,9 +156,9 @@ uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

[[deps.AtmosphericProfilesLibrary]]
deps = ["Dierckx", "LinearAlgebra"]
git-tree-sha1 = "c6be1ce28b7870a60400c51c75dc1b08d6a8dd73"
git-tree-sha1 = "5c63ec6a9d190d2c10bb2045a8ccbe3a45cf7b88"
uuid = "86bc3604-9858-485a-bdbe-831ec50de11d"
version = "0.1.4"
version = "0.1.5"

[[deps.Atomix]]
deps = ["UnsafeAtomics"]
Expand Down Expand Up @@ -311,15 +311,15 @@ version = "0.5.3"
deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Colors", "Dates", "Dierckx", "DiffEqBase", "DocStringExtensions", "FastGaussQuadrature", "Insolation", "Interpolations", "IntervalSets", "Krylov", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "Pkg", "Printf", "RRTMGP", "Random", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "YAML"]
path = "../.."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.26.0"
version = "0.26.2"

[[deps.ClimaCalibrate]]
deps = ["Distributions", "EnsembleKalmanProcesses", "JLD2", "Random", "TOML", "YAML"]
git-tree-sha1 = "b281e4e1e6713cf5f26088837107842a64cbc987"
git-tree-sha1 = "39a5164998bb7b9f54c9504975551525ec0be2d5"
repo-rev = "main"
repo-url = "https://github.com/CliMA/ClimaCalibrate.jl.git"
uuid = "4347a170-ebd6-470c-89d3-5c705c0cacc2"
version = "0.1.0"
version = "0.0.1"

[deps.ClimaCalibrate.extensions]
CESExt = "CalibrateEmulateSample"
Expand All @@ -328,9 +328,9 @@ version = "0.1.0"
CalibrateEmulateSample = "95e48a1f-0bec-4818-9538-3db4340308e3"

[[deps.ClimaComms]]
git-tree-sha1 = "d76590e99fa942e07f1e992a4d4a5e25121a26d6"
git-tree-sha1 = "2ca8c9ca6131a7be8ca262e6db79bc7aa94ab597"
uuid = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
version = "0.6.2"
version = "0.6.3"

[deps.ClimaComms.extensions]
ClimaCommsCUDAExt = "CUDA"
Expand Down Expand Up @@ -751,9 +751,9 @@ uuid = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
version = "1.0.4"

[[deps.EnzymeCore]]
git-tree-sha1 = "88bc63137eb033acc3afe1b9875717889c718c46"
git-tree-sha1 = "3a3177ba05b4763234819060fb6c2e1613379ca6"
uuid = "f151be2c-9106-41f4-ab19-57ee4f262869"
version = "0.7.5"
version = "0.7.6"
weakdeps = ["Adapt"]

[deps.EnzymeCore.extensions]
Expand Down Expand Up @@ -1254,9 +1254,9 @@ version = "0.6.0"

[[deps.KernelAbstractions]]
deps = ["Adapt", "Atomix", "InteractiveUtils", "LinearAlgebra", "MacroTools", "PrecompileTools", "Requires", "SparseArrays", "StaticArrays", "UUIDs", "UnsafeAtomics", "UnsafeAtomicsLLVM"]
git-tree-sha1 = "8e5a339882cc401688d79b811d923a38ba77d50a"
git-tree-sha1 = "b8fcefe4418e4a7a2c3aaac883fecddd8efbe286"
uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
version = "0.9.20"
version = "0.9.21"
weakdeps = ["EnzymeCore"]

[deps.KernelAbstractions.extensions]
Expand Down Expand Up @@ -1531,9 +1531,9 @@ version = "2024.1.0+0"

[[deps.MPI]]
deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"]
git-tree-sha1 = "4e3136db3735924f96632a5b40a5979f1f53fa07"
git-tree-sha1 = "14cef41baf5b675b192b02a22c710f725ab333a7"
uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195"
version = "0.20.19"
version = "0.20.20"

[deps.MPI.extensions]
AMDGPUExt = "AMDGPU"
Expand Down Expand Up @@ -2012,10 +2012,10 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[[deps.RRTMGP]]
deps = ["Adapt", "Artifacts", "ClimaComms", "DocStringExtensions", "GaussQuadrature", "Random", "StaticArrays"]
git-tree-sha1 = "99c20537c2df9010863e7ee641a2ecb214898b0f"
deps = ["Adapt", "Artifacts", "ClimaComms", "DocStringExtensions", "Random"]
git-tree-sha1 = "866d94b4cf46fe3a0ffd35d1414a3a4181c9db08"
uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
version = "0.14.0"
version = "0.17.0"

[deps.RRTMGP.extensions]
CreateParametersExt = "ClimaParams"
Expand Down Expand Up @@ -2523,9 +2523,9 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
version = "0.5.24"

[[deps.TranscodingStreams]]
git-tree-sha1 = "a947ea21087caba0a798c5e494d0bb78e3a1a3a0"
git-tree-sha1 = "d73336d81cafdc277ff45558bb7eaa2b04a8e472"
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
version = "0.10.9"
version = "0.10.10"
weakdeps = ["Random", "Test"]

[deps.TranscodingStreams.extensions]
Expand Down
8 changes: 4 additions & 4 deletions calibration/test/e2e_test.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ end
end

# Run calibration
CAL.initialize(experiment_config)
julia_eki = minimal_eki_test(test_eki)
julia_eki = CAL.calibrate(CAL.JuliaBackend, experiment_config)
minimal_eki_test(julia_eki)

@testset "Julia-only comparison calibration" begin
minimal_eki_test(julia_eki)
end

@testset "Compare $backend output to CAL.JuliaBackend" begin
for (uu, slurm_uu) in zip(EKP.get_u(julia_eki), EKP.get_u(slurm_eki))
@testset "Compare $backend output to JuliaBackend" begin
for (uu, slurm_uu) in zip(EKP.get_u(julia_eki), EKP.get_u(test_eki))
@test uu ≈ slurm_uu rtol = 0.02
end
end
Expand Down

0 comments on commit 85ee7da

Please sign in to comment.