Merge branch 'CliMA:main' into double-gyre

CliMA · Apr 25, 2023 · 94fdef6 · 94fdef6
2 parents 6142331 + fad81b0
commit 94fdef6
Show file tree

Hide file tree

Showing 380 changed files with 11,770 additions and 11,468 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 env:
-  JULIA_VERSION: "1.8.2"
+  JULIA_VERSION: "1.8.5"
   JULIA_MINOR_VERSION: "1.8"
   SVERDRUP_HOME: "/data5/glwagner"
   TARTARUS_HOME: "/storage5/buildkite-agent"
@@ -480,7 +480,7 @@ steps:
 ##### Distributed/MPI
 #####
 
-  - label: "🐉 cpu distributed tests"
+  - label: "🐉 cpu distributed unit tests"
     env:
       JULIA_DEPOT_PATH: "$TARTARUS_HOME/.julia-$BUILDKITE_BUILD_NUMBER"
       TEST_GROUP: "distributed"
@@ -494,33 +494,39 @@ steps:
       architecture: CPU
     depends_on: "init_cpu"
 
-#####
-##### Regression
-#####
-
-  - label: "🦝 gpu shallow water regression tests"
-    env:
-      JULIA_DEPOT_PATH: "$SVERDRUP_HOME/.julia-$BUILDKITE_BUILD_NUMBER"
-      TEST_GROUP: "shallowwater_regression"
-    commands:
-      - "$SVERDRUP_HOME/julia-$JULIA_VERSION/bin/julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
-    agents:
-      queue: Oceananigans
-      architecture: GPU
-    depends_on: "init_gpu"
-
-  - label: "🦡 cpu shallow water regression tests"
+  - label: "🦾 cpu distributed sovers tests"
     env:
       JULIA_DEPOT_PATH: "$TARTARUS_HOME/.julia-$BUILDKITE_BUILD_NUMBER"
-      TEST_GROUP: "shallowwater_regression"
+      TEST_GROUP: "distributed_solvers"
       CUDA_VISIBLE_DEVICES: "-1"
+      PATH: "$PATH:$TARTARUS_HOME/julia-$JULIA_VERSION/bin" # Need julia binary in $PATH for mpiexecjl to work.
+      JULIA_BINDIR: "$TARTARUS_HOME/julia-$JULIA_VERSION/bin"
     commands:
-      - "$TARTARUS_HOME/julia-$JULIA_VERSION/bin/julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
+      - "$TARTARUS_HOME/.julia-$BUILDKITE_BUILD_NUMBER/bin/mpiexecjl -np 4 $TARTARUS_HOME/julia-$JULIA_VERSION/bin/julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
     agents:
       queue: Oceananigans
       architecture: CPU
     depends_on: "init_cpu"
 
+  # We get a SegFault. We probably need more devices to run this test
+  # - label: "🐲 gpu distributed unit tests"
+  # env:
+  #   JULIA_DEPOT_PATH: "$SVERDRUP_HOME/.julia-$BUILDKITE_BUILD_NUMBER"
+  #   TEST_GROUP: "distributed"
+  #   CUDA_VISIBLE_DEVICES: "0"
+  #   PATH: "$PATH:$SVERDRUP_HOME/julia-$JULIA_VERSION/bin" # Need julia binary in $PATH for mpiexecjl to work.
+  #   JULIA_BINDIR: "$SVERDRUP_HOME/julia-$JULIA_VERSION/bin"
+  # commands:
+  #   - "$SVERDRUP_HOME/.julia-$BUILDKITE_BUILD_NUMBER/bin/mpiexecjl -np 4 $SVERDRUP_HOME/julia-$JULIA_VERSION/bin/julia -O0 --color=yes --project -e 'using Pkg; Pkg.test()'"
+  # agents:
+  #   queue: Oceananigans
+  #   architecture: GPU
+  # depends_on: "init_gpu"
+
+#####
+##### Regression
+#####
+
   - label: "🐫 gpu nonhydrostatic regression tests"
     env:
       JULIA_DEPOT_PATH: "$SVERDRUP_HOME/.julia-$BUILDKITE_BUILD_NUMBER"

diff --git a/.buildkite/validation-pipeline.yml b/.buildkite/validation-pipeline.yml
@@ -1,5 +1,5 @@
 env:
-  JULIA_VERSION: "1.8.2"
+  JULIA_VERSION: "1.8.5"
   JULIA_MINOR_VERSION: "1.8"
   SVERDRUP_HOME: "/data5/glwagner"
   TARTARUS_HOME: "/storage5/buildkite-agent"

diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ docs/src/generated
 .logamgx
 
 statprof
+*.sqlite
+*.nsys-rep
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM julia:1.8.2
+FROM julia:1.8.5
 LABEL maintainer="Ali Ramadhan <[email protected]>"
 
 RUN apt-get update && apt-get install -y hdf5-tools

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Ali Ramadhan
+Copyright (c) 2018 Climate Modeling Alliance
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal