From bc4cd4fede7fca3d4bbe9c13bc34ffe89c686227 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sat, 9 Nov 2024 14:41:29 +0200 Subject: [PATCH 1/9] Bump deps --- Project.toml | 4 ++-- README.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 2c44f6a8c..64441407f 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ NNlibFFTWExt = "FFTW" NNlibForwardDiffExt = "ForwardDiff" [compat] -AMDGPU = "0.9.4, 1" +AMDGPU = "1" Adapt = "3.2, 4" Atomix = "0.1" CUDA = "4, 5" @@ -37,7 +37,7 @@ ChainRulesCore = "1.13" EnzymeCore = "0.5, 0.6, 0.7, 0.8" FFTW = "1.8.0" ForwardDiff = "0.10.36" -GPUArraysCore = "0.1" +GPUArraysCore = "0.2" KernelAbstractions = "0.9.2" LinearAlgebra = "<0.0.1, 1" Random = "<0.0.1, 1" diff --git a/README.md b/README.md index 3892a2cc1..1f29d25c4 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,3 @@ for CUDA support, or using NNlib, AMDGPU ``` for AMDGPU support. - From 8e50303daa133893fc786bacced61205fcb34270 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sat, 16 Nov 2024 20:41:59 +0200 Subject: [PATCH 2/9] Bump compat --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 64441407f..87ae0c3bd 100644 --- a/Project.toml +++ b/Project.toml @@ -33,7 +33,7 @@ AMDGPU = "1" Adapt = "3.2, 4" Atomix = "0.1" CUDA = "4, 5" -ChainRulesCore = "1.13" +ChainRulesCore = "1.13, 1.25" EnzymeCore = "0.5, 0.6, 0.7, 0.8" FFTW = "1.8.0" ForwardDiff = "0.10.36" From b52117207a55a5754418e8c3ac2841629deec2cc Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sat, 16 Nov 2024 22:15:18 +0200 Subject: [PATCH 3/9] Compat --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 87ae0c3bd..9a45c6ae0 100644 --- a/Project.toml +++ b/Project.toml @@ -33,11 +33,11 @@ AMDGPU = "1" Adapt = "3.2, 4" Atomix = "0.1" CUDA = "4, 5" -ChainRulesCore = "1.13, 1.25" +ChainRulesCore = "1.25" EnzymeCore = "0.5, 0.6, 0.7, 0.8" FFTW = "1.8.0" ForwardDiff = "0.10.36" -GPUArraysCore = "0.2" +GPUArraysCore = "0.1, 0.2" KernelAbstractions = "0.9.2" LinearAlgebra = "<0.0.1, 1" Random = "<0.0.1, 1" From e2c78965cda1e04e905817be813fb20fdc63d493 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sat, 16 Nov 2024 22:22:15 +0200 Subject: [PATCH 4/9] Change nightly to pre --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b8493e43..703ba2f00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,9 @@ jobs: matrix: version: # - '1.9' # uncomment when julia 1.10 is out + - 'lts' - '1' # automatically expands to the latest stable 1.x release of Julia - - 'nightly' + - 'pre' os: - ubuntu-latest # - macOS-latest From 12e36d101283dfb3f401ee9d953d1bf68e3d406e Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sat, 16 Nov 2024 22:32:21 +0200 Subject: [PATCH 5/9] Update setup-julia --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 703ba2f00..f2cf0328b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: '1.9' - uses: julia-actions/cache@v1 From 4be4ff70cdbec028753e2845ef82b6e039365341 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 18 Nov 2024 09:22:54 +0200 Subject: [PATCH 6/9] Use LTS release in Buildkite --- .buildkite/pipeline.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index bc3d7d2b9..8248a6cd6 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":julia: Julia {{matrix.julia}} + CUDA GPU" plugins: - - JuliaCI/julia#v1: + - JuliaCI/julia#v2: version: "{{matrix.julia}}" - JuliaCI/julia-test#v1: test_args: "--quickfail" @@ -23,8 +23,7 @@ steps: matrix: setup: julia: - # - "1.9" # uncomment when 1.10 is out - - "1" + - "lts" - "nightly" adjustments: - with: @@ -33,8 +32,8 @@ steps: - label: ":julia: Julia 1 + AMD GPU" plugins: - - JuliaCI/julia#v1: - version: "1.10" + - JuliaCI/julia#v2: + version: "lts" - JuliaCI/julia-test#v1: test_args: "--quickfail" - JuliaCI/julia-coverage#v1: From 9517436b58e3bb59e11b7add1bf2ac7504425102 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 18 Nov 2024 09:23:52 +0200 Subject: [PATCH 7/9] Fix --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8248a6cd6..5db747ac4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ steps: - label: ":julia: Julia {{matrix.julia}} + CUDA GPU" plugins: - - JuliaCI/julia#v2: + - JuliaCI/julia#v1: version: "{{matrix.julia}}" - JuliaCI/julia-test#v1: test_args: "--quickfail" @@ -32,7 +32,7 @@ steps: - label: ":julia: Julia 1 + AMD GPU" plugins: - - JuliaCI/julia#v2: + - JuliaCI/julia#v1: version: "lts" - JuliaCI/julia-test#v1: test_args: "--quickfail" From 54f430c8c5d18b05f2f97f9dda4e6bdabaae8909 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 18 Nov 2024 09:27:42 +0200 Subject: [PATCH 8/9] Use 1.10 in buildkite --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 5db747ac4..aafdf3cb5 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -23,7 +23,7 @@ steps: matrix: setup: julia: - - "lts" + - "1.10" - "nightly" adjustments: - with: @@ -33,7 +33,7 @@ steps: - label: ":julia: Julia 1 + AMD GPU" plugins: - JuliaCI/julia#v1: - version: "lts" + version: "1.10" - JuliaCI/julia-test#v1: test_args: "--quickfail" - JuliaCI/julia-coverage#v1: From c8e363d00631c1b9a1937c7791e01e3e81d99254 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Tue, 19 Nov 2024 22:57:52 +0200 Subject: [PATCH 9/9] Append CUDA to test Project --- .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index aafdf3cb5..8e4efac5a 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,7 @@ steps: - label: ":julia: Julia {{matrix.julia}} + CUDA GPU" + command: + - echo 'CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"' >> test/Project.toml plugins: - JuliaCI/julia#v1: version: "{{matrix.julia}}"