Clarifying cmake standard setting

triton-inference-server · Dec 19, 2023 · 01fd43c · 01fd43c
1 parent 6ff3a0b
commit 01fd43c
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 12 deletions.
diff --git 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
@@ -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
   $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:

diff --git 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
   $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:

diff --git 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
   $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:

diff --git 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
   $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:

diff --git 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
   $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>: