Merge #318

318: Update CI to Julia 1.7 r=jakebolewski a=jakebolewski



Co-authored-by: Jake Bolewski <[email protected]>

.buildkite/pipeline.yml

@@ -1,5 +1,5 @@
 env:
- JULIA_VERSION: "1.6.2"
+ JULIA_VERSION: "1.7.0"
  CUDA_VERSION: "11.2"
  OPENBLAS_NUM_THREADS: 1
 
@@ -394,28 +394,3 @@ steps:
  config: cpu
  queue: central
  slurm_ntasks: 1
-
- - label: ":flower_playing_cards: Bickley jet DG"
- key: "benchmark_bickleyjet_dg"
- command:
- - "julia --color=yes --project=benchmarks/bickleyjet benchmarks/bickleyjet/core_vs_ref.jl"
- artifact_paths:
- - "benchmarks/bickleyjet/*.png"
- agents:
- config: gpu
- queue: central
- slurm_ntasks: 1
- slurm_gres: "gpu:1"
-
- - label: ":computer: :fast_forward: Bickley jet DG reference thread scaling"
- key: "cpu_benchmark_bickleyjet_dg_thread_scaling"
- command:
- - "julia --color=yes --project=benchmarks/bickleyjet benchmarks/bickleyjet/ref_thread_scaling.jl"
- artifact_paths:
- - "benchmarks/bickleyjet/*.png"
- agents:
- config: cpu
- queue: central
- slurm_ntasks: 1
- slurm_cpus_per_task: 16
- slurm_exclusive: ""

.github/workflows/JuliaFormatter.yml

@@ -27,11 +27,11 @@ jobs:
  filters: |
  julia_file_change:
  - added|modified: '**.jl'
- 
+
  - uses: julia-actions/setup-julia@latest
  if: steps.filter.outputs.julia_file_change == 'true'
  with:
- version: 1.6
+ version: 1.7
 
  - name: Apply JuliaFormatter
  if: steps.filter.outputs.julia_file_change == 'true'

.github/workflows/Linux-UnitTests.yml

@@ -16,7 +16,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- julia-version: ['1.6', '1.7-nightly']
+ julia-version: ['1.6', '1.7']
 
  env:
  CLIMATEMACHINE_SETTINGS_FIX_RNG_SEED: "true"

.github/workflows/OS-UnitTests.yml

@@ -27,7 +27,7 @@ jobs:
 
  - name: Checkout
  uses: actions/[email protected]
- 
+
  # Setup a filter and only run if src/ test/ folder content changes
  # or project depedencies
  - uses: dorny/paths-filter@v2
@@ -45,15 +45,15 @@ jobs:
  uses: julia-actions/setup-julia@latest
  if: steps.filter.outputs.run_test == 'true'
  with:
- version: 1.6
+ version: 1.7
 
  - name: Cache artifacts
  uses: actions/cache@v1
  if: steps.filter.outputs.run_test == 'true'
  env:
  cache-name: cache-artifacts
  with:
- path: ~/.julia/artifacts 
+ path: ~/.julia/artifacts
  key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
  restore-keys: |
  ${{ runner.os }}-test-${{ env.cache-name }}-

.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
  - uses: actions/checkout@v2
  - uses: julia-actions/setup-julia@latest
  with:
- version: 1.6.0
+ version: 1.7
  - name: Install dependencies
  run: |
  julia --project -e 'using Pkg; Pkg.instantiate()'

examples/bickleyjet/bickleyjet_cg.jl

@@ -145,4 +145,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)

examples/bickleyjet/bickleyjet_cg_invariant_hypervisc.jl

@@ -146,4 +146,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)

examples/bickleyjet/bickleyjet_cg_unsmesh.jl

@@ -131,10 +131,10 @@ mkpath(path)
 anim = Plots.@animate for u in sol.u
  Plots.plot(u.ρθ, clim = (-1, 1))
 end
-Plots.mp4(anim, joinpath(path, "tracer_uns2dmesh.mp4"), fps = 10)
+Plots.mp4(anim, joinpath(path, "tracer.mp4"), fps = 10)
 
 Es = [total_energy(u, parameters) for u in sol.u]
-Plots.png(Plots.plot(Es), joinpath(path, "energy_uns2dmesh.png"))
+Plots.png(Plots.plot(Es), joinpath(path, "energy.png"))
 
 
 function linkfig(figpath, alt = "")
@@ -146,4 +146,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy_uns2dmesh.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)

examples/bickleyjet/bickleyjet_dg.jl

@@ -250,4 +250,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/energy.png", "Total Energy")
+linkfig(
+ relpath(joinpath(path, "energy.png"), joinpath(@__DIR__, "../..")),
+ "Total Energy",
+)

examples/column/advect.jl

@@ -209,4 +209,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/advect_end.png", "Advect End Simulation")
+linkfig(
+ relpath(joinpath(path, "advect_end.png"), joinpath(@__DIR__, "../..")),
+ "Advect End Simulation",
+)

examples/column/advect_diffusion.jl

@@ -154,6 +154,9 @@ function linkfig(figpath, alt = "")
 end
 
 linkfig(
- "output/$(dirname)/advect_diffusion_end.png",
+ relpath(
+ joinpath(path, "advect_diffusion_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
  "Advection-Diffusion End Simulation",
 )

examples/column/ekman.jl

@@ -191,4 +191,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/ekman_end.png", "ekman End")
+linkfig(
+ relpath(joinpath(path, "ekman_end.png"), joinpath(@__DIR__, "../..")),
+ "Ekman End",
+)

examples/column/heat.jl

@@ -86,4 +86,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/heat_end.png", "Heat End Simulation")
+linkfig(
+ relpath(joinpath(path, "heat_end.png"), joinpath(@__DIR__, "../..")),
+ "Heat End Simulation",
+)

examples/column/hydrostatic.jl

@@ -209,4 +209,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_end.png", "Hydrostatic End")
+linkfig(
+ "examples/column/output/$(dirname)/hydrostatic_end.png",
+ "Hydrostatic End",
+)

examples/column/hydrostatic_ekman.jl

@@ -257,4 +257,10 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_ekman_end.png", "ekman end")
+linkfig(
+ relpath(
+ joinpath(path, "hydrostatic_ekman_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
+ "ekman end",
+)

examples/column/hydrostatic_implicit.jl

@@ -324,4 +324,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/hydrostatic_end.png", "Hydrostatic End")
+linkfig(
+ relpath(joinpath(path, "hydrostatic_end.png"), joinpath(@__DIR__, "../..")),
+ "Hydrostatic End",
+)

examples/column/step.jl

@@ -213,6 +213,14 @@ function linkfig(figpath, alt = "")
 end
 
 linkfig(
- "output/$(dirname)/advect_step_function_end.png",
+ "examples/column/output/$(dirname)/advect_step_function_end.png",
+ "Advect End Simulation",
+)
+
+linkfig(
+ relpath(
+ joinpath(path, "advect_step_function_end.png"),
+ joinpath(@__DIR__, "../.."),
+ ),
  "Advect End Simulation",
 )

examples/column/wave.jl

@@ -96,4 +96,7 @@ function linkfig(figpath, alt = "")
  end
 end
 
-linkfig("output/$(dirname)/wave_end.png", "Wave End")
+linkfig(
+ relpath(joinpath(path, "wave_end.png"), joinpath(@__DIR__, "../..")),
+ "Wave End",
+)

examples/hybrid/bubble.jl

@@ -204,7 +204,7 @@ function rhs!(dY, Y, _, t)
  Yfρ = @. If(Yc.ρ)
 
  ### HYPERVISCOSITY
- # 1) compute hyperviscosity coefficients 
+ # 1) compute hyperviscosity coefficients
  @. dYc.ρθ = hdiv(hgrad(θ))
  @. dYc.ρuₕ = hdiv(hgrad(uₕ))
  @. dρw = hdiv(hgrad(w))
@@ -245,7 +245,7 @@ function rhs!(dY, Y, _, t)
  uₕf = @. If(Yc.ρuₕ / Yc.ρ) # requires boundary conditions
  @. dρw -= hdiv(uₕf ⊗ ρw)
 
- ### UPWIND FLUX CORRECTION 
+ ### UPWIND FLUX CORRECTION
  upwind_correction = true
  if upwind_correction
  @. dYc.ρ += fcc(w, Yc.ρ)