disable triton

Author: Sayan Shaw

CMakeLists.txt

@@ -112,10 +112,10 @@ set(OCOS_ONNXRUNTIME_PKG_URI "" CACHE STRING
 set(OCOS_BUILD_PRESET "" CACHE STRING
   "Specify the build preset cmake settings file path, like 'token_api_only' which includes ./cmake/presets/token_api_only.cmake")
 
-# AzureOp can be enabled by environment varaible OCOS_ENABLE_AZURE == 1
-if (DEFINED ENV{OCOS_ENABLE_AZURE})
+# AzureOp can be enabled by environment variable OCOS_ENABLE_AZURE=1
+if (DEFINED ENV{OCOS_ENABLE_AZURE} AND "$ENV{OCOS_ENABLE_AZURE}" STREQUAL "1")
   set(OCOS_ENABLE_AZURE ON CACHE INTERNAL "" FORCE)
-  message(STATUS "=> AzureOp is enabled env variable.")
+  message(STATUS "=> AzureOp is enabled via environment variable.")
 endif()
 
 function(disable_all_operators)

cmake/externals/triton.cmake

@@ -77,19 +77,19 @@ if (WIN32)
   set(triton_patch_exe ${PROJECT_SOURCE_DIR}/cmake/externals/git.Win32.2.41.03.patch/patch.exe)
   set(triton_dependencies ${VCPKG_DEPENDENCIES})
 else()
-  # RapidJSON 1.1.0 (released in 2016) has C++ compatibility issues with GCC 14 (deprecated std::iterator,
-  # const member assignment). Use master branch which includes these fixes and already has cmake_minimum_required 3.5.
-  #
-  # Note: Newer RapidJSON uses modern CMake with exported targets and changed the variable name from
-  # RAPIDJSON_INCLUDE_DIRS to RapidJSON_INCLUDE_DIRS. Triton expects the uppercase version, so we pass
-  # RAPIDJSON_INCLUDE_DIRS directly as a cmake argument to the triton build.
+  # RapidJSON 1.1.0 (released in 2016) is compatible with the triton build. Later code is not compatible without
+  # patching due to the change in variable name for the include dir from RAPIDJSON_INCLUDE_DIRS to
+  # RapidJSON_INCLUDE_DIRS in the generated cmake file used by find_package:
+  #   https://github.com/Tencent/rapidjson/commit/b91c515afea9f0ba6a81fc670889549d77c83db3
+  # The triton code here https://github.com/triton-inference-server/common/blob/main/CMakeLists.txt is using
+  # RAPIDJSON_INCLUDE_DIRS so the build fails if a newer RapidJSON version is used. It will find the package but the
+  # include path will be wrong so the build error is delayed/misleading and non-trivial to understand/resolve.
   set(RapidJSON_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_deps/rapidjson)
   set(RapidJSON_INSTALL_DIR ${RapidJSON_PREFIX}/install)
   ExternalProject_Add(RapidJSON
                       PREFIX ${RapidJSON_PREFIX}
-                      GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
-                      GIT_TAG master
-                      GIT_SHALLOW TRUE
+                      URL https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.zip
+                      URL_HASH SHA1=0fe7b4f7b83df4b3d517f4a202f3a383af7a0818
                       CMAKE_ARGS -DRAPIDJSON_BUILD_DOC=OFF
                                  -DRAPIDJSON_BUILD_EXAMPLES=OFF
                                  -DRAPIDJSON_BUILD_TESTS=OFF
@@ -100,10 +100,10 @@ else()
 
   ExternalProject_Get_Property(RapidJSON SOURCE_DIR BINARY_DIR)
   # message(STATUS "RapidJSON src=${SOURCE_DIR} binary=${BINARY_DIR}")
-  # Set RapidJSON_ROOT_DIR for find_package. The cmake config files are installed to lib/cmake/RapidJSON
-  set(RapidJSON_ROOT_DIR ${RapidJSON_INSTALL_DIR}/lib/cmake/RapidJSON)
-  # Triton expects RAPIDJSON_INCLUDE_DIRS (uppercase). Pass it directly as a cmake arg.
-  set(triton_extra_cmake_args -DRAPIDJSON_INCLUDE_DIRS=${RapidJSON_INSTALL_DIR}/include)
+  # Set RapidJSON_ROOT_DIR for find_package. The required RapidJSONConfig.cmake file is generated in the binary dir
+  set(RapidJSON_ROOT_DIR ${BINARY_DIR})
+
+  set(triton_extra_cmake_args "")
   set(triton_patch_exe patch)
   set(triton_dependencies RapidJSON)
 
@@ -145,4 +145,4 @@ ExternalProject_Add(triton
 add_dependencies(triton ${triton_dependencies})
 
 ExternalProject_Get_Property(triton SOURCE_DIR BINARY_DIR)
-set(triton_THIRD_PARTY_DIR ${BINARY_DIR}/third-party)
+set(triton_THIRD_PARTY_DIR ${BINARY_DIR}/third-party)