From 04deedfcc481dfee88d30ccefb352172cc593d01 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Tue, 8 Oct 2024 15:19:34 -0400 Subject: [PATCH] ci: run tests only on `1.10` for now (#975) * ci: run tests only on 1.10 for now * ci: try reducing the number of groups --- .buildkite/benchmarks.yml | 4 ++-- .buildkite/testing.yml | 27 ++++++-------------------- .github/workflows/CI.yml | 40 +++++++++++++-------------------------- 3 files changed, 21 insertions(+), 50 deletions(-) diff --git a/.buildkite/benchmarks.yml b/.buildkite/benchmarks.yml index aa1ebeee6..1ba075194 100644 --- a/.buildkite/benchmarks.yml +++ b/.buildkite/benchmarks.yml @@ -11,7 +11,7 @@ steps: - "8" plugins: - JuliaCI/julia#v1: - version: "1" + version: "1.10" command: | julia --project=benchmarks -e 'println("--- :julia: Instantiating project") using Pkg @@ -61,7 +61,7 @@ steps: - label: "Combine benchmarks" plugins: - JuliaCI/julia#v1: - version: "1" + version: "1.10" command: | buildkite-agent artifact download "benchmarks/results/*" . diff --git a/.buildkite/testing.yml b/.buildkite/testing.yml index 26946c2b0..a4b85da1c 100644 --- a/.buildkite/testing.yml +++ b/.buildkite/testing.yml @@ -1,7 +1,7 @@ steps: - group: ":julia: CUDA GPU" steps: - - label: ":julia: Julia {{matrix.julia}} + CUDA GPU ({{matrix.group}})" + - label: ":julia: Julia {{matrix.julia}} + CUDA GPU" plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}" @@ -17,25 +17,19 @@ steps: cuda: "*" env: BACKEND_GROUP: "CUDA" - LUX_TEST_GROUP: "{{matrix.group}}" if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip ci\]/ timeout_in_minutes: 60 matrix: setup: julia: - - "1" - group: - - "!fluxcompat,distributed,recurrent_layers" - - "fluxcompat" - - "distributed" - - "recurrent_layers" + - "1.10" - group: ":telescope: Downstream CUDA" steps: - label: ":julia: {{matrix.repo}} (Julia 1 + CUDA GPU)" plugins: - JuliaCI/julia#v1: - version: "1" + version: "1.10" - JuliaCI/julia-coverage#v1: codecov: true dirs: @@ -56,7 +50,7 @@ steps: - group: ":julia: AMD GPU" steps: - - label: ":julia: Julia: {{matrix.julia}} + AMD GPU ({{matrix.group}})" + - label: ":julia: Julia: {{matrix.julia}} + AMD GPU" plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}" @@ -69,8 +63,6 @@ steps: - ext env: BACKEND_GROUP: "AMDGPU" - RETESTITEMS_NWORKERS: 2 - LUX_TEST_GROUP: "{{matrix.group}}" agents: queue: "juliagpu" rocm: "*" @@ -80,19 +72,14 @@ steps: matrix: setup: julia: - - "1" - group: - - "!fluxcompat,distributed,recurrent_layers" - - "fluxcompat" - - "distributed" - - "recurrent_layers" + - "1.10" - group: ":telescope: Downstream AMD GPU" steps: - label: ":julia: {{matrix.repo}} (Julia 1 + AMD GPU)" plugins: - JuliaCI/julia#v1: - version: "1" + version: "1.10" - JuliaCI/julia-coverage#v1: codecov: true dirs: @@ -103,8 +90,6 @@ steps: queue: "juliagpu" rocm: "*" rocmgpu: "*" - env: - RETESTITEMS_NWORKERS: 2 if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip downstream\]/ && build.message !~ /\[skip ci\]/ && build.pull_request.labels includes "run downstream test" timeout_in_minutes: 60 matrix: diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9790c8d09..d211220ea 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,11 +28,9 @@ jobs: fail-fast: false matrix: version: - - "1" + - "1.10" os: - ubuntu-latest - - macos-latest - - windows-latest test_group: - "core_layers" - "contrib" @@ -44,6 +42,13 @@ jobs: - "recurrent_layers" - "eltype_match" - "fluxcompat" + include: + - version: "1.10" + os: macos-latest + test_group: "all" + - version: "1.10" + os: windows-latest + test_group: "all" steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 @@ -76,15 +81,13 @@ jobs: downstream: name: Downstream ${{ matrix.package.repo }}/${{ matrix.package.group }} if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && contains(github.event.pull_request.labels.*.name, 'run downstream test') }} - runs-on: ${{ matrix.os }} - timeout-minutes: 60 + runs-on: ubuntu-latest + timeout-minutes: 240 env: GROUP: ${{ matrix.package.group }} strategy: fail-fast: false matrix: - julia-version: ["1"] - os: [ubuntu-latest] package: - { user: SciML, repo: DiffEqFlux.jl, group: BasicNeuralDE } - { user: SciML, repo: DiffEqFlux.jl, group: AdvancedNeuralDE } @@ -96,7 +99,7 @@ jobs: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: ${{ matrix.julia-version }} + version: "1.10" arch: x64 - uses: julia-actions/julia-buildpkg@v1 - name: Clone Downstream @@ -131,33 +134,16 @@ jobs: downgrade: if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && github.base_ref == github.event.repository.default_branch }} - name: Downgrade Julia ${{ matrix.version }} - ${{ matrix.test_group }} + name: Downgrade Julia 1.10 runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - version: ["1"] - test_group: - - "core_layers" - - "contrib" - - "helpers" - - "distributed" - - "normalize_layers" - - "others" - - "autodiff" - - "recurrent_layers" - - "eltype_match" - - "fluxcompat" steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 with: - version: ${{ matrix.version }} + version: "1.10" - uses: julia-actions/julia-downgrade-compat@v1 - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - env: - LUX_TEST_GROUP: ${{ matrix.test_group }} - uses: julia-actions/julia-processcoverage@v1 with: directories: src,ext