diff --git a/src/initialization.jl b/src/initialization.jl index d46c057159..7c07424a05 100644 --- a/src/initialization.jl +++ b/src/initialization.jl @@ -155,7 +155,7 @@ function __init__() end # if we're not running under an external profiler, let CUPTI handle NVTX events - if !NVTX.isactive() && CUPTI.version() != v"13.0" # NVIDIA/NVTX#125 + if !NVTX.isactive() && CUPTI.version() != v"13.0.0" # NVIDIA/NVTX#125 ENV["NVTX_INJECTION64_PATH"] = CUDA_Runtime.libcupti NVTX.activate() end @@ -209,13 +209,13 @@ function __init__() "cublas", "cupti", "cusparse", "cufft", "curand", "cusolver"] for lib in Libdl.dllist() contains(lib, "artifacts") && continue - + # skip driver store directories on Windows - these contain legitimate libraries # that are part of the display driver installation (at least on CUDA 13+) if Sys.iswindows() && contains(lib, "DriverStore") continue end - + if any(rtlib -> contains(lib, rtlib), runtime_libraries) @warn """CUDA runtime library `$(basename(lib))` was loaded from a system path, `$lib`. This may cause errors. diff --git a/test/core/profile.jl b/test/core/profile.jl index bea4d6ed7d..ef95d183c9 100644 --- a/test/core/profile.jl +++ b/test/core/profile.jl @@ -74,6 +74,8 @@ let @test occursin("cuCtxGetCurrent", str) end +if CUPTI.version() != v"13.0.0" # NVIDIA/NVTX#125 + # NVTX markers let str = string(CUDA.@profile trace=true NVTX.@mark "a marker") @@ -88,6 +90,8 @@ let @test occursin("a range", str) end +end + end end