Merge branch 'main' into orad/v1_testing

CliMA · Nov 28, 2024 · 545b0c4 · 545b0c4
2 parents 7abdb55 + 182d574
commit 545b0c4
Show file tree

Hide file tree

Showing 117 changed files with 9,250 additions and 2,540 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,5 +1,8 @@
+agents:
+  queue: new-central
+  modules: climacommon/2024_03_18 
+
 env:
-  JULIA_VERSION: "1.9.2"
   OPENBLAS_NUM_THREADS: 1
   GKSwstype: nul
 
@@ -9,22 +12,17 @@ steps:
     command:
       - "echo $$JULIA_DEPOT_PATH"
       - "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project -e 'using Conda; Conda.add(\"scipy=1.8.1\", channel=\"conda-forge\")'"
-      - "julia --project -e 'using Conda; Conda.add(\"scikit-learn=1.1.1\")'"
-      - "julia --project -e 'using Conda; Conda.add(\"matplotlib=3.7.1\")'"
+      - "julia --project -e 'using Conda; Conda.add(\"scipy=1.14.1\", channel=\"conda-forge\")'"
+      - "julia --project -e 'using Conda; Conda.add(\"scikit-learn=1.5.1\")'"
     env:
       PYTHON: ""
 
     artifact_paths: 
       - "*.toml"
-    agents:
-      config: cpu
-      queue: central
-      slurm_ntasks: 1
-
+
   - wait
 
-  - label: "Lorenz"
+  - label: "CES - Lorenz"
     key: "lorenz"
     command: |
       export PYTHON="$$JULIA_DEPOT_PATH/conda/3/x86_64/bin/python"
@@ -47,8 +45,32 @@ steps:
 
     artifact_paths:
       - "examples/Lorenz/output/*.png"
-    agents:
-      config: cpu
-      queue: central
-      slurm_ntasks: 1
+
+  - label: "Emulator - regression 2D"
+    key: "emulator_compare"
+    command: |
+      export PYTHON="$$JULIA_DEPOT_PATH/conda/3/x86_64/bin/python"
+      export PYTHONHOME="$$JULIA_DEPOT_PATH/conda/3/x86_64/bin"
+      export CONDA_JL_HOME="$$JULIA_DEPOT_PATH/conda/3/x86_64/"
+
+      mkdir examples/Emulator/Regression_2d_2d/depot
+      export JULIA_DEPOT_PATH="$$(pwd)/examples/Emulator/Regression_2d_2d/depot:$JULIA_DEPOT_PATH"
+
+      julia --color=yes --project=examples/Emulator/Regression_2d_2d -e '
+        println("--- Developing Project")
+        using Pkg;
+        Pkg.develop(path=".")
+        Pkg.update()
+        println("--- Instantiating Project")
+        Pkg.instantiate()
+        println("+++ Running compare_regression")
+        include("examples/Emulator/Regression_2d_2d/compare_regression.jl")'
+    artifact_paths:
+      - "examples/Emulator/Regression_2d_2d/output/*.png"
+    env:
+      PYTHON: "$$JULIA_DEPOT_PATH/conda/3/bin/python"
+      PYTHONHOME: "$$JULIA_DEPOT_PATH/conda/3/bin"
+      CONDA_JL_HOME: "$$JULIA_DEPOT_PATH/conda/3"
+
+
 
diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -36,8 +36,8 @@ jobs:
           PYTHON: ""
         run: |
           julia --color=yes --project -e 'using Pkg; Pkg.instantiate()'
-          julia --project -e 'using Conda; Conda.add("scipy=1.8.1")'
-          julia --color=yes --project -e 'using Conda; Conda.add("scikit-learn=1.1.1")'
+          julia --project -e 'using Conda; Conda.add("scipy=1.14.1")'
+          julia --color=yes --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")'
           julia --color=yes --project=docs/ -e 'using Pkg; Pkg.instantiate()'
           julia --color=yes --project=docs/ -e 'using Pkg; Pkg.precompile()'
       - name: Build and deploy

diff --git a/.github/workflows/JuliaFormatter.yml b/.github/workflows/JuliaFormatter.yml
@@ -31,7 +31,7 @@ jobs:
     - uses: julia-actions/setup-julia@latest
       if: steps.filter.outputs.julia_file_change == 'true'
       with:
-        version: 1.7
+        version: 1
 
     - name: Apply JuliaFormatter
       if: steps.filter.outputs.julia_file_change == 'true'

diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -25,8 +25,8 @@ jobs:
     - name: Set up Julia
       uses: julia-actions/setup-julia@v1
       with:
-        version: '1' # Latest 1.x release of julia
-
+        version: 1
+        
     - name: Install Julia Project Packages
       # we add this ENV varaible to force PyCall to download and use Conda rather than
       # the system python (default on Linux), see the PyCall documentation
@@ -39,8 +39,8 @@ jobs:
       env:
         PYTHON: ""
       run: |
-        julia --project -e 'using Conda; Conda.add("scipy=1.11.4")'
-        julia --project -e 'using Conda; Conda.add("scikit-learn=1.3.2")'
+        julia --project -e 'using Conda; Conda.add("scipy=1.14.1")'
+        julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")'
 
     - name: Run Unit Tests
       env:
@@ -80,10 +80,9 @@ jobs:
     - name: Set up Julia
       uses: julia-actions/setup-julia@v1
       with:
-        version: '1' # Latest 1.x release of julia
-
+        version: 1
 
-    - name: Install Julia Project Packages
+  - name: Install Julia Project Packages
       env:
         PYTHON: ""
       run: |
@@ -93,8 +92,8 @@ jobs:
       env:
         PYTHON: ""
       run: |
-        julia --project -e 'using Conda; Conda.add("scipy=1.11.4")'
-        julia --project -e 'using Conda; Conda.add("scikit-learn=1.3.2")'
+        julia --project -e 'using Conda; Conda.add("scipy=1.14.1")'
+        julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")'
 
     - name: Run Unit Tests
       env:
@@ -121,7 +120,7 @@ jobs:
     - name: Set up Julia
       uses: julia-actions/setup-julia@v1
       with:
-        version: '1' # Latest 1.x release of julia
+        version: 1
 
     - name: Install Julia Project Packages
       env:
@@ -133,8 +132,8 @@ jobs:
       env:
         PYTHON: ""
       run: |
-        julia --project -e 'using Conda; Conda.add(\"scipy=1.11.4\")'
-        julia --project -e 'using Conda; Conda.add(\"scikit-learn=1.3.2\")'
+        julia --project -e 'using Conda; Conda.add("scipy=1.14.1")'
+        julia --project -e 'using Conda; Conda.add("scikit-learn=1.5.1")'
 
     - name: Run Unit Tests
       env: