fix buildkite

CliMA · Aug 29, 2024 · 309d6f3 · 309d6f3
1 parent ee78e17
commit 309d6f3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -26,7 +26,7 @@ steps:
       - "julia --project=.buildkite -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate test"
-      - "julia --project=test -e 'using Pkg; Pkg.develop(;path=\".\"); Pkg.instantiate(;verbose=true)'"
+      - "julia --project=test -e 'using Pkg; Pkg.develop(;path=\".\"); Pkg.add(\"MPI\"); Pkg.add(\"CUDA\"); Pkg.instantiate(;verbose=true)'"
       - "julia --project=test -e 'using Pkg; Pkg.status()'"
 
       - echo "--- Instantiate lib/ClimaLandSimulations"
@@ -63,15 +63,6 @@ steps:
         command: "julia --color=yes --project=.buildkite experiments/standalone/Soil/richards_comparison.jl"
         artifact_paths: "experiments/standalone/Soil/cpu/comparison*png"
 
-      - label: "Richards comparison to Bonan: GPU"
-        command: "julia --color=yes --project=.buildkite experiments/standalone/Soil/richards_comparison.jl"
-        artifact_paths: "experiments/standalone/Soil/gpu/comparison*png"
-        agents:
-          slurm_ntasks: 1
-          slurm_gres: "gpu:1"
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-
       - label: "vaira_test"
         command: "julia --color=yes --project=.buildkite experiments/integrated/fluxnet/run_fluxnet.jl US-Var"
         artifact_paths: "experiments/integrated/fluxnet/US-Var/out/*png"
@@ -130,7 +121,16 @@ steps:
         artifact_paths: "experiments/standalone/Soil/artifacts/gpu/*png"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:1"
+          slurm_gpus: 1
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+
+      - label: "Richards comparison to Bonan: GPU"
+        command: "julia --color=yes --project=.buildkite experiments/standalone/Soil/richards_comparison.jl"
+        artifact_paths: "experiments/standalone/Soil/gpu/comparison*png"
+        agents:
+          slurm_ntasks: 1
+          slurm_gpus: 1
         env:
           CLIMACOMMS_DEVICE: "CUDA"
 
@@ -172,21 +172,25 @@ steps:
         command: "julia --color=yes --project=test test/runtests.jl"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:p100:1"
+          slurm_gpus: 1
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
 
       - label: "soil/canopy lsm performance on GPU"
         command: "julia --color=yes --project=.buildkite experiments/integrated/performance/profile_allocations.jl"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:p100:1"
+          slurm_gpus: 1
         artifact_paths: "experiments/integrated/performance/flame*html"
 
       - label: "Global Bucket on GPU (functional albedo)"
         key: "global_bucket_function_gpu"
         command: "julia --color=yes --project=.buildkite experiments/standalone/Bucket/global_bucket_function.jl"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:p100:1"
+          slurm_gpus: 1
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         artifact_paths: "experiments/standalone/Bucket/artifacts/*gpu*"
@@ -196,7 +200,7 @@ steps:
         command: "julia --color=yes --project=.buildkite experiments/standalone/Bucket/bucket_era5.jl"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:p100:1"
+          slurm_gpus: 1
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         artifact_paths: "experiments/standalone/Bucket/artifacts_staticmap/*gpu*"
@@ -206,7 +210,7 @@ steps:
         command: "julia --color=yes --project=.buildkite experiments/standalone/Bucket/global_bucket_temporalmap.jl"
         agents:
           slurm_ntasks: 1
-          slurm_gres: "gpu:p100:1"
+          slurm_gpus: 1
         env:
           CLIMACOMMS_DEVICE: "CUDA"
         artifact_paths: "experiments/standalone/Bucket/artifacts_temporalmap/*gpu*"

diff --git a/experiments/integrated/performance/profile_allocations.jl b/experiments/integrated/performance/profile_allocations.jl
@@ -4,6 +4,7 @@ using ClimaCore
 using Dates
 using Insolation
 import ClimaComms
+@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
 import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput
 
 using ClimaLand

diff --git a/test/standalone/Soil/climate_drivers.jl b/test/standalone/Soil/climate_drivers.jl
@@ -298,11 +298,11 @@ for FT in (Float32, Float64)
             r_ae = conditions.r_ae
             expected_water_flux = @. FT(precip(t)) .+
                conditions.vapor_flux * (1 - f_ice) * r_ae / (r_soil + r_ae)
-            @test computed_water_flux == expected_water_flux
+            @test parent(computed_water_flux) ≈ parent(expected_water_flux)
             expected_energy_flux = @. R_n +
                conditions.lhf * r_ae / (r_soil + r_ae) +
                conditions.shf
-            @test computed_energy_flux == expected_energy_flux
+            @test parent(computed_energy_flux) ≈ parent(expected_energy_flux)
         end
     end
 end