Simplify CI and drop bors

Workaround various breakages

Author: vchuravy

.buildkite/pipeline.yml

@@ -39,6 +39,26 @@ steps:
       KERNELABSTRACTIONS_TEST_BACKEND: "CUDA"
     timeout_in_minutes: 60
 
+  - label: "CUDA Julia 1.7"
+    plugins:
+      - JuliaCI/julia#v1:
+          version: "1.7"
+      - JuliaCI/julia-coverage#v1:
+          codecov: true
+          dirs:
+            - src
+            - lib
+    commands:
+      - julia .ci/develop.jl
+      - julia .ci/test.jl
+    agents:
+      queue: "juliagpu"
+      cuda: "*"
+    env:
+      JULIA_CUDA_USE_BINARYBUILDER: "true"
+      KERNELABSTRACTIONS_TEST_BACKEND: "CUDA"
+    timeout_in_minutes: 60
+
   - label: "CUDA Julia nightly"
     plugins:
       - JuliaCI/julia#v1:

.ci/add-general-registry.jl

@@ -1,5 +1,5 @@
 import Pkg
 
-if VERSION >= v"1.5-" && !isdir(joinpath(DEPOT_PATH[1], "registries", "General"))
+if !isdir(joinpath(DEPOT_PATH[1], "registries", "General"))
     Pkg.Registry.add("General")
 end

.ci/develop.jl

@@ -7,24 +7,22 @@ root_directory = dirname(@__DIR__)
 kernelabstractions = Pkg.PackageSpec(path = root_directory)
 
 BACKEND = get(ENV, "KERNELABSTRACTIONS_TEST_BACKEND", "all")
-BUILDKITE = parse(Bool, get(ENV, "BUILDKITE", "false"))
+CI = parse(Bool, get(ENV, "CI", "false"))
 
-@info "Develop..." BUILDKITE
+@info "Develop..." CI
 
 Pkg.develop(kernelabstractions)
-if !(VERSION < v"1.6-")
-    if !BUILDKITE  || BACKEND == "ROCM"
-        rockernels = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "ROCKernels"))
-        Pkg.develop(rockernels)
-    end
-
-    if !BUILDKITE  || BACKEND == "CUDA"
-        cudakernels = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "CUDAKernels"))
-        Pkg.develop(cudakernels)
-    end
-
-    kernelgradients = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "KernelGradients"))
-    Pkg.develop(kernelgradients)
+if !CI || BACKEND == "ROCM"
+    rockernels = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "ROCKernels"))
+    Pkg.develop(rockernels)
 end
+
+if !CI || BACKEND == "CUDA"
+    cudakernels = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "CUDAKernels"))
+    Pkg.develop(cudakernels)
+end
+
+kernelgradients = Pkg.PackageSpec(path = joinpath(root_directory, "lib", "KernelGradients"))
+Pkg.develop(kernelgradients)
 Pkg.build()
 Pkg.precompile()

.ci/test.jl

@@ -1,19 +1,17 @@
 import Pkg
 
 BACKEND = get(ENV, "KERNELABSTRACTIONS_TEST_BACKEND", "all")
-BUILDKITE = parse(Bool, get(ENV, "BUILDKITE", "false"))
+CI = parse(Bool, get(ENV, "CI", "false"))
 
 pkgs = [
     "KernelAbstractions",
 ]
-if !(VERSION < v"1.6-")
-    if !BUILDKITE  || BACKEND == "ROCM"
-        push!(pkgs, "ROCKernels")
-    end
-    if !BUILDKITE  || BACKEND == "CUDA"
-        push!(pkgs, "CUDAKernels")
-    end
-    push!(pkgs, "KernelGradients")
+if !CI || BACKEND == "ROCM"
+    push!(pkgs, "ROCKernels")
 end
+if !CI || BACKEND == "CUDA"
+    push!(pkgs, "CUDAKernels")
+end
+push!(pkgs, "KernelGradients")
 
 Pkg.test(pkgs; coverage = true)

.github/workflows/ci-julia-nightly.yml renamed to .github/workflows/ci-ka-cuda.yml

@@ -1,22 +1,29 @@
-name: CI (Julia nightly)
+name: CI-KA-CUDA
 on:
   push:
     branches:
       - master
-      - staging
-      - trying
+      - release-*
     tags: '*'
+  pull_request:
 defaults:
   run:
     shell: bash
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
-  CI-julia-nightly:
-    name: CI-julia-nightly
+  CI:
+    name: CI
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
+          - '1.6'
+          - '1' # automatically expands to the latest stable 1.x release of Julia.
           - 'nightly'
         os:
           - ubuntu-latest
@@ -41,7 +48,11 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - run: julia .ci/develop.jl
+        env: 
+          KERNELABSTRACTIONS_TEST_BACKEND: "CUDA"
       - run: julia .ci/test.jl
+        env: 
+          KERNELABSTRACTIONS_TEST_BACKEND: "CUDA"
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

.github/workflows/ci-julia-1.6-nightly.yml renamed to .github/workflows/ci-ka-rocm.yml

@@ -1,23 +1,28 @@
-name: CI (Julia 1.6-nightly)
+name: CI-KA-ROCM
 on:
   push:
     branches:
       - master
-      - staging
-      - trying
+      - release-*
     tags: '*'
+  pull_request:
 defaults:
   run:
     shell: bash
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
-  CI-julia-1-6-nightly:
-    name: CI-julia-1-6-nightly
+  CI:
+    name: CI
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
-          - '1.6-nightly'
+          - '1.6'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -41,7 +46,11 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - run: julia .ci/develop.jl
+        env: 
+          KERNELABSTRACTIONS_TEST_BACKEND: "ROCM"
       - run: julia .ci/test.jl
+        env: 
+          KERNELABSTRACTIONS_TEST_BACKEND: "ROCM"
       - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v1
         with:

.github/workflows/ci.yml renamed to .github/workflows/ci-ka.yml

@@ -1,14 +1,19 @@
-name: CI
+name: CI-KA
 on:
   push:
     branches:
       - master
-      - staging
-      - trying
+      - release-*
     tags: '*'
+  pull_request:
 defaults:
   run:
     shell: bash
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 jobs:
   CI:
     name: CI
@@ -17,10 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
-          - '1.4'
-          - '1.5'
+          - '1.6'
           - '1' # automatically expands to the latest stable 1.x release of Julia.
+          - 'nightly'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -81,6 +85,4 @@ jobs:
           julia --project=docs -e '
             using Documenter: doctest
             using KernelAbstractions
-            using CUDAKernels
-            doctest(KernelAbstractions; manual = true)
-            doctest(CUDAKernels; manual = false)'
+            doctest(KernelAbstractions; manual = true)'

Project.toml

@@ -18,4 +18,4 @@ Cassette = "0.3.3"
 MacroTools = "0.5"
 SpecialFunctions = "0.10, 1.0, 2.0"
 StaticArrays = "0.12, 1.0"
-julia = "1.3"
+julia = "1.6"

README.md

@@ -5,7 +5,6 @@ KernelAbstractions.jl
 [![Documentation (stable)][docs-stable-img]][docs-stable-url]
 [![Documentation (latest)][docs-latest-img]][docs-latest-url]
 [![DOI][doi-img]][doi-url]
-[![Bors][bors-img]][bors-url]
 [![Code Coverage][codecov-img]][codecov-url]
 
 | Julia       | CPU CI                                                             | GPU CI                                                                    |
@@ -20,8 +19,6 @@ KernelAbstractions.jl
 [docs-latest-url]: https://juliagpu.github.io/KernelAbstractions.jl/dev
 [doi-img]: https://zenodo.org/badge/237471203.svg
 [doi-url]: https://zenodo.org/badge/latestdoi/237471203
-[bors-img]: https://bors.tech/images/badge_small.svg
-[bors-url]: https://app.bors.tech/repositories/23203
 [codecov-img]: https://codecov.io/gh/JuliaGPU/KernelAbstractions.jl/branch/master/graph/badge.svg
 [codecov-url]: https://codecov.io/gh/JuliaGPU/KernelAbstractions.jl
 [ci-img]: https://github.com/JuliaGPU/KernelAbstractions.jl/workflows/CI/badge.svg

bors.toml

@@ -1,6 +1,7 @@
-using KernelAbstractions, CUDAKernels, Test, CUDA
+using KernelAbstractions, Test
+include(joinpath(@__DIR__, "utils.jl")) # Load backend
 
-if has_cuda_gpu()
+if has_cuda && has_cuda_gpu()
     CUDA.allowscalar(false)
 end
 
@@ -42,7 +43,7 @@ wait(ev)
 @test isapprox(c, a*b)
 
 # beginning GPU tests
-if has_cuda_gpu()
+if has_cuda && has_cuda_gpu()
     d_a = CuArray(a)
     d_b = CuArray(b)
     d_c = CuArray(c)

examples/Manifest.toml

@@ -1,9 +1,5 @@
-using KernelAbstractions
-using CUDA
-using CUDAKernels
-using AMDGPU
-using ROCKernels
-using Test
+using KernelAbstractions, Test
+include(joinpath(@__DIR__, "utils.jl")) # Load backend
 
 @kernel function copy_kernel!(A, @Const(B))
     I = @index(Global)
@@ -23,8 +19,7 @@ wait(event)
 @test A == B
 
 
-if has_cuda_gpu()
-
+if has_cuda && has_cuda_gpu()
     function mycopy!(A::CuArray, B::CuArray)
         @assert size(A) == size(B)
         copy_kernel!(CUDADevice(), 256)(A, B, ndrange=length(A))
@@ -37,9 +32,7 @@ if has_cuda_gpu()
     @test A == B
 end
 
-
-if has_rocm_gpu()
-
+if has_rocm && has_rocm_gpu()
     function mycopy!(A::ROCArray, B::ROCArray)
         @assert size(A) == size(B)
         copy_kernel!(ROCDevice(), 256)(A, B, ndrange=length(A))

examples/matmul.jl

@@ -1,7 +1,5 @@
-using KernelAbstractions
-using CUDAKernels
-using CUDA
-using Test
+using KernelAbstractions, Test
+include(joinpath(@__DIR__, "utils.jl")) # Load backend
 
 @kernel function copy_kernel!(A, @Const(B))
     I = @index(Global)
@@ -20,7 +18,7 @@ event = mycopy_static!(A, B)
 wait(event)
 @test A == B
 
-if has_cuda_gpu()
+if has_cuda && has_cuda_gpu()
 
     function mycopy_static!(A::CuArray, B::CuArray)
         @assert size(A) == size(B)