Merge pull request #545 from CliMA/ci_new_central

Update to new-central
CliMA · Apr 22, 2024 · 0f39eeb · 0f39eeb
2 parents 86d6431 + faca25d
commit 0f39eeb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 56 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,17 +1,14 @@
 env:
-  JULIA_VERSION: "1.10.0"
   SLURM_CPUS_PER_TASK: 1
-  OPENMPI_VERSION: "4.0.4"
-  CUDA_VERSION: "11.2"
   OPENBLAS_NUM_THREADS: 1
   CLIMATEMACHINE_SETTINGS_FIX_RNG_SEED: "true"
   BUILDKITE_COMMIT: "${BUILDKITE_COMMIT}"
   BUILDKITE_BRANCH: "${BUILDKITE_BRANCH}"
   JULIA_DEPOT_PATH: "${BUILDKITE_BUILD_PATH}/${BUILDKITE_PIPELINE_SLUG}/depot/cpu"
 
 agents:
-  config: cpu
-  queue: central
+  queue: new-central
+  modules: climacommon/2024_04_05
 
 steps:
 
@@ -21,7 +18,7 @@ steps:
   #     - "rm -rf /central/scratch/esm/slurm-buildkite/calibrateedmf-ci/depot/cpu"
   #   agents:
   #     config: init
-  #     queue: central
+  #     queue: new-central
 
   # - wait
 
@@ -30,9 +27,6 @@ steps:
     command:
       - "echo $$JULIA_DEPOT_PATH"
 
-      - echo "--- Configure MPI"
-      - julia -e 'using Pkg; Pkg.add("MPIPreferences"); using MPIPreferences; use_system_binary()'
-
       - "julia --project -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
       - "julia --project -e 'using Pkg; Pkg.precompile()'"
       - "julia --project -e 'using Pkg; Pkg.status()'"
@@ -52,8 +46,6 @@ steps:
   #   command:
   #     - "julia --project=integration_tests -C skylake-avx512 integration_tests/test_create_tc_so.jl"
   #   agents:
-  #     config: cpu
-  #     queue: central
   #     slurm_cpus_per_task: 1
   #     slurm_nodes: 1
   #     slurm_mem_per_cpu: 20G
@@ -65,8 +57,6 @@ steps:
     artifact_paths:
       - "integration_tests/output/Bomex_inversion_test_config_julia_parallel/*"
     agents:
-      config: cpu
-      queue: central
       slurm_cpus_per_task: 11
       slurm_mem_per_cpu: 12G
 
@@ -78,8 +68,6 @@ steps:
     artifact_paths:
       - "integration_tests/output/Bomex_inversion_test_config_julia_parallel/*"
     agents:
-      config: cpu
-      queue: central
       slurm_cpus_per_task: 11
       slurm_mem_per_cpu: 12G
 
@@ -90,8 +78,6 @@ steps:
     artifact_paths:
       - "integration_tests/output/SCT1_integration_test_config_julia_parallel/*"
     agents:
-      config: cpu
-      queue: central
       slurm_cpus_per_task: 11
       slurm_mem_per_cpu: 12G
 
@@ -102,8 +88,6 @@ steps:
     artifact_paths:
       - "integration_tests/output/Het_batch_unscented_test_config_julia_parallel/*"
     agents:
-      config: cpu
-      queue: central
       slurm_cpus_per_task: 8
       slurm_mem_per_cpu: 12G
 
@@ -114,8 +98,6 @@ steps:
     artifact_paths:
       - "integration_tests/output/TRMM_micro_test_config_julia_parallel/*"
     agents:
-      config: cpu
-      queue: central
       slurm_cpus_per_task: 11
       slurm_mem_per_cpu: 12G
 
@@ -127,86 +109,62 @@ steps:
   #   artifact_paths:
   #     - "integration_tests/output/grid_search/*"
   #   agents:
-  #     config: cpu
-  #     queue: central
   #     slurm_cpus_per_task: 14
   #     slurm_mem_per_cpu: 12G
 
   - label: "HelperFuncs"
     key: "cpu_helper_funcs"
     command:
       - "julia --color=yes --project test/HelperFuncs/runtests.jl"
-    agents:
-      config: cpu
-      queue: central
 
   - label: "DistributionUtils"
     key: "cpu_distributionutils"
     command:
       - "julia --color=yes --project test/DistributionUtils/runtests.jl"
-    agents:
-      config: cpu
-      queue: central
 
   - label: "LESUtils"
     key: "cpu_lesutils"
     command:
       - "julia --color=yes --project test/LESUtils/runtests.jl"
-    agents:
-      config: cpu
-      queue: central
 
   - label: "KalmanProcessUtils"
     key: "cpu_kalmanutils"
     command:
       - "julia --color=yes --project test/KalmanProcessUtils/runtests.jl"
-    agents:
-      config: cpu
-      queue: central
 
   - label: "TurbulenceConvectionUtils"
     key: "cpu_turbulenceconvectionutils"
     command:
       - "julia --color=yes --project test/TurbulenceConvectionUtils/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_mem_per_cpu: 12G
 
   - label: "ReferenceModels"
     key: "cpu_referencemodels"
     command:
       - "julia --color=yes --project test/ReferenceModels/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_mem_per_cpu: 12G
 
   - label: "ReferenceStats"
     key: "cpu_referencestats"
     command:
       - "julia --color=yes --project test/ReferenceStats/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_mem_per_cpu: 12G
 
   - label: "Pipeline"
     key: "cpu_pipeline"
     command:
       - "julia --color=yes --project test/Pipeline/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_mem_per_cpu: 12G
 
   - label: "NetCDFIO"
     key: "cpu_netcdfio"
     command:
       - "julia --color=yes --project test/NetCDFIO/runtests.jl"
     agents:
-      config: cpu
-      queue: central
       slurm_mem_per_cpu: 12G
 
 

diff --git a/Project.toml b/Project.toml
@@ -52,7 +52,7 @@ ArtifactWrappers = "0.2"
 AtmosphericProfilesLibrary = "0.1"
 CLIMAParameters = "0.7"
 CairoMakie = "0.8, 0.9, 0.10"
-ClimaCore = "= 0.10.50"
+ClimaCore = "0.10"
 CloudMicrophysics = "0.10, 0.11, 0.12"
 Combinatorics = "1.0.2"
 Dierckx = "0.5"
@@ -78,13 +78,3 @@ Thermodynamics = "0.9, 0.10, 0.11"
 TurbulenceConvection = "1.3"
 UnPack = "1"
 julia = "1.7"
-
-[extras]
-CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
-CUDA_Driver_jll = "4ee394cb-3365-5eb0-8335-949819d2adfc"
-
-[preferences.CUDA_Driver_jll]
-compat = false
-
-[preferences.CUDA_Runtime_jll]
-version = "local"