From 6ff3a0b3d640161d912a8e98f843be3081383c21 Mon Sep 17 00:00:00 2001 From: oandreeva-nv Date: Mon, 18 Dec 2023 18:46:55 -0800 Subject: [PATCH 1/3] Adding specification of CXX standard --- CMakeLists.txt | 7 +++++-- examples/backends/bls/CMakeLists.txt | 5 ++++- examples/backends/minimal/CMakeLists.txt | 5 ++++- examples/backends/recommended/CMakeLists.txt | 5 ++++- .../batching_strategies/single_batching/CMakeLists.txt | 5 ++++- .../batching_strategies/volume_batching/CMakeLists.txt | 5 ++++- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b19081c..51af09f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,9 @@ option(TRITON_ENABLE_MEMORY_TRACKER "Include device memory tracker in backend ut set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") +# C++ standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -76,7 +79,7 @@ if(${TRITON_ENABLE_GPU}) find_package(CUDAToolkit REQUIRED) find_package(CUDA REQUIRED) message(STATUS "Using CUDA ${CUDA_VERSION}") - set(CUDA_NVCC_FLAGS -std=c++11) + set(CUDA_NVCC_FLAGS -std=c++${TRITON_MIN_CXX_STANDARD}) if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1") add_definitions(-DTRITON_ENABLE_CUDA_GRAPH=1) @@ -145,7 +148,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") "If the target system is not Windows 10, please update _WIN32_WINNT " "to corresponding value.") endif() -target_compile_features(triton-backend-utils PRIVATE cxx_std_11) + target_compile_options( triton-backend-utils PRIVATE diff --git a/examples/backends/bls/CMakeLists.txt b/examples/backends/bls/CMakeLists.txt index f584009..4ff2cf1 100644 --- a/examples/backends/bls/CMakeLists.txt +++ b/examples/backends/bls/CMakeLists.txt @@ -44,6 +44,9 @@ set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") +# C++ min standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -100,7 +103,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-bls-backend PRIVATE cxx_std_11) +target_compile_features(triton-bls-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-bls-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/minimal/CMakeLists.txt b/examples/backends/minimal/CMakeLists.txt index ab3ebd5..d5bcd43 100644 --- a/examples/backends/minimal/CMakeLists.txt +++ b/examples/backends/minimal/CMakeLists.txt @@ -44,6 +44,9 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# C++ min standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -97,7 +100,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-minimal-backend PRIVATE cxx_std_11) +target_compile_features(triton-minimal-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-minimal-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/recommended/CMakeLists.txt b/examples/backends/recommended/CMakeLists.txt index 26e451a..40bb7f1 100644 --- a/examples/backends/recommended/CMakeLists.txt +++ b/examples/backends/recommended/CMakeLists.txt @@ -44,6 +44,9 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# C++ min standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -97,7 +100,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-recommended-backend PRIVATE cxx_std_11) +target_compile_features(triton-recommended-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-recommended-backend PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/single_batching/CMakeLists.txt b/examples/batching_strategies/single_batching/CMakeLists.txt index 6c9ba94..7f9d4bf 100644 --- a/examples/batching_strategies/single_batching/CMakeLists.txt +++ b/examples/batching_strategies/single_batching/CMakeLists.txt @@ -32,6 +32,9 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# C++ min standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -81,7 +84,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-single-batching PRIVATE cxx_std_11) +target_compile_features(triton-single-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-single-batching PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/volume_batching/CMakeLists.txt b/examples/batching_strategies/volume_batching/CMakeLists.txt index 02eed01..c777210 100644 --- a/examples/batching_strategies/volume_batching/CMakeLists.txt +++ b/examples/batching_strategies/volume_batching/CMakeLists.txt @@ -32,6 +32,9 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# C++ min standard +set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -81,7 +84,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-volume-batching PRIVATE cxx_std_11) +target_compile_features(triton-volume-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-volume-batching PRIVATE $<$,$,$>: From 01fd43c699d7833cbc51e28cb8947dcb110b0e33 Mon Sep 17 00:00:00 2001 From: oandreeva-nv Date: Tue, 19 Dec 2023 14:28:22 -0800 Subject: [PATCH 2/3] Clarifying cmake standard setting --- CMakeLists.txt | 11 +++++++++-- examples/backends/bls/CMakeLists.txt | 10 ++++++++-- examples/backends/minimal/CMakeLists.txt | 10 ++++++++-- examples/backends/recommended/CMakeLists.txt | 10 ++++++++-- .../single_batching/CMakeLists.txt | 10 ++++++++-- .../volume_batching/CMakeLists.txt | 10 ++++++++-- 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51af09f..0f1d722 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,15 @@ option(TRITON_ENABLE_MEMORY_TRACKER "Include device memory tracker in backend ut set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") -# C++ standard +# Setting C++ standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -79,7 +85,7 @@ if(${TRITON_ENABLE_GPU}) find_package(CUDAToolkit REQUIRED) find_package(CUDA REQUIRED) message(STATUS "Using CUDA ${CUDA_VERSION}") - set(CUDA_NVCC_FLAGS -std=c++${TRITON_MIN_CXX_STANDARD}) + set(CUDA_NVCC_FLAGS -std=c++${BACKEND_CMAKE_CXX_STANDARD}) if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1") add_definitions(-DTRITON_ENABLE_CUDA_GRAPH=1) @@ -149,6 +155,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") "to corresponding value.") endif() +target_compile_features(triton-backend-utils PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-backend-utils PRIVATE diff --git a/examples/backends/bls/CMakeLists.txt b/examples/backends/bls/CMakeLists.txt index 4ff2cf1..4dea1d6 100644 --- a/examples/backends/bls/CMakeLists.txt +++ b/examples/backends/bls/CMakeLists.txt @@ -44,9 +44,15 @@ set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") -# C++ min standard +# Setting C++ min standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -103,7 +109,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-bls-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) +target_compile_features(triton-bls-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-bls-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/minimal/CMakeLists.txt b/examples/backends/minimal/CMakeLists.txt index d5bcd43..1e0d5cb 100644 --- a/examples/backends/minimal/CMakeLists.txt +++ b/examples/backends/minimal/CMakeLists.txt @@ -44,9 +44,15 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") -# C++ min standard +# Setting C++ min standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -100,7 +106,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-minimal-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) +target_compile_features(triton-minimal-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-minimal-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/recommended/CMakeLists.txt b/examples/backends/recommended/CMakeLists.txt index 40bb7f1..acfefb5 100644 --- a/examples/backends/recommended/CMakeLists.txt +++ b/examples/backends/recommended/CMakeLists.txt @@ -44,9 +44,15 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") -# C++ min standard +# Setting C++ min standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -100,7 +106,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-recommended-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) +target_compile_features(triton-recommended-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-recommended-backend PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/single_batching/CMakeLists.txt b/examples/batching_strategies/single_batching/CMakeLists.txt index 7f9d4bf..dec9143 100644 --- a/examples/batching_strategies/single_batching/CMakeLists.txt +++ b/examples/batching_strategies/single_batching/CMakeLists.txt @@ -32,9 +32,15 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") -# C++ min standard +# Setting C++ min standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -84,7 +90,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-single-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) +target_compile_features(triton-single-batching PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-single-batching PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/volume_batching/CMakeLists.txt b/examples/batching_strategies/volume_batching/CMakeLists.txt index c777210..22702cc 100644 --- a/examples/batching_strategies/volume_batching/CMakeLists.txt +++ b/examples/batching_strategies/volume_batching/CMakeLists.txt @@ -32,9 +32,15 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") -# C++ min standard +# Setting C++ min standard set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") +if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) + set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) +else() + set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) +endif() + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -84,7 +90,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-volume-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) +target_compile_features(triton-volume-batching PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) target_compile_options( triton-volume-batching PRIVATE $<$,$,$>: From 54ead128d13f6795b01f4bf3f014961e6dd8d8b3 Mon Sep 17 00:00:00 2001 From: oandreeva-nv Date: Wed, 20 Dec 2023 10:46:06 -0800 Subject: [PATCH 3/3] Clean up --- CMakeLists.txt | 12 ++++-------- examples/backends/bls/CMakeLists.txt | 10 +++------- examples/backends/minimal/CMakeLists.txt | 10 +++------- examples/backends/recommended/CMakeLists.txt | 10 +++------- .../single_batching/CMakeLists.txt | 10 +++------- .../volume_batching/CMakeLists.txt | 10 +++------- 6 files changed, 19 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f1d722..e4aeaaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,15 +40,11 @@ option(TRITON_ENABLE_MEMORY_TRACKER "Include device memory tracker in backend ut set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") +# # Setting C++ standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -85,7 +81,7 @@ if(${TRITON_ENABLE_GPU}) find_package(CUDAToolkit REQUIRED) find_package(CUDA REQUIRED) message(STATUS "Using CUDA ${CUDA_VERSION}") - set(CUDA_NVCC_FLAGS -std=c++${BACKEND_CMAKE_CXX_STANDARD}) + set(CUDA_NVCC_FLAGS -std=c++${TRITON_MIN_CXX_STANDARD}) if(CUDA_VERSION VERSION_GREATER "10.1" OR CUDA_VERSION VERSION_EQUAL "10.1") add_definitions(-DTRITON_ENABLE_CUDA_GRAPH=1) @@ -155,7 +151,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") "to corresponding value.") endif() -target_compile_features(triton-backend-utils PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-backend-utils PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-backend-utils PRIVATE diff --git a/examples/backends/bls/CMakeLists.txt b/examples/backends/bls/CMakeLists.txt index 4dea1d6..e30ea28 100644 --- a/examples/backends/bls/CMakeLists.txt +++ b/examples/backends/bls/CMakeLists.txt @@ -44,15 +44,11 @@ set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo") +# # Setting C++ min standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -109,7 +105,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-bls-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-bls-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-bls-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/minimal/CMakeLists.txt b/examples/backends/minimal/CMakeLists.txt index 1e0d5cb..94ed1a6 100644 --- a/examples/backends/minimal/CMakeLists.txt +++ b/examples/backends/minimal/CMakeLists.txt @@ -44,15 +44,11 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# # Setting C++ min standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -106,7 +102,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-minimal-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-minimal-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-minimal-backend PRIVATE $<$,$,$>: diff --git a/examples/backends/recommended/CMakeLists.txt b/examples/backends/recommended/CMakeLists.txt index acfefb5..803638b 100644 --- a/examples/backends/recommended/CMakeLists.txt +++ b/examples/backends/recommended/CMakeLists.txt @@ -44,15 +44,11 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# # Setting C++ min standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -106,7 +102,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-recommended-backend PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-recommended-backend PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-recommended-backend PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/single_batching/CMakeLists.txt b/examples/batching_strategies/single_batching/CMakeLists.txt index dec9143..7ab1af7 100644 --- a/examples/batching_strategies/single_batching/CMakeLists.txt +++ b/examples/batching_strategies/single_batching/CMakeLists.txt @@ -32,15 +32,11 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# # Setting C++ min standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -90,7 +86,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-single-batching PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-single-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-single-batching PRIVATE $<$,$,$>: diff --git a/examples/batching_strategies/volume_batching/CMakeLists.txt b/examples/batching_strategies/volume_batching/CMakeLists.txt index 22702cc..5636bdd 100644 --- a/examples/batching_strategies/volume_batching/CMakeLists.txt +++ b/examples/batching_strategies/volume_batching/CMakeLists.txt @@ -32,15 +32,11 @@ set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/ set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo") set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo") +# # Setting C++ min standard +# set(TRITON_MIN_CXX_STANDARD 17 CACHE STRING "The minimum C++ standard whose features are requested to build this target.") -if (NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS ${TRITON_MIN_CXX_STANDARD}) - set(BACKEND_CMAKE_CXX_STANDARD ${TRITON_MIN_CXX_STANDARD}) -else() - set(BACKEND_CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD}) -endif() - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -90,7 +86,7 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_compile_features(triton-volume-batching PRIVATE cxx_std_${BACKEND_CMAKE_CXX_STANDARD}) +target_compile_features(triton-volume-batching PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD}) target_compile_options( triton-volume-batching PRIVATE $<$,$,$>: