Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More safely parse CUDA versions when subprocess output is contaminated #16067

Merged
merged 1 commit into from
Jun 24, 2024
+10 −3
Merged

More safely parse CUDA versions when subprocess output is contaminated #16067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions python/cudf/cudf/utils/_ptxcompiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,11 +14,14 @@

import math
import os
import re
import subprocess
import sys
import warnings

NO_DRIVER = (math.inf, math.inf)
START_TAG = "_VER_START"
END_TAG = "_VER_END"

NUMBA_CHECK_VERSION_CMD = """\
from ctypes import c_int, byref
Expand All @@ -28,7 +31,7 @@
drv_major = dv.value // 1000
drv_minor = (dv.value - (drv_major * 1000)) // 10
run_major, run_minor = cuda.runtime.get_version()
print(f'{drv_major} {drv_minor} {run_major} {run_minor}')
print(f'_VER_START{drv_major} {drv_minor} {run_major} {run_minor}_VER_END')
"""


Expand Down Expand Up @@ -61,7 +64,11 @@ def get_versions():
warnings.warn(msg, UserWarning)
return NO_DRIVER

versions = [int(s) for s in cp.stdout.strip().split()]
pattern = r"_VER_START(.*?)_VER_END"

ver_str = re.search(pattern, cp.stdout.decode()).group(1)

versions = [int(s) for s in ver_str.strip().split()]
driver_version = tuple(versions[:2])
runtime_version = tuple(versions[2:])

Expand Down
Loading