Skip to content

Commit

Permalink
Drop direct dependency on ArtifactWrappers and bump
Browse files Browse the repository at this point in the history
Now the artifacts in ArtifactWrappers are only needed for the tests.
  • Loading branch information
Sbozzolo committed Oct 29, 2024
1 parent 35416b4 commit a4c5697
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 59 deletions.
3 changes: 0 additions & 3 deletions .buildkite/gpu_pipeline/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ steps:
- julia --project=perf -e 'using CUDA; CUDA.precompile_runtime()'
- julia --project=perf -e 'using Pkg; Pkg.status()'

- echo "--- Download artifacts"
- julia --project=examples artifacts/download_artifacts.jl

agents:
slurm_gpus: 1
slurm_cpus_per_task: 8
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/longruns_gpu/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ steps:
- julia --project=examples -e 'using CUDA; CUDA.precompile_runtime()'
- julia --project=examples -e 'using Pkg; Pkg.status()'

- echo "--- Download artifacts"
- julia --project=examples artifacts/download_artifacts.jl

agents:
slurm_gpus: 1
slurm_cpus_per_task: 8
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ steps:
- "julia --project=calibration/test -e 'using Pkg; Pkg.precompile()'"
- "julia --project=calibration/test -e 'using Pkg; Pkg.status()'"

- echo "--- Download artifacts"
- "julia --project=examples artifacts/download_artifacts.jl"

agents:
slurm_cpus_per_task: 8
slurm_gpus: 1
Expand Down
2 changes: 1 addition & 1 deletion .dev/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.5"
julia_version = "1.10.6"
manifest_format = "2.0"
project_hash = "b280bcf3b481823c97fa1a62c1b5e65114b8fa18"

Expand Down
21 changes: 12 additions & 9 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
ClimaAtmos.jl Release Notes
============================

Main
v0.27.8
-------

### Features

### ETOPO2022 60arc-second topography dataset.
### ![][badge-✨feature/enhancement] Improvements to Earth's topography

- Update artifacts to use 60arc-second ETOPO2022 ice-surface topography
dataset. Update surface smoothing functions to rely only on spectral
Laplacian operations. Update raw-topo gravity wave parameterization
dataset. Update interfaces in `make_hybrid_spaces` to support new
inputs using `SpaceVaryingInput` utility. Include a simple example
to generate spectra from scalar variables.
PR [3378](https://github.com/CliMA/ClimaAtmos.jl/pull/3378)
Starting with `0.27.8`, `ClimaAtmos` now uses the
[ETOPO2022](https://www.ncei.noaa.gov/products/etopo-global-relief-model)
dataset for topography (at 60arc-second resolution). The Gaussian smoothing
scheme was removed in favor of a diffusive scheme controlled by the
`topography_damping_factor`.

`ClimaAtmos` now also comes with an a simple example to generate spectra from
scalar variables.

PR [3378](https://github.com/CliMA/ClimaAtmos.jl/pull/3378)

v0.27.7
-------
Expand Down
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
name = "ClimaAtmos"
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
authors = ["Climate Modeling Alliance"]
version = "0.27.7"
version = "0.27.8"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
AtmosphericProfilesLibrary = "86bc3604-9858-485a-bdbe-831ec50de11d"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
Expand Down Expand Up @@ -37,7 +36,6 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"

[compat]
ArgParse = "1"
ArtifactWrappers = "0.2"
Artifacts = "1"
AtmosphericProfilesLibrary = "0.1.7"
ClimaComms = "0.6.4"
Expand Down
24 changes: 9 additions & 15 deletions docs/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.5"
julia_version = "1.10.6"
manifest_format = "2.0"
project_hash = "64afcb8dacf7a673d0068ba1a72602801e8d529a"

Expand Down Expand Up @@ -137,12 +137,6 @@ weakdeps = ["SparseArrays"]
[deps.ArrayLayouts.extensions]
ArrayLayoutsSparseArraysExt = "SparseArrays"

[[deps.ArtifactWrappers]]
deps = ["Downloads", "Pkg"]
git-tree-sha1 = "760f4c06375735829b8c1b67560b608b9dba4c6a"
uuid = "a14bc488-3040-4b00-9dc1-f6467924858a"
version = "0.2.0"

[[deps.Artifacts]]
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

Expand Down Expand Up @@ -295,10 +289,10 @@ weakdeps = ["SparseArrays"]
ChainRulesCoreSparseArraysExt = "SparseArrays"

[[deps.ClimaAtmos]]
deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
deps = ["ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.27.7"
version = "0.27.8"

[[deps.ClimaComms]]
git-tree-sha1 = "ec303a4a66dc0a0ebe15a639a7e685afeaa0daef"
Expand Down Expand Up @@ -827,9 +821,9 @@ version = "2.13.2+0"

[[deps.FreeTypeAbstraction]]
deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics"]
git-tree-sha1 = "2493cdfd0740015955a8e46de4ef28f49460d8bc"
git-tree-sha1 = "84dfe824bd6fdf2a5d73bb187ff31b5549b2a79c"
uuid = "663a7486-cb36-511b-a19d-713bb74d65c9"
version = "0.10.3"
version = "0.10.4"

[[deps.FriBidi_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
Expand Down Expand Up @@ -1825,9 +1819,9 @@ version = "1.3.4"

[[deps.RecursiveArrayTools]]
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "b034171b93aebc81b3e1890a036d13a9c4a9e3e0"
git-tree-sha1 = "43cdc0987135597867a37fc3e8e0fc9fdef6ac66"
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
version = "3.27.0"
version = "3.27.1"

[deps.RecursiveArrayTools.extensions]
RecursiveArrayToolsFastBroadcastExt = "FastBroadcast"
Expand Down Expand Up @@ -2167,9 +2161,9 @@ weakdeps = ["ClimaParams"]

[[deps.SymbolicIndexingInterface]]
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
git-tree-sha1 = "4bc96df5d71515b1cb86dd626915f06f4c0d46f5"
git-tree-sha1 = "20cf607cafb31f922bce84d60379203e7a126911"
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
version = "0.3.33"
version = "0.3.34"

[[deps.TOML]]
deps = ["Dates"]
Expand Down
20 changes: 10 additions & 10 deletions examples/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.5"
julia_version = "1.10.6"
manifest_format = "2.0"
project_hash = "0650226b22aae022a4fd4dd08a3323bee9fb506d"
project_hash = "8fc0a28be2d59204b24addc96ac4d34bf8655ff1"

[[deps.ADTypes]]
git-tree-sha1 = "eea5d80188827b35333801ef97a40c2ed653b081"
Expand Down Expand Up @@ -319,10 +319,10 @@ version = "0.5.7"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"

[[deps.ClimaAtmos]]
deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
deps = ["ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.27.7"
version = "0.27.8"

[[deps.ClimaComms]]
git-tree-sha1 = "ec303a4a66dc0a0ebe15a639a7e685afeaa0daef"
Expand Down Expand Up @@ -866,9 +866,9 @@ version = "2.13.2+0"

[[deps.FreeTypeAbstraction]]
deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics"]
git-tree-sha1 = "2493cdfd0740015955a8e46de4ef28f49460d8bc"
git-tree-sha1 = "84dfe824bd6fdf2a5d73bb187ff31b5549b2a79c"
uuid = "663a7486-cb36-511b-a19d-713bb74d65c9"
version = "0.10.3"
version = "0.10.4"

[[deps.FriBidi_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
Expand Down Expand Up @@ -1977,9 +1977,9 @@ version = "1.3.4"

[[deps.RecursiveArrayTools]]
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "b034171b93aebc81b3e1890a036d13a9c4a9e3e0"
git-tree-sha1 = "43cdc0987135597867a37fc3e8e0fc9fdef6ac66"
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
version = "3.27.0"
version = "3.27.1"

[deps.RecursiveArrayTools.extensions]
RecursiveArrayToolsFastBroadcastExt = "FastBroadcast"
Expand Down Expand Up @@ -2313,9 +2313,9 @@ weakdeps = ["ClimaParams"]

[[deps.SymbolicIndexingInterface]]
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
git-tree-sha1 = "4bc96df5d71515b1cb86dd626915f06f4c0d46f5"
git-tree-sha1 = "20cf607cafb31f922bce84d60379203e7a126911"
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
version = "0.3.33"
version = "0.3.34"

[[deps.TOML]]
deps = ["Dates"]
Expand Down
18 changes: 9 additions & 9 deletions perf/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.5"
julia_version = "1.10.6"
manifest_format = "2.0"
project_hash = "1b8f2c1a4c1bc4fd937f4c1ec969061b8acdbb19"

Expand Down Expand Up @@ -330,10 +330,10 @@ version = "0.5.6"
GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"

[[deps.ClimaAtmos]]
deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
deps = ["ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
path = ".."
uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
version = "0.27.7"
version = "0.27.8"

[[deps.ClimaComms]]
git-tree-sha1 = "ec303a4a66dc0a0ebe15a639a7e685afeaa0daef"
Expand Down Expand Up @@ -908,9 +908,9 @@ version = "2.13.2+0"

[[deps.FreeTypeAbstraction]]
deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics"]
git-tree-sha1 = "2493cdfd0740015955a8e46de4ef28f49460d8bc"
git-tree-sha1 = "84dfe824bd6fdf2a5d73bb187ff31b5549b2a79c"
uuid = "663a7486-cb36-511b-a19d-713bb74d65c9"
version = "0.10.3"
version = "0.10.4"

[[deps.FriBidi_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
Expand Down Expand Up @@ -2073,9 +2073,9 @@ version = "1.3.4"

[[deps.RecursiveArrayTools]]
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "b034171b93aebc81b3e1890a036d13a9c4a9e3e0"
git-tree-sha1 = "43cdc0987135597867a37fc3e8e0fc9fdef6ac66"
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
version = "3.27.0"
version = "3.27.1"

[deps.RecursiveArrayTools.extensions]
RecursiveArrayToolsFastBroadcastExt = "FastBroadcast"
Expand Down Expand Up @@ -2439,9 +2439,9 @@ weakdeps = ["ClimaParams"]

[[deps.SymbolicIndexingInterface]]
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
git-tree-sha1 = "4bc96df5d71515b1cb86dd626915f06f4c0d46f5"
git-tree-sha1 = "20cf607cafb31f922bce84d60379203e7a126911"
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
version = "0.3.33"
version = "0.3.34"

[[deps.TOML]]
deps = ["Dates"]
Expand Down
1 change: 1 addition & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
AtmosphericProfilesLibrary = "86bc3604-9858-485a-bdbe-831ec50de11d"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions test/dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ direct_dependencies =
known_dependencies = Set([
# ArgParse is used to read --config_file and --job_id from command line
"ArgParse",
# ArtifactWrappers is used to topography and gravity wave NetCDF data
"ArtifactWrappers",
"Artifacts",
"AtmosphericProfilesLibrary",
"ClimaComms",
Expand All @@ -55,7 +53,7 @@ known_dependencies = Set([
"NCDatasets",
"NVTX",
"RRTMGP",
# used to reset seed for random number generator used for cloudy RRTMGP runs to enable bit-wise reproducibility for tests
# Random is used to reset seed for random number generator used for cloudy RRTMGP runs to enable bit-wise reproducibility for tests
"Random",
"SciMLBase",
"StaticArrays",
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ redirect_stderr(IOContext(stderr, :stacktrace_types_limited => Ref(false)))
using SafeTestsets
using Test

# Download test artifacts
include("download_artifacts.jl")

#! format: off
@safetestset "Aqua" begin @time include("aqua.jl") end
@safetestset "Dependencies" begin @time include("dependencies.jl") end
Expand Down

0 comments on commit a4c5697

Please sign in to comment.