From 910fb3ac21d1de2033233eca15bacf04ff17bf55 Mon Sep 17 00:00:00 2001 From: Avik Pal Date: Sun, 3 Nov 2024 09:40:42 -0500 Subject: [PATCH] ci: minor tweaks --- .buildkite/testing.yml | 66 +++++++++++++++++++++++++-- .github/workflows/CI.yml | 6 ++- .github/workflows/CI_LuxCore.yml | 1 - .github/workflows/CI_LuxTestUtils.yml | 4 +- .github/workflows/Downstream.yml | 1 - 5 files changed, 68 insertions(+), 10 deletions(-) diff --git a/.buildkite/testing.yml b/.buildkite/testing.yml index 5937f74b30..2f64bab2a0 100644 --- a/.buildkite/testing.yml +++ b/.buildkite/testing.yml @@ -5,16 +5,44 @@ steps: plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}" - - JuliaCI/julia-test#v1: - test_args: "--quickfail" - JuliaCI/julia-coverage#v1: codecov: true dirs: - src - ext + - lib/LuxCore/src + - lib/LuxCore/ext + - lib/MLDataDevices/src + - lib/MLDataDevices/ext + - lib/WeightInitializers/src + - lib/WeightInitializers/ext + - lib/LuxLib/src + - lib/LuxLib/ext + - lib/LuxTestUtils/src agents: queue: "juliagpu" cuda: "*" + command: | + julia --color=yes --code-coverage=user --depwarn=yes --project=. -e ' + import Pkg; + dev_pkgs = Pkg.PackageSpec[]; + for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",) + push!(dev_pkgs, Pkg.PackageSpec(path=pkg)); + end + Pkg.develop(dev_pkgs); + Pkg.Registry.update(); + Pkg.instantiate(); + Pkg.activate("test"); + dev_pkgs = Pkg.PackageSpec[]; + for pkg in ("lib/LuxTestUtils", "lib/LuxLib", "lib/MLDataDevices", "lib/LuxCore", ".") + push!(dev_pkgs, Pkg.PackageSpec(path=pkg)) + end + Pkg.develop(dev_pkgs); + Pkg.instantiate();' + julia --color=yes --code-coverage=user --depwarn=yes --project=test -e ' + import Pkg, Lux; + dir = dirname(pathof(Lux)); + include(joinpath(dir, "../test/runtests.jl"))' env: BACKEND_GROUP: "CUDA" if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip ci\]/ @@ -23,6 +51,7 @@ steps: setup: julia: - "1.10" + - "1" - group: ":julia: AMD GPU" steps: @@ -30,13 +59,41 @@ steps: plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}" - - JuliaCI/julia-test#v1: - test_args: "--quickfail" - JuliaCI/julia-coverage#v1: codecov: true dirs: - src - ext + - lib/LuxCore/src + - lib/LuxCore/ext + - lib/MLDataDevices/src + - lib/MLDataDevices/ext + - lib/WeightInitializers/src + - lib/WeightInitializers/ext + - lib/LuxLib/src + - lib/LuxLib/ext + - lib/LuxTestUtils/src + command: | + julia --color=yes --code-coverage=user --depwarn=yes --project=. -e ' + import Pkg; + dev_pkgs = Pkg.PackageSpec[]; + for pkg in ("lib/LuxCore", "lib/MLDataDevices", "lib/WeightInitializers", "lib/LuxLib",) + push!(dev_pkgs, Pkg.PackageSpec(path=pkg)); + end + Pkg.develop(dev_pkgs); + Pkg.Registry.update(); + Pkg.instantiate(); + Pkg.activate("test"); + dev_pkgs = Pkg.PackageSpec[]; + for pkg in ("lib/LuxTestUtils", "lib/LuxLib", "lib/MLDataDevices", "lib/LuxCore", ".") + push!(dev_pkgs, Pkg.PackageSpec(path=pkg)) + end + Pkg.develop(dev_pkgs); + Pkg.instantiate();' + julia --color=yes --code-coverage=user --depwarn=yes --project=test -e ' + import Pkg, Lux; + dir = dirname(pathof(Lux)); + include(joinpath(dir, "../test/runtests.jl"))' env: BACKEND_GROUP: "AMDGPU" agents: @@ -49,6 +106,7 @@ steps: setup: julia: - "1.10" + - "1" env: SECRET_CODECOV_TOKEN: "jQ0BMTQgyZx7QGyU0Q2Ec7qB9mtE2q/tDu0FsfxvEG7/zOAGvXkyXrzIFFOQxvDoFcP+K2+hYZKMxicYdNqzr5wcxu505aNGN2GM3wyegAr+hO6q12bCFYx6qXzU9FLCCdeqINqn9gUSSOlGtWNFrbAlrTyz/D4Yo66TqBDzvaLL63FMnhCLaXW/zJt3hNuEAJaPY2O6Ze1rX2WZ3Y+i+s3uQ8aLImtoCJhPe8CRx+OhuYiTzGhynFfGntZ0738/1RN4gNM0S/hTC4gLE7XMVBanJpGh32rFaiDwW4zAyXKBrDkL3QA3MS1RvLTJxGJ085S16hCk0C4ddAhZCvIM9Q==;U2FsdGVkX1+bXdFeKMs5G79catOCyby2n07A2fg0FjVAvrjQLZ0yfvDS4paJiFikLkodho0khz2YALKb2Y0K6w==" diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5bc080187f..244726cd6e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -80,6 +80,7 @@ jobs: push!(dev_pkgs, Pkg.PackageSpec(path=pkg)) end Pkg.develop(dev_pkgs) + Pkg.instantiate() shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0} - name: "Run Tests" run: | @@ -91,7 +92,7 @@ jobs: LUX_TEST_GROUP: ${{ matrix.test_group }} - uses: julia-actions/julia-processcoverage@v1 with: - directories: src,ext + directories: src,ext,lib/LuxCore/src,lib/LuxCore/ext,lib/MLDataDevices/src,lib/MLDataDevices/ext,lib/WeightInitializers/src,lib/WeightInitializers/ext,lib/LuxLib/src,lib/LuxLib/ext,lib/LuxTestUtils/src - uses: codecov/codecov-action@v4 with: files: lcov.info @@ -126,6 +127,7 @@ jobs: push!(dev_pkgs, Pkg.PackageSpec(path=pkg)) end Pkg.develop(dev_pkgs) + Pkg.instantiate() shell: julia --color=yes --code-coverage=user --depwarn=yes --project=. {0} - name: "Run Tests" run: | @@ -135,7 +137,7 @@ jobs: shell: julia --color=yes --code-coverage=user --depwarn=yes --project=test {0} - uses: julia-actions/julia-processcoverage@v1 with: - directories: src,ext + directories: src,ext,lib/LuxCore/src,lib/LuxCore/ext,lib/MLDataDevices/src,lib/MLDataDevices/ext,lib/WeightInitializers/src,lib/WeightInitializers/ext,lib/LuxLib/src,lib/LuxLib/ext,lib/LuxTestUtils/src - uses: codecov/codecov-action@v4 with: files: lcov.info diff --git a/.github/workflows/CI_LuxCore.yml b/.github/workflows/CI_LuxCore.yml index 9f2144c703..937b32a446 100644 --- a/.github/workflows/CI_LuxCore.yml +++ b/.github/workflows/CI_LuxCore.yml @@ -76,7 +76,6 @@ jobs: downgrade: if: ${{ !contains(github.event.head_commit.message, '[skip tests]') && github.base_ref == github.event.repository.default_branch }} - name: Downgrade Julia ${{ matrix.version }} runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/CI_LuxTestUtils.yml b/.github/workflows/CI_LuxTestUtils.yml index ae867bc725..2c77e711dc 100644 --- a/.github/workflows/CI_LuxTestUtils.yml +++ b/.github/workflows/CI_LuxTestUtils.yml @@ -54,7 +54,7 @@ jobs: shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxTestUtils {0} - uses: julia-actions/julia-processcoverage@v1 with: - directories: lib/LuxTestUtils/src,lib/LuxTestUtils/ext + directories: lib/LuxTestUtils/src - uses: codecov/codecov-action@v4 with: files: lcov.info @@ -84,7 +84,7 @@ jobs: shell: julia --color=yes --code-coverage=user --depwarn=yes --project=lib/LuxTestUtils {0} - uses: julia-actions/julia-processcoverage@v1 with: - directories: lib/LuxTestUtils/src,lib/LuxTestUtils/ext + directories: lib/LuxTestUtils/src - uses: codecov/codecov-action@v4 with: files: lcov.info diff --git a/.github/workflows/Downstream.yml b/.github/workflows/Downstream.yml index 79fde81b4e..c53f0cc710 100644 --- a/.github/workflows/Downstream.yml +++ b/.github/workflows/Downstream.yml @@ -21,7 +21,6 @@ concurrency: 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: ubuntu-latest timeout-minutes: 60