Skip to content

fix: remove unnecessary shell=True in ROCm GPU architecture detection #7915

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

Merged
tohtana merged 3 commits into from
Mar 24, 2026
Merged

fix: remove unnecessary shell=True in ROCm GPU architecture detection #7915

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
852b2a8
fix: remove shell=True in ROCm GPU arch and wavefront size detection
instantraaamen Mar 20, 2026
d1ddbf4
fix: also catch OSError when rocminfo is not executable
instantraaamen Mar 20, 2026
c034306
Merge branch 'master' into fix/rocm-shell-true-removal
tohtana Mar 24, 2026
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
19 changes: 10 additions & 9 deletions op_builder/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,12 @@ def get_rocm_gpu_arch():
rocm_info = Path("/opt/rocm/bin/rocminfo")
if (not rocm_info.is_file()):
rocm_info = Path("rocminfo")
rocm_gpu_arch_cmd = str(rocm_info) + " | grep -o -m 1 'gfx.*'"
try:
result = subprocess.check_output(rocm_gpu_arch_cmd, shell=True)
rocm_gpu_arch = result.decode('utf-8').strip()
except subprocess.CalledProcessError:
result = subprocess.check_output([str(rocm_info)], stderr=subprocess.DEVNULL)
output = result.decode('utf-8')
match = re.search(r'gfx\S+', output)
rocm_gpu_arch = match.group(0).strip() if match else ""
except (subprocess.CalledProcessError, FileNotFoundError, OSError):
rocm_gpu_arch = ""
OpBuilder._rocm_gpu_arch = rocm_gpu_arch
return OpBuilder._rocm_gpu_arch
Expand All @@ -275,12 +276,12 @@ def get_rocm_wavefront_size():
rocm_info = Path("/opt/rocm/bin/rocminfo")
if (not rocm_info.is_file()):
rocm_info = Path("rocminfo")
rocm_wavefront_size_cmd = str(
rocm_info) + " | grep -Eo -m1 'Wavefront Size:[[:space:]]+[0-9]+' | grep -Eo '[0-9]+'"
try:
result = subprocess.check_output(rocm_wavefront_size_cmd, shell=True)
rocm_wavefront_size = result.decode('utf-8').strip()
except subprocess.CalledProcessError:
result = subprocess.check_output([str(rocm_info)], stderr=subprocess.DEVNULL)
output = result.decode('utf-8')
match = re.search(r'Wavefront Size:\s+(\d+)', output)
rocm_wavefront_size = match.group(1) if match else "32"
except (subprocess.CalledProcessError, FileNotFoundError, OSError):
rocm_wavefront_size = "32"
OpBuilder._rocm_wavefront_size = rocm_wavefront_size
return OpBuilder._rocm_wavefront_size
Expand Down
Loading