From 33e1264c59c7a972c7e94b06dbf5bb0c698b4c3d Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 18 Jan 2024 11:29:29 -0800 Subject: [PATCH 1/2] Update to Julia 1.10 --- .buildkite/pipeline.yml | 5 +++-- .github/workflows/CodeCov.yml | 2 +- .github/workflows/JuliaFormatter.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 2 +- test/Project.toml | 3 +++ test/gpu_tests.jl | 1 - 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e43f0c5b4..7c3a6323c 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,14 +1,15 @@ agents: queue: central slurm_mem: 8G - modules: julia/1.9.3 cuda/11.8 ucx/1.14.1_cuda-11.8 openmpi/4.1.5_cuda-11.8 hdf5/1.12.2-ompi415 nsight-systems/2023.2.1 + modules: julia/1.10.0 cuda/12.2 ucx/1.14.1_cuda-12.2 openmpi/4.1.5_cuda-12.2 nsight-systems/2023.3.1 env: JULIA_LOAD_PATH: "${JULIA_LOAD_PATH}:${BUILDKITE_BUILD_CHECKOUT_PATH}/.buildkite" OPENBLAS_NUM_THREADS: 1 JULIA_NVTX_CALLBACKS: gc OMPI_MCA_opal_warn_on_missing_libcuda: 0 - JULIA_CPU_TARGET: 'broadwell;skylake' + MPITRAMPOLINE_LIB: '/groups/esm/software/MPIwrapper/ompi4.1.5_cuda-12.2/lib64/libmpiwrapper.so' + MPITRAMPOLINE_MPIEXEC: '/groups/esm/software/MPIwrapper/ompi4.1.5_cuda-12.2/bin/mpiwrapperexec' steps: - label: "initialize" diff --git a/.github/workflows/CodeCov.yml b/.github/workflows/CodeCov.yml index e4a150d24..fb86205b1 100644 --- a/.github/workflows/CodeCov.yml +++ b/.github/workflows/CodeCov.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Julia uses: julia-actions/setup-julia@latest with: - version: 1.9 + version: '1.10' - name: Test with coverage env: diff --git a/.github/workflows/JuliaFormatter.yml b/.github/workflows/JuliaFormatter.yml index 12e913bc5..b998305d9 100644 --- a/.github/workflows/JuliaFormatter.yml +++ b/.github/workflows/JuliaFormatter.yml @@ -27,7 +27,7 @@ jobs: - uses: julia-actions/setup-julia@latest if: steps.filter.outputs.julia_file_change == 'true' with: - version: 1.9 + version: '1.10' - name: Apply JuliaFormatter if: steps.filter.outputs.julia_file_change == 'true' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38ef586dd..efbdfe08d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: version: - - '1.9.2' + - '1.10' os: - ubuntu-latest - macOS-latest diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1a76d917c..0dcc13361 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@latest with: - version: 1.9 + version: '1.10' - name: Install dependencies run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: Build and deploy diff --git a/test/Project.toml b/test/Project.toml index 451a57aeb..77cdaab03 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -9,3 +9,6 @@ KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c" RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c" + +[compat] +KernelAbstractions = "0.9" diff --git a/test/gpu_tests.jl b/test/gpu_tests.jl index ddf1a4614..25d51180c 100644 --- a/test/gpu_tests.jl +++ b/test/gpu_tests.jl @@ -25,7 +25,6 @@ ClimaComms.device() isa ClimaComms.CUDADevice || error("No GPU found") # Set up GPU using CUDA -using CUDA.CUDAKernels const backend = CUDABackend() CUDA.allowscalar(false) const ArrayType = CuArray From 61937d44b8791cf98321efd72ab4220b8947d861 Mon Sep 17 00:00:00 2001 From: nefrathenrici Date: Thu, 18 Jan 2024 13:28:00 -0800 Subject: [PATCH 2/2] Bump patch version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 57e117f3d..b062f57f0 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "CloudMicrophysics" uuid = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b" authors = ["Climate Modeling Alliance"] -version = "0.15.1" +version = "0.15.2" [deps] CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"