Skip to content

Commit 47f9f5d

Browse files
committed
[TRTLLM-8464][infra] remove WAR code for triton, simplified installation in CUDA 13 environment
Signed-off-by: ZhanruiSunCh <[email protected]>
1 parent e986165 commit 47f9f5d

File tree

3 files changed

+2
-38
lines changed

3 files changed

+2
-38
lines changed

docker/Dockerfile.multi

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,6 @@ RUN TORCH_INSTALL_TYPE=${TORCH_INSTALL_TYPE} bash ./install.sh --pytorch && rm i
7171

7272
RUN bash ./install.sh --opencv && bash ./install.sh --protobuf && rm install.sh
7373

74-
# wait for new triton to be published
75-
# Rename pytorch_triton package to triton
76-
RUN if [ -f /etc/redhat-release ]; then \
77-
echo "Rocky8 detected, skipping symlink and ldconfig steps"; \
78-
else \
79-
cd /usr/local/lib/python3.12/dist-packages/ && \
80-
ls -la | grep pytorch_triton && \
81-
mv pytorch_triton-3.3.1+gitc8757738.dist-info triton-3.3.1+gitc8757738.dist-info && \
82-
cd triton-3.3.1+gitc8757738.dist-info && \
83-
echo "Current directory: $(pwd)" && \
84-
echo "Files in directory:" && \
85-
ls -la && \
86-
sed -i 's/^Name: pytorch-triton/Name: triton/' METADATA && \
87-
sed -i 's|pytorch_triton-3.3.1+gitc8757738.dist-info/|triton-3.3.1+gitc8757738.dist-info/|g' RECORD && \
88-
echo "METADATA after update:" && \
89-
grep "^Name:" METADATA; \
90-
fi
91-
92-
9374
FROM ${TRITON_IMAGE}:${TRITON_BASE_TAG} AS triton
9475

9576
FROM devel AS tritondevel

jenkins/L0_Test.groovy

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2441,24 +2441,6 @@ def launchTestJobs(pipeline, testFilter)
24412441
}
24422442
}
24432443

2444-
// TODO: Remove this after public triton supports CUDA 13.
2445-
if (key == "PY312-DLFW" && values[2] == X86_64_TRIPLE) {
2446-
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")
2447-
sh """
2448-
cd /usr/local/lib/python3.12/dist-packages/ && \
2449-
ls -la | grep pytorch_triton && \
2450-
mv pytorch_triton-3.3.1+gitc8757738.dist-info triton-3.3.1+gitc8757738.dist-info && \
2451-
cd triton-3.3.1+gitc8757738.dist-info && \
2452-
echo "Current directory: \$(pwd)" && \
2453-
echo "Files in directory:" && \
2454-
ls -la && \
2455-
sed -i 's/^Name: pytorch-triton/Name: triton/' METADATA && \
2456-
sed -i 's|pytorch_triton-3.3.1+gitc8757738.dist-info/|triton-3.3.1+gitc8757738.dist-info/|g' RECORD && \
2457-
echo "METADATA after update:" && \
2458-
grep "^Name:" METADATA
2459-
"""
2460-
}
2461-
24622444
def libEnv = []
24632445
if (env.alternativeTRT) {
24642446
stage("Replace TensorRT") {

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ ninja
7070
etcd3
7171
blake3
7272
soundfile
73-
triton==3.3.1; platform_machine == "x86_64"
73+
# triton==3.3.1; platform_machine == "x86_64" # <For CUDA 12.9>
74+
pytorch-triton==3.3.1; platform_machine == "x86_64" # public triton not support CUDA 13, use pytorch-triton instead
7475
tiktoken
7576
blobfile
7677
openai-harmony==0.0.4

0 commit comments

Comments
 (0)