diff --git a/docker/Dockerfile.multi b/docker/Dockerfile.multi index 77fe4adde0a..7b3d2f02ff8 100644 --- a/docker/Dockerfile.multi +++ b/docker/Dockerfile.multi @@ -73,20 +73,12 @@ RUN bash ./install.sh --opencv && bash ./install.sh --protobuf && rm install.sh # wait for new triton to be published # Rename pytorch_triton package to triton +COPY docker/common/rename_pytorch_triton_to_triton.sh rename_pytorch_triton_to_triton.sh RUN if [ -f /etc/redhat-release ]; then \ echo "Rocky8 detected, skipping symlink and ldconfig steps"; \ + rm rename_pytorch_triton_to_triton.sh; \ else \ - cd /usr/local/lib/python3.12/dist-packages/ && \ - ls -la | grep pytorch_triton && \ - mv pytorch_triton-3.3.1+gitc8757738.dist-info triton-3.3.1+gitc8757738.dist-info && \ - cd triton-3.3.1+gitc8757738.dist-info && \ - echo "Current directory: $(pwd)" && \ - echo "Files in directory:" && \ - ls -la && \ - sed -i 's/^Name: pytorch-triton/Name: triton/' METADATA && \ - sed -i 's|pytorch_triton-3.3.1+gitc8757738.dist-info/|triton-3.3.1+gitc8757738.dist-info/|g' RECORD && \ - echo "METADATA after update:" && \ - grep "^Name:" METADATA; \ + bash ./rename_pytorch_triton_to_triton.sh && rm rename_pytorch_triton_to_triton.sh \ fi diff --git a/docker/common/rename_pytorch_triton_to_triton.sh b/docker/common/rename_pytorch_triton_to_triton.sh new file mode 100644 index 00000000000..a1126d4aa3d --- /dev/null +++ b/docker/common/rename_pytorch_triton_to_triton.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +cd /usr/local/lib/python3.12/dist-packages/ +ls -la | grep pytorch_triton +mv pytorch_triton-3.3.1+gitc8757738.dist-info triton-3.3.1+gitc8757738.dist-info +cd triton-3.3.1+gitc8757738.dist-info +echo "Current directory: $(pwd)" +echo "Files in directory:" +ls -la +sed -i 's/^Name: pytorch-triton/Name: triton/' METADATA +sed -i 's|pytorch_triton-3.3.1+gitc8757738.dist-info/|triton-3.3.1+gitc8757738.dist-info/|g' RECORD +echo "METADATA after update:" +grep "^Name:" METADATA; diff --git a/jenkins/L0_Test.groovy b/jenkins/L0_Test.groovy index 9312a4adcf9..21a87d46837 100644 --- a/jenkins/L0_Test.groovy +++ b/jenkins/L0_Test.groovy @@ -2433,20 +2433,7 @@ def launchTestJobs(pipeline, testFilter) // TODO: Remove this after public triton supports CUDA 13. if (key == "PY312-DLFW" && values[2] == X86_64_TRIPLE) { - trtllm_utils.llmExecStepWithRetry(pipeline, script: "pip3 install https://download.pytorch.org/whl/nightly/pytorch_triton-3.3.1%2Bgitc8757738-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl") - sh """ - cd /usr/local/lib/python3.12/dist-packages/ && \ - ls -la | grep pytorch_triton && \ - mv pytorch_triton-3.3.1+gitc8757738.dist-info triton-3.3.1+gitc8757738.dist-info && \ - cd triton-3.3.1+gitc8757738.dist-info && \ - echo "Current directory: \$(pwd)" && \ - echo "Files in directory:" && \ - ls -la && \ - sed -i 's/^Name: pytorch-triton/Name: triton/' METADATA && \ - sed -i 's|pytorch_triton-3.3.1+gitc8757738.dist-info/|triton-3.3.1+gitc8757738.dist-info/|g' RECORD && \ - echo "METADATA after update:" && \ - grep "^Name:" METADATA - """ + trtllm_utils.llmExecStepWithRetry(pipeline, script: "bash ${LLM_ROOT}/docker/common/rename_pytorch_triton_to_triton.sh") } def libEnv = []