From 439e4db91cd5fa40af4a46e0336c60f8d9484c97 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Fri, 30 May 2025 07:30:05 -0700 Subject: [PATCH 1/4] remove breakpoint (#3540) --- py/torch_tensorrt/dynamo/conversion/custom_ops_converters.py | 1 - 1 file changed, 1 deletion(-) diff --git a/py/torch_tensorrt/dynamo/conversion/custom_ops_converters.py b/py/torch_tensorrt/dynamo/conversion/custom_ops_converters.py index 17850fabce..6fedd712b1 100644 --- a/py/torch_tensorrt/dynamo/conversion/custom_ops_converters.py +++ b/py/torch_tensorrt/dynamo/conversion/custom_ops_converters.py @@ -54,7 +54,6 @@ def fused_nccl_reduce_scatter( [args[0]], ) - breakpoint() else: _LOGGER.debug( "Did not load torch.distributed converters since TensorRT-LLM is not available" From edf1517d1d8f8c6ea8acef040652b456fb26f06d Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Fri, 30 May 2025 11:04:00 -0700 Subject: [PATCH 2/4] fix the build issue for patch2.6.1 (#3542) --- core/util/Exception.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/util/Exception.h b/core/util/Exception.h index 8725601467..1dc346716f 100644 --- a/core/util/Exception.h +++ b/core/util/Exception.h @@ -1,3 +1,8 @@ +// Include cstdint for GCC 13+ or Clang 13+ +#if (defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 13)) || (defined(__clang__) && (__clang_major__ >= 13)) +#include +#endif + #pragma once #include From 505b002f77f470b1b43c683e243a28645610b4d0 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Mon, 2 Jun 2025 09:48:49 -0700 Subject: [PATCH 3/4] update version to 2.6.1 (#3545) --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 3d87ca93f8..fc827248cf 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.6.0a0 +2.6.1a0 From 707f16da0b752b3a1694816f8cd1f73a80fe7670 Mon Sep 17 00:00:00 2001 From: lanluo-nvidia Date: Mon, 2 Jun 2025 17:54:43 -0700 Subject: [PATCH 4/4] cherry pick 3505(windows driver upgrade) to release2.6.1 (#3547) --- .github/scripts/install-torch-tensorrt.sh | 2 +- packaging/driver_upgrade.bat | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/install-torch-tensorrt.sh b/.github/scripts/install-torch-tensorrt.sh index 86dfeda343..c75bfdb09d 100644 --- a/.github/scripts/install-torch-tensorrt.sh +++ b/.github/scripts/install-torch-tensorrt.sh @@ -6,7 +6,7 @@ PLATFORM=$(python -c "import sys; print(sys.platform)") # Install all the dependencies required for Torch-TensorRT pip install --pre ${TORCH_TORCHVISION} --index-url ${INDEX_URL} -pip install --pre -r ${PWD}/tests/py/requirements.txt --use-deprecated legacy-resolver +pip install --pre -r ${PWD}/tests/py/requirements.txt # Install Torch-TensorRT if [[ ${PLATFORM} == win32 ]]; then diff --git a/packaging/driver_upgrade.bat b/packaging/driver_upgrade.bat index 886e908f55..352005d69f 100644 --- a/packaging/driver_upgrade.bat +++ b/packaging/driver_upgrade.bat @@ -1,10 +1,10 @@ -REM Source: https://github.com/pytorch/builder/blob/4e109742d88ff3c85e77d60bc4d90d229d7f6afe/windows/internal/driver_update.bat -set "DRIVER_DOWNLOAD_LINK=https://ossci-windows.s3.amazonaws.com/528.89-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe" -curl --retry 3 -kL %DRIVER_DOWNLOAD_LINK% --output 528.89-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe +set WIN_DRIVER_VN=528.89 +set "DRIVER_DOWNLOAD_LINK=https://ossci-windows.s3.amazonaws.com/%WIN_DRIVER_VN%-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe" +curl --retry 3 -kL %DRIVER_DOWNLOAD_LINK% --output %WIN_DRIVER_VN%-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe if errorlevel 1 exit /b 1 -start /wait 528.89-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe -s -noreboot +start /wait %WIN_DRIVER_VN%-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe -s -noreboot if errorlevel 1 exit /b 1 -del 528.89-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe || ver > NUL +del %WIN_DRIVER_VN%-data-center-tesla-desktop-winserver-2016-2019-2022-dch-international.exe || ver > NUL