Skip to content

Commit

Permalink
Merge pull request #168 from CliMA/ck/fix_ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
charleskawczynski authored Oct 10, 2023
2 parents b49cb72 + fed42c9 commit d7673e1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 54 deletions.
5 changes: 5 additions & 0 deletions .buildkite/JuliaProject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[extras]
CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"

[preferences.CUDA_Runtime_jll]
version = "local"
66 changes: 19 additions & 47 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,37 @@
agents:
queue: central
slurm_mem: 8G
modules: julia/1.9.3 cuda/12.2

env:
JULIA_VERSION: "1.9.3"
OPENBLAS_NUM_THREADS: 1
CUDA_VERSION: "10.2"
JULIA_PKG_SERVER: ""
CUDA_VERSION: "12.2"
OMPI_MCA_opal_warn_on_missing_libcuda: 0
JULIA_CPU_TARGET: 'broadwell;skylake'

steps:
- label: "init cpu environment :computer:"
key: "init_cpu_env"
- label: "init environment :computer:"
key: "init_env"
command:
- "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.resolve()'"
- "julia --project=test -e 'using Pkg; Pkg.precompile()'"
- "julia --project=test -e 'using Pkg; Pkg.status()'"
- echo "--- Instantiate test env"
- julia --project=test -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); Pkg.status()'

- "julia --project=perf -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=perf -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=perf -e 'using Pkg; Pkg.resolve()'"
- "julia --project=perf -e 'using Pkg; Pkg.precompile()'"
- "julia --project=perf -e 'using Pkg; Pkg.status()'"
agents:
config: cpu
queue: central
slurm_ntasks: 1
- echo "--- Instantiate perf env"
- julia --project=perf -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); Pkg.status()'

- label: "init gpu environment :computer:"
key: "init_gpu_env"
command:
- "julia --project=gpuenv -e 'using Pkg; Pkg.develop(path=\".\")'"
- "julia --project=gpuenv -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
- "julia --project=gpuenv -e 'using Pkg; Pkg.resolve()'"
- "julia --project=gpuenv -e 'using Pkg; Pkg.precompile()'"
- "julia --project=gpuenv -e 'using Pkg; Pkg.status()'"
- echo "--- Instantiate gpu env"
- julia --project=gpuenv -e 'using Pkg; Pkg.develop(path="."); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); using CUDA; CUDA.precompile_runtime(); Pkg.status()'
agents:
config: gpu
queue: central
slurm_ntasks: 1
slurm_gres: "gpu:1"
slurm_gpus: 1

- wait

- label: "CPU tests"
command:
- "julia --project=test test/runtests.jl"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

Expand All @@ -55,63 +41,49 @@ steps:
artifact_paths:
- "perf/allocations_output/*"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

- label: ":mag::rocket: Constructor benchmarks"
command:
- "julia --project=perf perf/benchmark.jl"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

- label: ":mag::rocket: Constructor micro-benchmarks"
command:
- "julia --project=perf perf/microbenchmarks.jl"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

- label: ":mag::rocket: Constructor flop measurements"
command:
- "julia --project=perf perf/flops.jl"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

- label: ":mag::rocket: JET tests"
command:
- "julia --project=perf perf/jet.jl"
agents:
config: cpu
queue: central
slurm_ntasks: 1
timeout_in_minutes: 60

- label: "KernelAbstraction GPU tests"
command:
- "julia --project=gpuenv test/runtests_gpu.jl CuArray"
agents:
config: gpu
queue: central
slurm_ntasks: 1
slurm_gres: "gpu:1"
slurm_gpus: 1
timeout_in_minutes: 60

- label: "KernelAbstraction CPU tests"
command:
- "julia --project=gpuenv test/runtests_gpu.jl"
agents:
config: gpu # we control CPU/GPU flag in script
queue: central
slurm_ntasks: 1
slurm_gres: "gpu:1"
slurm_gpus: 1
timeout_in_minutes: 60
5 changes: 2 additions & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ format = Documenter.HTML(
collapselevel = 1,
)

makedocs(
bib,
makedocs(;
plugins = [bib],
sitename = "Thermodynamics.jl",
strict = true,
format = format,
checkdocs = :exports,
clean = true,
Expand Down
4 changes: 0 additions & 4 deletions docs/src/DevDocs.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,10 @@ include("saturation_adjustment.jl")
:-----------------:|:-----------------:|:---------------------:
SecantMethod | ![](3DSpace_converged_SecantMethod.svg) | ![](3DSpace_non_converged_SecantMethod.svg)
NewtonsMethod | ![](3DSpace_converged_NewtonsMethod.svg) | ![](3DSpace_non_converged_NewtonsMethod.svg)
NewtonsMethodAD | ![](3DSpace_converged_NewtonsMethodAD.svg) | ![](3DSpace_non_converged_NewtonsMethodAD.svg)
RegulaFalsiMethod | ![](3DSpace_converged_RegulaFalsiMethod.svg) | ![](3DSpace_non_converged_RegulaFalsiMethod.svg)

## 2D slices, binned by total specific humidity

| Numerical method | Converged | Non-converged |
:-----------------:|:-----------------:|:---------------------:
SecantMethod | ![](2DSlice_converged_SecantMethod.svg) | ![](2DSlice_non_converged_SecantMethod.svg)
NewtonsMethod | ![](2DSlice_converged_NewtonsMethod.svg) | ![](2DSlice_non_converged_NewtonsMethod.svg)
NewtonsMethodAD | ![](2DSlice_converged_NewtonsMethodAD.svg) | ![](2DSlice_non_converged_NewtonsMethodAD.svg)
RegulaFalsiMethod | ![](2DSlice_converged_RegulaFalsiMethod.svg) | ![](2DSlice_non_converged_RegulaFalsiMethod.svg)

0 comments on commit d7673e1

Please sign in to comment.