Skip to content

Commit d670186

Browse files
authored
Improve CUPTI check now that CUDA 13 update 1 is out (#2884)
1 parent 0148ac6 commit d670186

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/initialization.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function __init__()
155155
end
156156

157157
# if we're not running under an external profiler, let CUPTI handle NVTX events
158-
if !NVTX.isactive() && CUPTI.version() != v"13.0" # NVIDIA/NVTX#125
158+
if !NVTX.isactive() && CUPTI.version() != v"13.0.0" # NVIDIA/NVTX#125
159159
ENV["NVTX_INJECTION64_PATH"] = CUDA_Runtime.libcupti
160160
NVTX.activate()
161161
end
@@ -209,13 +209,13 @@ function __init__()
209209
"cublas", "cupti", "cusparse", "cufft", "curand", "cusolver"]
210210
for lib in Libdl.dllist()
211211
contains(lib, "artifacts") && continue
212-
212+
213213
# skip driver store directories on Windows - these contain legitimate libraries
214214
# that are part of the display driver installation (at least on CUDA 13+)
215215
if Sys.iswindows() && contains(lib, "DriverStore")
216216
continue
217217
end
218-
218+
219219
if any(rtlib -> contains(lib, rtlib), runtime_libraries)
220220
@warn """CUDA runtime library `$(basename(lib))` was loaded from a system path, `$lib`.
221221
This may cause errors.

test/core/profile.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ let
7474
@test occursin("cuCtxGetCurrent", str)
7575
end
7676

77+
if CUPTI.version() != v"13.0.0" # NVIDIA/NVTX#125
78+
7779
# NVTX markers
7880
let
7981
str = string(CUDA.@profile trace=true NVTX.@mark "a marker")
@@ -88,6 +90,8 @@ let
8890
@test occursin("a range", str)
8991
end
9092

93+
end
94+
9195
end
9296
end
9397

0 commit comments

Comments
 (0)