Skip to content

Commit

Permalink
Clean up Azure dependency in server build (#5900)
Browse files Browse the repository at this point in the history
* [DO NOT MERGE]

* Remove Azure dependency in server component build

* Finalize

* Fix dependency

* Fixing up

* Clean up
  • Loading branch information
GuanLuo authored Jun 6, 2023
1 parent 4fa7467 commit ab7b70a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ endif() # TRITON_ENABLE_GCS
if(${TRITON_ENABLE_S3})
set(TRITON_DEPENDS ${TRITON_DEPENDS} aws-sdk-cpp)
endif() # TRITON_ENABLE_S3
if(${TRITON_ENABLE_AZURE_STORAGE})
set(TRITON_DEPENDS ${TRITON_DEPENDS} azure-storage-cpplite)
endif() # TRITON_ENABLE_AZURE_STORAGE
if(${TRITON_ENABLE_HTTP} OR ${TRITON_ENABLE_METRICS} OR ${TRITON_ENABLE_SAGEMAKER} OR ${TRITON_ENABLE_VERTEX_AI})
set(TRITON_DEPENDS ${TRITON_DEPENDS} libevent libevhtp)
endif() # TRITON_ENABLE_HTTP || TRITON_ENABLE_METRICS || TRITON_ENABLE_SAGEMAKER || TRITON_ENABLE_VERTEX_AI
Expand Down Expand Up @@ -226,7 +223,6 @@ ExternalProject_Add(triton-server
-DLibevent_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/libevent/lib/cmake/libevent
-Dlibevhtp_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/libevhtp/lib/cmake/libevhtp
-Dstorage_client_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/google-cloud-cpp/${LIB_DIR}/cmake/storage_client
-Dazure-storage-cpplite_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/azure-storage-cpplite
-Dgoogle_cloud_cpp_common_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/google-cloud-cpp/${LIB_DIR}/cmake/google_cloud_cpp_common
-DCrc32c_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/crc32c/${LIB_DIR}/cmake/Crc32c
-DAWSSDK_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/aws-sdk-cpp/${LIB_DIR}/cmake/AWSSDK
Expand Down
7 changes: 3 additions & 4 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
# incorrectly load the other version of the openvino libraries.
#
TRITON_VERSION_MAP = {

'2.35.0dev': (
'23.06dev', # triton container
'23.05', # upstream container
Expand Down Expand Up @@ -908,7 +907,7 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
# libcurl4-openSSL-dev is needed for GCS
# python3-dev is needed by Torchvision
# python3-pip and libarchive-dev is needed by python backend
# uuid-dev and pkg-config is needed for Azure Storage
# libxml2-dev is needed for Azure Storage
# scons is needed for armnn_tflite backend build dep
RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -932,12 +931,12 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap):
rapidjson-dev \
scons \
software-properties-common \
pkg-config \
unzip \
wget \
zlib1g-dev \
libarchive-dev \
pkg-config \
uuid-dev \
libxml2-dev \
libnuma-dev && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion qa/L0_storage_azure/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RET=0
BACKENDS=${BACKENDS:="graphdef savedmodel onnx libtorch plan"}

function run_unit_tests() {
python $INFER_TEST >$CLIENT_LOG 2>&1
BACKENDS=$BACKENDS python $INFER_TEST >$CLIENT_LOG 2>&1
if [ $? -ne 0 ]; then
cat $CLIENT_LOG
echo -e "\n***\n*** Test Failed\n***"
Expand Down

0 comments on commit ab7b70a

Please sign in to comment.