From 5f66b7afcb10beb3dd74ab631b0351fcab6e8494 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Tue, 15 Jul 2025 12:30:20 -0700 Subject: [PATCH 1/6] Update workflow --- .github/workflows/build-and-test.yml | 23 ++++++++++++++++++----- .github/workflows/pre-commit.yml | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cf4e7a495..f40a44023 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: nvcr.io/nvidia/tritonserver:24.10-py3 + image: nvcr.io/nvidia/tritonserver:25.06-py3 volumes: - ${{ github.workspace }}:/core # Mount /usr so we can free space @@ -32,10 +32,23 @@ jobs: - name: Install dependencies run: | - apt update - apt install -y --no-install-recommends clang-format-15 cmake libb64-dev rapidjson-dev libre2-dev - wget -O /tmp/boost.tar.gz https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && (cd /tmp && tar xzf boost.tar.gz) && mv /tmp/boost_1_80_0/boost /usr/include/boost && rm /tmp/boost.tar.gz - pip install build pytest pytest-asyncio + apt update -qq && \ + apt install -y --no-install-recommends \ + clang-format-15 \ + libb64-dev \ + libre2-dev \ + rapidjson-dev + - run: | + pip install \ + cmake \ + build \ + pytest \ + pytest-asyncio + - run: | + wget -O /tmp/boost.tar.gz https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && \ + tar xzf boost.tar.gz -C /tmp && \ + mv /tmp/boost_1_80_0/boost /usr/include/boost && \ + rm /tmp/boost.tar.gz - name: Build run: | diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index ab4bd951e..90ee2fc21 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -31,7 +31,7 @@ on: jobs: pre-commit: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v3 From c05d68f8bf42393213f5258e4a9fec8696d138de Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Wed, 9 Jul 2025 15:43:16 -0700 Subject: [PATCH 2/6] build: TPRD-1622 - Update version to CMake 4.0 or 3.31 ( 3.31.8 ) which has support for CUDA new layout --- CMakeLists.txt | 4 ++-- python/CMakeLists.txt | 4 ++-- python/tritonserver/CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 4 ++-- src/test/CMakeLists.txt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5453a411c..ab55276b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.31.8) project(tritoncore LANGUAGES C CXX) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index df7f1bde0..2f2d5a1ad 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ # OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.31.8) add_subdirectory(tritonserver) diff --git a/python/tritonserver/CMakeLists.txt b/python/tritonserver/CMakeLists.txt index d2480bc94..cc491d0a7 100644 --- a/python/tritonserver/CMakeLists.txt +++ b/python/tritonserver/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required (VERSION 3.18) +cmake_minimum_required (VERSION 3.31.8) project(triton-bindings LANGUAGES C CXX) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb911fbf0..59a3e66f0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.31.8) project(libtritonserver LANGUAGES C CXX) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 2df718b30..04af4898a 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.31.8) # # Unit tests From 3bd2005f39923aec7e1b89ca5fcd575ccf1906d5 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Mon, 14 Jul 2025 15:34:22 -0700 Subject: [PATCH 3/6] Update cmake configuration --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 59a3e66f0..54e42df60 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,8 +55,6 @@ FetchContent_MakeAvailable(repo-common) # if(${TRITON_ENABLE_GPU}) find_package(CUDAToolkit REQUIRED) - find_package(CUDA REQUIRED) - message(STATUS "Using CUDA ${CUDA_VERSION}") endif() # TRITON_ENABLE_GPU # @@ -371,13 +369,13 @@ if(${TRITON_ENABLE_GPU}) PRIVATE TRITON_MIN_COMPUTE_CAPABILITY=${TRITON_MIN_COMPUTE_CAPABILITY} ) - if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1") + if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL "10.1") target_compile_definitions( triton-core PRIVATE TRITON_ENABLE_CUDA_GRAPH=1 ) else() - message(WARNING "CUDA ${CUDA_VERSION} does not support CUDA graphs.") + message(WARNING "CUDA ${CUDAToolkit_VERSION} does not support CUDA graphs.") endif() endif() # TRITON_ENABLE_GPU From 5b5ef7ca78f880701e269ed2be4b942ac54aaab0 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Mon, 14 Jul 2025 18:31:40 -0700 Subject: [PATCH 4/6] Disable policy CMP0167: https://cmake.org/cmake/help/latest/module/FindBoost.html --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54e42df60..34d2d83a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,6 +62,7 @@ endif() # TRITON_ENABLE_GPU # # Minimum of 1.78 required for use of boost::span. This can eventually be # relaxed and replaced with std::span in C++20. +cmake_policy (SET CMP0167 OLD) find_package(Boost 1.78 REQUIRED COMPONENTS) message(STATUS "Using Boost ${Boost_VERSION}") From e59cef8d8c3c1552ef8961cc28d93b762741faef Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Tue, 15 Jul 2025 15:17:44 -0700 Subject: [PATCH 5/6] Fix year issue --- src/CMakeLists.txt | 2 +- src/test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34d2d83a9..28946b174 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2019-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 04af4898a..f0225b5f8 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright 2019-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions From b84a78f2a414384cc305b3b8c9fcc27b2f9e59c6 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Tue, 15 Jul 2025 15:20:08 -0700 Subject: [PATCH 6/6] Restore gibhub workflow to the default branch state --- .github/workflows/build-and-test.yml | 23 +++++------------------ .github/workflows/pre-commit.yml | 2 +- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f40a44023..cf4e7a495 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: nvcr.io/nvidia/tritonserver:25.06-py3 + image: nvcr.io/nvidia/tritonserver:24.10-py3 volumes: - ${{ github.workspace }}:/core # Mount /usr so we can free space @@ -32,23 +32,10 @@ jobs: - name: Install dependencies run: | - apt update -qq && \ - apt install -y --no-install-recommends \ - clang-format-15 \ - libb64-dev \ - libre2-dev \ - rapidjson-dev - - run: | - pip install \ - cmake \ - build \ - pytest \ - pytest-asyncio - - run: | - wget -O /tmp/boost.tar.gz https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && \ - tar xzf boost.tar.gz -C /tmp && \ - mv /tmp/boost_1_80_0/boost /usr/include/boost && \ - rm /tmp/boost.tar.gz + apt update + apt install -y --no-install-recommends clang-format-15 cmake libb64-dev rapidjson-dev libre2-dev + wget -O /tmp/boost.tar.gz https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz && (cd /tmp && tar xzf boost.tar.gz) && mv /tmp/boost_1_80_0/boost /usr/include/boost && rm /tmp/boost.tar.gz + pip install build pytest pytest-asyncio - name: Build run: | diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 90ee2fc21..ab4bd951e 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -31,7 +31,7 @@ on: jobs: pre-commit: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v3