Skip to content

Commit 69abe69

Browse files
authored
build: TPRD-1622 - Update version to CMake 4.0 or 3.31 ( 3.31.8 ) which has support for CUDA new layout (#443)
* Update workflow * build: TPRD-1622 - Update version to CMake 4.0 or 3.31 ( 3.31.8 ) which has support for CUDA new layout * Update cmake configuration * Disable policy CMP0167: https://cmake.org/cmake/help/latest/module/FindBoost.html * Fix year issue * Restore gibhub workflow to the default branch state
1 parent ba7f004 commit 69abe69

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright 2020-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
cmake_minimum_required(VERSION 3.18)
27+
cmake_minimum_required(VERSION 3.31.8)
2828

2929
project(tritoncore LANGUAGES C CXX)
3030

python/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
2323
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26-
cmake_minimum_required(VERSION 3.18)
26+
cmake_minimum_required(VERSION 3.31.8)
2727

2828
add_subdirectory(tritonserver)
2929

python/tritonserver/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
cmake_minimum_required (VERSION 3.18)
27+
cmake_minimum_required (VERSION 3.31.8)
2828

2929
project(triton-bindings LANGUAGES C CXX)
3030

src/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright 2019-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
cmake_minimum_required(VERSION 3.18)
27+
cmake_minimum_required(VERSION 3.31.8)
2828

2929
project(libtritonserver LANGUAGES C CXX)
3030

@@ -55,15 +55,14 @@ FetchContent_MakeAvailable(repo-common)
5555
#
5656
if(${TRITON_ENABLE_GPU})
5757
find_package(CUDAToolkit REQUIRED)
58-
find_package(CUDA REQUIRED)
59-
message(STATUS "Using CUDA ${CUDA_VERSION}")
6058
endif() # TRITON_ENABLE_GPU
6159

6260
#
6361
# Boost
6462
#
6563
# Minimum of 1.78 required for use of boost::span. This can eventually be
6664
# relaxed and replaced with std::span in C++20.
65+
cmake_policy (SET CMP0167 OLD)
6766
find_package(Boost 1.78 REQUIRED COMPONENTS)
6867
message(STATUS "Using Boost ${Boost_VERSION}")
6968

@@ -371,13 +370,13 @@ if(${TRITON_ENABLE_GPU})
371370
PRIVATE TRITON_MIN_COMPUTE_CAPABILITY=${TRITON_MIN_COMPUTE_CAPABILITY}
372371
)
373372

374-
if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1")
373+
if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL "10.1")
375374
target_compile_definitions(
376375
triton-core
377376
PRIVATE TRITON_ENABLE_CUDA_GRAPH=1
378377
)
379378
else()
380-
message(WARNING "CUDA ${CUDA_VERSION} does not support CUDA graphs.")
379+
message(WARNING "CUDA ${CUDAToolkit_VERSION} does not support CUDA graphs.")
381380
endif()
382381
endif() # TRITON_ENABLE_GPU
383382

src/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# Copyright 2019-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
cmake_minimum_required(VERSION 3.18)
27+
cmake_minimum_required(VERSION 3.31.8)
2828

2929
#
3030
# Unit tests

0 commit comments

Comments
 (0)