From 3ceeb6e79350dbfd6740b4c095bf08e991bf7462 Mon Sep 17 00:00:00 2001 From: Alexius Wadell Date: Thu, 6 Jun 2024 15:56:31 -0400 Subject: [PATCH] misc: expand compat for cuda --- .github/workflows/CI.yml | 20 +++++++++++++++++--- Project.toml | 2 +- docs/Project.toml | 2 +- ext/PkgJoggerCUDAExt.jl | 2 +- src/profile.jl | 2 +- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 111f07e..64a9596 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,8 +19,8 @@ jobs: arch: - x64 steps: - - uses: actions/checkout@v3 - - uses: julia-actions/setup-julia@v1 + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} @@ -32,11 +32,25 @@ jobs: env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + legacy: + name: Test Min Compat Bounds + runs-on: ubuntu-latest + steps: + - uses: julia-actions/julia-downgrade-compat@v1 + if: ${{ matrix.os == 'ubuntu-latest' }} + - uses: actions/checkout@v4 + - uses: julia-actions/setup-julia@v2 + with: + version: 1.9 + - uses: julia-actions/cache@v1 + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 + action: name: Test Github action runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 - uses: julia-actions/cache@v1 - uses: "./" diff --git a/Project.toml b/Project.toml index 15f3c45..fd2a84a 100644 --- a/Project.toml +++ b/Project.toml @@ -31,10 +31,10 @@ CodecZlib = "0.7" Dates = "1.9" JSON = "0.21" LibGit2 = "1.9" +Revise = "3" NVTX = "0.3" Pkg = "1.9" Profile = "1.9" -Revise = "3" Statistics = "1.9" Test = "1.9" UUIDs = "1.9" diff --git a/docs/Project.toml b/docs/Project.toml index e45133a..28fc406 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -6,4 +6,4 @@ PkgJogger = "10150987-6cc1-4b76-abee-b1c1cbd91c01" Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" [compat] -Documenter = "1.2" +Documenter = "1.4" diff --git a/ext/PkgJoggerCUDAExt.jl b/ext/PkgJoggerCUDAExt.jl index 8ee8027..4de966a 100644 --- a/ext/PkgJoggerCUDAExt.jl +++ b/ext/PkgJoggerCUDAExt.jl @@ -16,7 +16,7 @@ Profiles the benchmark using [`CUDA.@profile`](@ref). """ function PkgJogger.profile(::Val{Symbol(:cuda)}, id, b::PkgJogger.BenchmarkTools.Benchmark; verbose) id_str = join(id, "/") - CUDA.@profile begin + CUDA.@profile external=true begin NVTX.@range id_str begin PkgJogger.BenchmarkTools.run(b) end diff --git a/src/profile.jl b/src/profile.jl index 288258e..6472f80 100644 --- a/src/profile.jl +++ b/src/profile.jl @@ -1,5 +1,5 @@ function profile(suite, profiler::Symbol; verbose=false, ref=nothing, kwargs...) - leaf = leaves(suite) + leaf = BenchmarkTools.leaves(suite) @assert length(leaf) == 1 "Profiling Support is limited to one benchmark at a time" id, benchmark = first(leaf) warmup(suite; verbose)