Skip to content

Commit

Permalink
Merge pull request #2404 from JuliaGPU/tb/cudnn
Browse files Browse the repository at this point in the history
Bump cuDNN
  • Loading branch information
maleadt authored May 30, 2024
2 parents bbfd1ad + 786bd12 commit b07cf99
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 39 deletions.
127 changes: 92 additions & 35 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ steps:
cuda: "*"
commands: |
echo -e "[CUDA_Runtime_jll]\nlocal = \"true\"" >LocalPreferences.toml
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip julia\]/
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only julia\]/ ||
build.message !~ /\[only/ &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip julia\]/
timeout_in_minutes: 60
matrix:
setup:
Expand Down Expand Up @@ -56,7 +61,12 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip cuda\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only cuda\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip cuda\]/
timeout_in_minutes: 30
matrix:
setup:
Expand Down Expand Up @@ -101,7 +111,12 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip subpackages\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only subpackages\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip subpackages\]/
timeout_in_minutes: 15
commands: |
julia -e '
Expand Down Expand Up @@ -165,7 +180,12 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip downstream\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only downstream\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip downstream\]/
timeout_in_minutes: 30
soft_fail:
- exit_status: 3
Expand Down Expand Up @@ -204,7 +224,12 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip downstream\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only downstream\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip downstream\]/
timeout_in_minutes: 30
soft_fail:
- exit_status: 3
Expand Down Expand Up @@ -236,31 +261,14 @@ steps:
agents:
queue: "juliagpu"
intel: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip special\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only special\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip special\]/
timeout_in_minutes: 5

- label: "Documentation"
plugins:
- JuliaCI/julia#v1:
version: "1.10"
command: |
julia --project -e '
println("--- :julia: Instantiating project")
using Pkg
Pkg.instantiate()
Pkg.activate("docs")
Pkg.instantiate()
push!(LOAD_PATH, @__DIR__)
println("+++ :julia: Building documentation")
include("docs/make.jl")'
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip docs\]/ &&
!build.pull_request.draft
timeout_in_minutes: 15

- label: "Compute sanitizer"
plugins:
- JuliaCI/julia#v1:
Expand All @@ -277,7 +285,12 @@ steps:
cuda: "*"
env:
JULIA_CUDA_USE_COMPAT: 'false' # NVIDIA bug #3418723: injection tools prevent probing libcuda
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip special\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only special\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip special\]/
timeout_in_minutes: 30

- label: "Legacy memory allocator"
Expand All @@ -296,7 +309,12 @@ steps:
cuda: "*"
env:
JULIA_CUDA_MEMORY_POOL: 'none'
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip special\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only special\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip special\]/
timeout_in_minutes: 30

- label: "CuArray with {{matrix.memory}} memory"
Expand All @@ -313,7 +331,12 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip special\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only special\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip special\]/
timeout_in_minutes: 30
matrix:
setup:
Expand All @@ -338,13 +361,42 @@ steps:
queue: "juliagpu"
cuda: "*"
multigpu: "*"
if: build.message !~ /\[skip tests\]/ && build.message !~ /\[skip special\]/ && !build.pull_request.draft
if: |
build.message =~ /\[only tests\]/ ||
build.message =~ /\[only special\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip tests\]/ &&
build.message !~ /\[skip special\]/
timeout_in_minutes: 30

# we want to benchmark every commit on the master branch, even if it failed CI
- wait: ~
continue_on_failure: true

- label: ":books: Documentation"
plugins:
- JuliaCI/julia#v1:
version: "1.10"
command: |
julia --project -e '
println("--- :julia: Instantiating project")
using Pkg
Pkg.instantiate()
Pkg.activate("docs")
Pkg.instantiate()
push!(LOAD_PATH, @__DIR__)
println("+++ :julia: Building documentation")
include("docs/make.jl")'
agents:
queue: "juliagpu"
cuda: "*"
if: |
build.message =~ /\[only docs\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip docs\]/
timeout_in_minutes: 15

- group: ":racehorse: Benchmarks"
steps:
# benchmarks outside of the master branch don't submit their results,
Expand All @@ -370,8 +422,10 @@ steps:
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip benchmarks\]/ && !build.pull_request.draft &&
build.branch !~ /^master$$/
if: |
build.message =~ /\[only benchmarks\]/ ||
build.message !~ /\[only/ && !build.pull_request.draft &&
build.message !~ /\[skip benchmarks\]/
timeout_in_minutes: 30

# if we will submit results, use the benchmark queue so that we will
Expand Down Expand Up @@ -405,7 +459,10 @@ steps:
queue: "benchmark"
gpu: "rtx2070"
cuda: "*"
if: build.message !~ /\[skip benchmarks\]/ && build.branch =~ /^master$$/
if: |
build.branch =~ /^master$$/ && build.message =~ /\[only benchmarks\]/ ||
build.branch =~ /^master$$/ && build.message !~ /\[only/ &&
build.message !~ /\[skip benchmarks\]/
matrix:
setup:
julia:
Expand Down
2 changes: 1 addition & 1 deletion lib/cudnn/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ CUDNN_jll = "62b44479-cb7b-5706-934f-f13b2eb2e645"
CEnum = "0.2, 0.3, 0.4, 0.5"
CUDA = "~5.4"
CUDA_Runtime_Discovery = "0.2, 0.3"
CUDNN_jll = "~9.0"
CUDNN_jll = "~9.1"
julia = "1.8"
4 changes: 3 additions & 1 deletion lib/cudnn/src/libcudnn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ const cudnnFraction_t = cudnnFractionStruct
CUDNN_POINTWISE_ERF = 20
CUDNN_POINTWISE_IDENTITY = 21
CUDNN_POINTWISE_RECIPROCAL = 22
CUDNN_POINTWISE_ATAN2 = 23
CUDNN_POINTWISE_RELU_FWD = 100
CUDNN_POINTWISE_TANH_FWD = 101
CUDNN_POINTWISE_SIGMOID_FWD = 102
Expand Down Expand Up @@ -649,7 +650,8 @@ end
CUDNN_NUMERICAL_NOTE_WINOGRAD_TILE_4x4 = 6
CUDNN_NUMERICAL_NOTE_WINOGRAD_TILE_6x6 = 7
CUDNN_NUMERICAL_NOTE_WINOGRAD_TILE_13x13 = 8
CUDNN_NUMERICAL_NOTE_TYPE_COUNT = 9
CUDNN_NUMERICAL_NOTE_STRICT_NAN_PROP = 9
CUDNN_NUMERICAL_NOTE_TYPE_COUNT = 10
end

@cenum cudnnBackendBehaviorNote_t::UInt32 begin
Expand Down
4 changes: 2 additions & 2 deletions res/wrap/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ version = "12.5.0+0"

[[CUDNN_jll]]
deps = ["Artifacts", "CUDA_Runtime_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
git-tree-sha1 = "cbf7d75f8c58b147bdf6acea2e5bc96cececa6d4"
git-tree-sha1 = "f286c44edd5f86a5429425b568e52f49dd5ce38f"
uuid = "62b44479-cb7b-5706-934f-f13b2eb2e645"
version = "9.0.0+1"
version = "9.1.1+0"

[[CUTENSOR_jll]]
deps = ["Artifacts", "CUDA_Runtime_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
Expand Down

0 comments on commit b07cf99

Please sign in to comment.