From 6f85957ff296f9f224bfca1fbf902f07d2daed85 Mon Sep 17 00:00:00 2001 From: Bingxu Chen Date: Thu, 28 May 2026 14:25:01 +0800 Subject: [PATCH] [AMD] Fix aiter checkout (rocm dockerfile) (#26544) Co-authored-by: yctseng0211 --- docker/rocm.Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/rocm.Dockerfile b/docker/rocm.Dockerfile index c7e82d322..b0146deba 100644 --- a/docker/rocm.Dockerfile +++ b/docker/rocm.Dockerfile @@ -206,9 +206,14 @@ ENV SETUPTOOLS_SCM_PRETEND_VERSION= # AITER_USE_SYSTEM_TRITON=0 when intentionally testing aiter-managed Triton. ENV AITER_USE_SYSTEM_TRITON=1 RUN pip uninstall -y aiter +# Use `checkout -f` so the smudge-filter-induced "dirty" working tree from +# AITER's .gitattributes (*.csv text eol=lf, added in ROCm/aiter#3370) does not +# block switching to commits that predate that rule (e.g. the current default +# AITER_COMMIT_DEFAULT). The working tree was just produced by a fresh +# `git clone` above, so there are no real user changes to preserve. RUN git clone ${AITER_REPO} \ && cd aiter \ - && git checkout ${AITER_COMMIT} \ + && git checkout -f ${AITER_COMMIT} \ && git cherry-pick --no-commit b639cb63bcac4672dce33a731fad042a65cb3649 \ && git submodule update --init --recursive \ && pip install -r requirements.txt