Skip to content

Commit

Permalink
Merge pull request #19 from CliMA/gb/inputs
Browse files Browse the repository at this point in the history
Add FileReaders, DataHandling, SpaceVaryingInuts, TimeVaryingInputs, ClimaArtifacts
  • Loading branch information
Sbozzolo committed Mar 27, 2024
2 parents 8815b95 + 65f2c8c commit f16b770
Show file tree
Hide file tree
Showing 49 changed files with 4,858 additions and 49 deletions.
45 changes: 45 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
agents:
queue: new-central
slurm_mem: 8G
modules: climacommon/2024_03_18

env:
JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite"
JULIA_DEPOT_PATH: "${BUILDKITE_BUILD_PATH}/${BUILDKITE_PIPELINE_SLUG}/depot/default"
SLURM_KILL_BAD_EXIT: 1

steps:
- label: "init :computer:"
key: "init_cpu_env"
command:
- "echo $$JULIA_DEPOT_PATH"

- echo "--- Instantiate project"
- "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.precompile()'"
- "julia --project=test -e 'using Pkg; Pkg.status()'"
agents:
slurm_cpus_per_task: 8
slurm_gpus: 1

- wait

- label: "Run tests on CPU"
key: "cpu_tests"
command:
- "julia --project=test test/runtests.jl"

- label: "Run tests on GPU"
key: "gpu_tests"
command:
- "julia --project=test test/runtests.jl"
agents:
slurm_gpus: 1

- label: "Run tests with MPI"
key: "mpi_tests"
command:
- "julia --project=test test/runtests.jl"
agents:
slurm_cpus_per_task: 2
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
8 changes: 3 additions & 5 deletions .github/workflows/CodeCov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
branches:
- main
- trying
- staging
tags: '*'
pull_request:

Expand All @@ -14,12 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4

- name: Set up Julia
uses: julia-actions/setup-julia@latest
with:
version: 1.9
version: '1.10'
- name: Test with coverage
env:
JULIA_PROJECT: "@."
Expand All @@ -35,7 +33,7 @@ jobs:
if: success()

- name: Submit coverage
uses: codecov/codecov-action@v1.0.7
uses: codecov/codecov-action@v3
with:
token: ${{secrets.CODECOV_TOKEN}}
if: success()
4 changes: 1 addition & 3 deletions .github/workflows/JuliaFormatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
push:
branches:
- main
- trying
- staging
tags: '*'
pull_request:

Expand All @@ -19,7 +17,7 @@ jobs:
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v2.2.0
- uses: actions/checkout@v4

- uses: dorny/[email protected]
id: filter
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
matrix:
version:
- '1.9'
- '1.10'
os:
- ubuntu-latest
- macOS-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
docbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: 1.9
Expand Down
33 changes: 30 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,39 @@
name = "ClimaUtilities"
uuid = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
authors = ["Julia Sloan <[email protected]>"]
version = "0.1.1"
authors = ["Gabriele Bozzola <[email protected]>", "Julia Sloan <[email protected]>"]
version = "0.1.2"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
CFTime = "179af706-886a-5703-950a-314cd64e0468"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

[weakdeps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"

[extensions]
ClimaArtifactsExt = ["ClimaComms"]
DataHandlingExt = ["ClimaCore", "NCDatasets"]
InterpolationsRegridderExt = ["Interpolations", "ClimaCore"]
NCFileReaderExt = "NCDatasets"
SpaceVaryingInputsExt = ["ClimaCore", "NCDatasets"]
TempestRegridderExt = "ClimaCoreTempestRemap"
TimeVaryingInputs0DExt = "ClimaCore"
TimeVaryingInputsExt = ["ClimaCore", "NCDatasets"]

[compat]
Adapt = "3, 4"
Artifacts = "1"
CFTime = "0.1"
julia = "1.8"
ClimaComms = "0.5"
ClimaCore = "0.11, 0.12, 0.13"
ClimaCoreTempestRemap = "0.3"
Dates = "1"
Interpolations = "0.15"
NCDatasets = "0.13, 0.14"
julia = "1.9"
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# ClimaUtilities.jl
Shared utilities for packages within the CliMA project.

These will include modules for regridding spatial data, temporal interpolation,
and reading in data from input files. This functionality will be used by multiple
packages including ClimaAtmos, ClimaLSM, and ClimaCoupler.
<h1 align="center">
<img src="logo.svg" width="180px"> <br>
ClimaUtilities.jl
</h1>

[WIP] Each of these modules is currently duplicated in multiple of the packages
listed above. The goal of this repo is to consolidate this code in one place,
and extend it to meet the needs of each of these users.
Shared utilities for packages within the CliMA project.

Portions of this package were developed as part of the
[ClimaCoupler.jl](https://github.com/CliMA/ClimaCoupler.jl) package.
> :warning: README under construction. While we work on the README, you can find
> all the relevant information in the
> [documentation](https://clima.github.io/ClimaUtilities.jl/dev/).
Loading

2 comments on commit f16b770

@Sbozzolo
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/103725

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.2 -m "<description of version>" f16b7702f0caccb43966c89f9c2b0cf8187f2cb2
git push origin v0.1.2

Please sign in to comment.