fix: single-line python in CI yaml and improve mesa driver discovery

The multi-line python block inside $() in the YAML run: | block had
lines starting at column 0, which breaks the YAML scalar parser (same
issue as before). Collapse to a single line.

Also improve the *_drv_video.so search: use rglob instead of checking
a hardcoded lib/dri/ path so the mesa VA-API backend driver is found
regardless of the exact subdirectory AMD chose inside _rocm_sdk_core.

The fallback diagnostic now greps the full recursive listing for
dri/va/video/mesa/gallium/radeon keywords to pinpoint the layout if
the driver isn't found.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: akashveramd

.github/workflows/linux_rocm.yaml

@@ -176,13 +176,16 @@ jobs:
         # ROCm 7.14 ships mesa inside _rocm_sdk_core (no separate dnf install
         # needed). Point libva's driver search path at the DRI drivers bundled
         # there so vaInitialize() can find the amdgpu/radeonsi VA-API backend.
-        rocm_core_dri=$(python -c "import importlib.util, pathlib; spec = importlib.util.find_spec('_rocm_sdk_core'); p = pathlib.Path(spec.submodule_search_locations[0]) if spec else None; d = p/'lib'/'dri' if p else None; print(str(d) if d and d.is_dir() else '')" 2>/dev/null || true)
+        # Search recursively for *_drv_video.so so we find it regardless of
+        # the exact subdirectory AMD chose (typically lib/dri/).
+        rocm_core_dri=$(python -c "import importlib.util, pathlib; spec = importlib.util.find_spec('_rocm_sdk_core'); p = pathlib.Path(spec.submodule_search_locations[0]) if spec else None; hits = list((p/'lib').rglob('*_drv_video.so')) if p else []; print(str(hits[0].parent)) if hits else None" 2>/dev/null || true)
         if [ -n "${rocm_core_dri}" ]; then
           export LIBVA_DRIVERS_PATH="${rocm_core_dri}"
           echo "LIBVA_DRIVERS_PATH: ${rocm_core_dri}"
         else
-          echo "WARNING: _rocm_sdk_core/lib/dri not found; listing _rocm_sdk_core/lib/ to diagnose:"
-          python -c "import importlib.util, pathlib; spec = importlib.util.find_spec('_rocm_sdk_core'); p = pathlib.Path(spec.submodule_search_locations[0]) if spec else None; [print(x) for x in sorted((p/'lib').iterdir())] if p else None" 2>/dev/null || true
+          echo "WARNING: no *_drv_video.so found in _rocm_sdk_core/lib; VA-API driver missing?"
+          echo "Contents of _rocm_sdk_core/lib (recursive *_drv_video.so search):"
+          python -c "import importlib.util, pathlib; spec = importlib.util.find_spec('_rocm_sdk_core'); p = pathlib.Path(spec.submodule_search_locations[0]) if spec else None; [print(x) for x in sorted((p/'lib').rglob('*'))] if p else None" 2>/dev/null | grep -E "dri|va|video|mesa|gallium|radeon" || true
         fi
         # Diagnostics: dump ldd on the image .so so any missing dep is visible.
         image_so=$(python -c "import importlib.util, pathlib; spec = importlib.util.find_spec('torchcodec'); print(pathlib.Path(spec.origin).parent / 'libtorchcodec_image.so')" 2>/dev/null || true)

packaging/install_rocjpeg.sh

@@ -43,11 +43,10 @@ hits = (glob.glob('/opt/conda/**/librocjpeg.so*', recursive=True) +
 sys.exit(0 if hits else 1)
 " 2>/dev/null; then
     echo "librocjpeg already present (ROCm pip-wheel install); skipping dnf install."
-    # librocjpeg links libva.so.2 at load time. The AMD VA-API backend driver
-    # (mesa) ships inside _rocm_sdk_core since ROCm 7.14; it does NOT need a
-    # separate dnf install. Install only the base libva soname so the dynamic
-    # linker can resolve libva.so.2 at load time (rocJPEG's vendored
-    # librocm_sysdeps_va.so.2 handles everything else internally).
+    # librocjpeg links libva.so.2 at load time. Since ROCm 7.14, AMD bundles
+    # mesa (incl. the amdgpu/radeonsi VA-API backend DRI driver) inside
+    # _rocm_sdk_core — no separate dnf install needed. Install only the base
+    # libva soname so the dynamic linker can resolve libva.so.2.
     dnf install -y libva 2>/dev/null || true
 else
     dnf install -y --refresh rocjpeg-devel libva-amdgpu mesa-amdgpu-va-drivers \