From eb0759a2c1309d24e22bdfdfc87a64592c813f12 Mon Sep 17 00:00:00 2001
From: Charles Kawczynski <kawczynski.charles@gmail.com>
Date: Thu, 6 Jun 2024 11:08:55 -0400
Subject: [PATCH] Remove direct CUDA dep from test env

---
 .buildkite/pipeline.yml |  2 +-
 Project.toml            |  5 +++--
 test/runtests.jl        | 10 ----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 39df80a5..73d8cc23 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -51,7 +51,7 @@ steps:
     artifact_paths: "output/*"
 
   - label: "CPU MPI tests"
-    command: "julia --project -e 'using Pkg; Pkg.test()'"
+    command: "julia --project --check-bounds=yes test/runtests.jl"
     env:
       CLIMACOMMS_CONTEXT: "MPI"
     artifact_paths: "output/*"
diff --git a/Project.toml b/Project.toml
index 9621845b..2b3dc8e1 100644
--- a/Project.toml
+++ b/Project.toml
@@ -42,6 +42,7 @@ KernelAbstractions = "0.7, 0.8, 0.9"
 Krylov = "0.8, 0.9"
 LinearAlgebra = "1"
 LinearOperators = "2"
+MPI = "0.20"
 NVTX = "0.3"
 ODEConvergenceTester = "0.2"
 OrderedCollections = "1"
@@ -56,10 +57,10 @@ julia = "1.9"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
-CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
+MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 ODEConvergenceTester = "42a5c2e1-f365-4540-8ca5-3684de3ecd95"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -67,4 +68,4 @@ SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua","CUDA","ClimaCore","Distributions","Krylov","ODEConvergenceTester","PrettyTables","Random","SafeTestsets","Test"]
+test = ["Aqua","ClimaCore","Distributions","Krylov", "MPI","ODEConvergenceTester","PrettyTables","Random","SafeTestsets","Test"]
diff --git a/test/runtests.jl b/test/runtests.jl
index 2057d568..2345fe9c 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,15 +1,5 @@
 using SafeTestsets
 
-#=
-TODO: add separate GPU tests
-if get(ARGS,1,"Array") == "CuArray"
-    using CUDA
-    const ArrayType = CUDA.CuArray
-else
-    const ArrayType = Array
-end
-=#
-
 @safetestset "SparseContainers" begin
     include("sparse_containers.jl")
 end