Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/externals/triton.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 3 additions & 2 deletions cmake/externals/triton_cmake.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b11178..7749fa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,10 +115,11 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
@@ -115,10 +115,12 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
file(STRINGS /etc/os-release DISTRO REGEX "^NAME=")
string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" DISTRO "${DISTRO}")
message(STATUS "Distro Name: ${DISTRO}")
- if(DISTRO STREQUAL "CentOS Linux")
+ if(DISTRO STREQUAL "CentOS Linux" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+ # Check for CentOS, AlmaLinux, or Rocky Linux (used by newer manylinux images) on 64-bit systems
+ if((DISTRO STREQUAL "CentOS Linux" OR DISTRO STREQUAL "AlmaLinux" OR DISTRO STREQUAL "Rocky Linux") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set (CURL_LIB_DIR "lib64")
endif()
endif()
Expand Down
Loading