Decode the CUPTI version. (#2843)

Author: maleadt

lib/cupti/wrappers.jl

@@ -1,7 +1,43 @@
+# https://docs.nvidia.com/cupti/api/group__CUPTI__VERSION__API.html
+const cupti_versions = [
+    v"4.0",
+    v"4.1",
+    v"5.0",
+    v"5.5",
+    v"6.0",
+    v"6.5",
+    v"6.5.1", # with sm_52 support
+    v"7.0",
+    v"8.0",
+    v"9.0",
+    v"9.1",
+    v"10.0", # and v10.1 and v10.2
+    v"11.0",
+    v"11.1",
+    v"11.2", # and v11.3 and v11.4
+    v"11.5",
+    v"11.6",
+    v"11.8",
+    v"12.0",
+    v"12.2",
+    v"12.3",
+    v"12.4",
+    v"12.5",
+    v"12.6",
+    v"12.8",
+    v"12.9",
+    v"12.9.1"]
+
 function version()
     version_ref = Ref{Cuint}()
     cuptiGetVersion(version_ref)
-    VersionNumber(version_ref[])
+    if CUDA.runtime_version() < v"13"
+        cupti_versions[version_ref[]]
+    else
+        major, ver = divrem(version_ref[], 10000)
+        minor, patch = divrem(ver, 100)
+        VersionNumber(major, minor, patch)
+    end
 end
 
 # XXX: `cuptiGetVersion` returns something more like the API version, and doesn't change

src/initialization.jl

@@ -160,7 +160,7 @@ function __init__()
     end
 
     # if we're not running under an external profiler, let CUPTI handle NVTX events
-    if !NVTX.isactive() && toolkit_version < v"13" # NVIDIA/NVTX#125
+    if !NVTX.isactive() && CUPTI.version() != v"13.0" # NVIDIA/NVTX#125
         ENV["NVTX_INJECTION64_PATH"] = CUDA_Runtime.libcupti
         NVTX.activate()
     end