Skip to content

Commit 092a5fe

Browse files
authored
Merge branch 'main' into qwen3vl-cp-vision-grad-fix
2 parents e34d288 + c705936 commit 092a5fe

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

docker/Dockerfile.ci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
9595
CXXFLAGS="-I/usr/local/cuda/include/cccl${CXXFLAGS:+ $CXXFLAGS} -DNDEBUG" && \
9696
# Reinstall nvidia-cutlass-dsl in system site packages
9797
# uv install can run into non-deterministic install issues
98+
# Keep this pin compatible with cuDNN Frontend; mismatched versions can break
99+
# its CUTLASS-backed kernels.
98100
pip uninstall -y nvidia-cutlass-dsl nvidia-cutlass-dsl-libs-base nvidia-cutlass-dsl-libs-cu13 && \
99101
pip install nvidia-cutlass-dsl[cu13]==4.5.0 && \
100102
if [ "$MCORE_TRIGGERED_TESTING" = "true" ]; then \

docker/common/fw_pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ override-dependencies = [
103103
"nvidia-cusparse-cu12; sys_platform == 'never'",
104104
"nvidia-cusparselt-cu12; sys_platform == 'never'",
105105
"nvidia-nccl-cu12; sys_platform == 'never'",
106-
"nvidia-cudnn-frontend==1.24.0",
106+
"nvidia-cudnn-frontend==1.26.0",
107107
"nvidia-cutlass-dsl[cu13]; sys_platform == 'never'", # Rely on system site packages install
108108
"tensorrt-llm; sys_platform == 'never'",
109109
"tensorrt; sys_platform == 'never'",

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ override-dependencies = [
140140
"onnx>=1.21.0; python_version < '3.13'", # onnx<1.21 has missing lower bound on ml-dtypes, uses float4_e2m1fn (requires ml-dtypes>=0.5.0)
141141
# TODO: Remove this cap once huggingface/transformers#46381 is merged and included in a Transformers release.
142142
"tokenizers>=0.22.0,<0.23", # tokenizers 0.23 renames RobertaProcessing's 'cls' kwarg to 'cls_token'; transformers still passes cls= (breaks CLIPTokenizer)
143-
"nvidia-cudnn-frontend==1.24.0",
143+
"nvidia-cudnn-frontend==1.26.0",
144144
"nvidia-cutlass-dsl[cu13]; sys_platform == 'never'", # Rely on system site packages install
145145
"fast-hadamard-transform @ git+https://github.com/Dao-AILab/fast-hadamard-transform.git@v1.1.0" # pin 1.1.0; PyPI sdist is incomplete, install from git tag (see DSv4/GLM-5 READMEs)
146146
]

uv.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)