Skip to content

Commit 5dc3b53

Browse files
authored
infra: Down the gcc toolset version from 13 to 11 (#4114)
* Down the gcc toolset version from 13 to 11 Signed-off-by: ZhanruiSunCh <[email protected]> * Update rocky8 images Signed-off-by: ZhanruiSunCh <[email protected]> --------- Signed-off-by: ZhanruiSunCh <[email protected]>
1 parent 2681b26 commit 5dc3b53

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ set(TRTLLM_VERSION_DIR ${PROJECT_SOURCE_DIR}/../tensorrt_llm)
109109
set_directory_properties(PROPERTIES CMAKE_CONFIGURE_DEPENDS
110110
${TRTLLM_VERSION_DIR}/version.py)
111111
execute_process(
112-
COMMAND python3 -c "import version; print(version.__version__)"
112+
COMMAND ${Python_EXECUTABLE} -c "import version; print(version.__version__)"
113113
WORKING_DIRECTORY ${TRTLLM_VERSION_DIR}
114114
OUTPUT_VARIABLE TRTLLM_VERSION
115115
RESULT_VARIABLE TRTLLM_VERSION_RESULT
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:723334a99a2f23bd16f50e69c2a3f21a06a06a41d0eb2ebe100337cbc0907c1a
3-
size 52931896
2+
oid sha256:02d0983056f925c59313e03964bc04e4dcddd9f9fc46c7917db14296af4abdb5
3+
size 63562780
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
26da3daf623e613ccb02765cfb19b4ad9e19888a2fbfb0be7d2cfb96735c8a13 libtensorrt_llm_internal_cutlass_kernels_static.a
2-
commit 1c6e86206675670e0f37ebf40dcc2562d56039ca
1+
557bea7fa3fcd0b9230edecf3a8dbb10eeb1b8d78928861b1c6da1043f973c35 libtensorrt_llm_internal_cutlass_kernels_static.a
2+
commit 2e68c0113ad486c0026619711e5974f5ae0dc626
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a70cc6672a1a083c7bca7f8efe4331b84535e79a609cbae7a8b289a4cbb3725b
3-
size 52534712
2+
oid sha256:04f4daeb5e4f0762be994b583c50573fda5f994e95a5e737b0352ce2f6376d0b
3+
size 63062972
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bc4a32343119b018d87c5716986055ce5f149e0c8d695fcd591581310c1f6066 libtensorrt_llm_internal_cutlass_kernels_static.a
2-
commit 1c6e86206675670e0f37ebf40dcc2562d56039ca
1+
a956018ada7a223b2f9e4aa3331d7bdc4be8f69bdef9e3828f5f1c65beb11699 libtensorrt_llm_internal_cutlass_kernels_static.a
2+
commit 2e68c0113ad486c0026619711e5974f5ae0dc626

docker/common/install_base.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ install_gcctoolset_rockylinux() {
114114
vim \
115115
wget \
116116
git-lfs \
117-
gcc-toolset-13 \
117+
gcc-toolset-11 \
118118
libffi-devel \
119119
-y
120120
dnf install \
121121
openmpi \
122122
openmpi-devel \
123123
pigz \
124124
-y
125-
echo "source scl_source enable gcc-toolset-13" >> "${ENV}"
125+
echo "source scl_source enable gcc-toolset-11" >> "${ENV}"
126126
echo 'export PATH=/usr/lib64/openmpi/bin:$PATH' >> "${ENV}"
127127
}
128128

jenkins/L0_MergeRequest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ UPLOAD_PATH = env.uploadPath ? env.uploadPath : "sw-tensorrt-generic/llm-artifac
2323
// [base_image_name]-[arch]-[os](-[python_version])-[trt_version]-[torch_install_type]-[stage]-[date]-[mr_id]
2424
LLM_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.04-py3-x86_64-ubuntu24.04-trt10.10.0.31-skip-tritondevel-202505121727-4049"
2525
LLM_SBSA_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.04-py3-aarch64-ubuntu24.04-trt10.10.0.31-skip-tritondevel-202505121727-4049"
26-
LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py310-trt10.10.0.31-skip-tritondevel-202505121727-4049"
27-
LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py312-trt10.10.0.31-skip-tritondevel-202505121727-4049"
26+
LLM_ROCKYLINUX8_PY310_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py310-trt10.10.0.31-skip-tritondevel-202505131825-4114"
27+
LLM_ROCKYLINUX8_PY312_DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:cuda-12.9.0-devel-rocky8-x86_64-rocky8-py312-trt10.10.0.31-skip-tritondevel-202505131825-4114"
2828

2929
// TODO: Move common variables to an unified location
3030
BUILD_CORES_REQUEST = "8"

scripts/build_wheel.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ def main(*,
405405
f'cmake -DCMAKE_BUILD_TYPE="{build_type}" -DBUILD_PYT="{build_pyt}" -DBUILD_PYBIND="{build_pybind}"'
406406
f' -DNVTX_DISABLE="{disable_nvtx}" -DBUILD_MICRO_BENCHMARKS={build_micro_benchmarks}'
407407
f' -DBUILD_WHEEL_TARGETS="{";".join(targets)}"'
408+
f' -DPython_EXECUTABLE={venv_python} -DPython3_EXECUTABLE={venv_python}'
408409
f' {cmake_cuda_architectures} {cmake_def_args} {cmake_generator} -S "{source_dir}"'
409410
)
410411
print("CMake Configure command: ")

0 commit comments

Comments
 (0)