Skip to content

Commit 606591f

Browse files
sayanshaw24Sayan Shaw
andauthored
Disable Triton Due to Compatibility Issues (#1020)
* add triton and rapidjson patch * add support for AlmaLinux and Rocky Linux * fix GCC 14 compatibility issues * use RapidJSON master with GCC 14 fixes and backward compat patch * use RapidJSON master with GCC 14 fixes and backward compat patch * remove patch * disable triton --------- Co-authored-by: Sayan Shaw <sayanshaw@microsoft.com>
1 parent eebd5d5 commit 606591f

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ set(OCOS_ONNXRUNTIME_PKG_URI "" CACHE STRING
112112
set(OCOS_BUILD_PRESET "" CACHE STRING
113113
"Specify the build preset cmake settings file path, like 'token_api_only' which includes ./cmake/presets/token_api_only.cmake")
114114

115-
# AzureOp can be enabled by environment varaible OCOS_ENABLE_AZURE == 1
116-
if (DEFINED ENV{OCOS_ENABLE_AZURE})
115+
# AzureOp can be enabled by environment variable OCOS_ENABLE_AZURE=1
116+
if (DEFINED ENV{OCOS_ENABLE_AZURE} AND "$ENV{OCOS_ENABLE_AZURE}" STREQUAL "1")
117117
set(OCOS_ENABLE_AZURE ON CACHE INTERNAL "" FORCE)
118-
message(STATUS "=> AzureOp is enabled env variable.")
118+
message(STATUS "=> AzureOp is enabled via environment variable.")
119119
endif()
120120

121121
function(disable_all_operators)

cmake/externals/triton.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,4 @@ ExternalProject_Add(triton
145145
add_dependencies(triton ${triton_dependencies})
146146

147147
ExternalProject_Get_Property(triton SOURCE_DIR BINARY_DIR)
148-
set(triton_THIRD_PARTY_DIR ${BINARY_DIR}/third-party)
148+
set(triton_THIRD_PARTY_DIR ${BINARY_DIR}/third-party)

cmake/externals/triton_cmake.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
22
index 7b11178..7749fa9 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -115,10 +115,11 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
5+
@@ -115,10 +115,12 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
66
file(STRINGS /etc/os-release DISTRO REGEX "^NAME=")
77
string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" DISTRO "${DISTRO}")
88
message(STATUS "Distro Name: ${DISTRO}")
99
- if(DISTRO STREQUAL "CentOS Linux")
10-
+ if(DISTRO STREQUAL "CentOS Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
10+
+ # Check for CentOS, AlmaLinux, or Rocky Linux (used by newer manylinux images) on 64-bit systems
11+
+ if((DISTRO STREQUAL "CentOS Linux" OR DISTRO STREQUAL "AlmaLinux" OR DISTRO STREQUAL "Rocky Linux") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
1112
set (CURL_LIB_DIR "lib64")
1213
endif()
1314
endif()

0 commit comments

Comments
 (0)