From 570c818b4a27ba44b4632c1f7c705c6baac6cbcb Mon Sep 17 00:00:00 2001
From: Charles Kawczynski <kawczynski.charles@gmail.com>
Date: Wed, 5 Jun 2024 20:22:35 -0400
Subject: [PATCH] Fixes

---
 .buildkite/pipeline.yml | 16 ++++++++++------
 Project.toml            |  4 ++--
 test/callbacks.jl       |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index a2dbdba2..61a56de5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -18,9 +18,6 @@ steps:
       - echo "--- Instantiate project"
       - "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true)'"
 
-      - echo "--- Instantiate test"
-      - "julia --project=test -e 'using Pkg; Pkg.develop(path=\".\"); Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true)'"
-
       - echo "--- Instantiate perf"
       - "julia --project=perf -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true)'"
 
@@ -38,7 +35,7 @@ steps:
   #     - "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true)'"
 
   #     - echo "--- Instantiate test"
-  #     - "julia --project=test -e 'using Pkg; Pkg.develop(path=\".\"); Pkg.instantiate(;verbose=true); Pkg.precompile()'"
+  #     - "julia --project -e 'using Pkg; Pkg.develop(path=\".\"); Pkg.instantiate(;verbose=true); Pkg.precompile()'"
 
   #     - echo "--- Initialize CUDA runtime"
   #     - "julia --project -e 'using CUDA; CUDA.precompile_runtime(); CUDA.versioninfo()'"
@@ -50,12 +47,19 @@ steps:
   - wait
 
   - label: "CPU tests"
-    command: "julia --project=test --check-bounds=yes test/runtests.jl"
+    command: "julia --project --check-bounds=yes test/runtests.jl"
+    artifact_paths: "output/*"
+
+  - label: "CPU MPI tests"
+    command: "julia --project --check-bounds=yes test/runtests.jl"
+    env:
+      CLIMACOMMS_CONTEXT: "MPI"
     artifact_paths: "output/*"
+    # command: "julia --project -e 'using Pkg; Pkg.test()'"
 
   # - label: "GPU tests"
   #   command:
-  #     - "julia --project=test --check-bounds=yes test/runtests.jl CuArray"
+  #     - "julia --project --check-bounds=yes test/runtests.jl"
   #   artifact_paths: "output/*"
   #     slurm_gres: "gpu:1"
 
diff --git a/Project.toml b/Project.toml
index 9956d96e..e32661bd 100644
--- a/Project.toml
+++ b/Project.toml
@@ -46,11 +46,11 @@ NVTX = "0.3"
 ODEConvergenceTester = "0.2"
 OrderedCollections = "1"
 PrettyTables = "2"
-SafeTestsets = "0.0"
+SafeTestsets = "0.1"
 SciMLBase = "1, 2"
 StaticArrays = "1"
 StatsBase = "0.33, 0.34"
-julia = "1.8"
+julia = "1.9"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
diff --git a/test/callbacks.jl b/test/callbacks.jl
index 914c5a82..8c2b7441 100644
--- a/test/callbacks.jl
+++ b/test/callbacks.jl
@@ -5,7 +5,7 @@ using ClimaTimeSteppers.Callbacks
 
 @static isdefined(ClimaComms, :device_type) && ClimaComms.@import_required_backends
 device = ClimaComms.device()
-comm_ctx = ClimaComms.MPICommsContext(device)
+comm_ctx = ClimaComms.context(device)
 
 ClimaComms.init(comm_ctx)