Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up Azure dependency in server build #5900

Merged
merged 6 commits into from
Jun 6, 2023
Merged

Clean up Azure dependency in server build #5900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
806a7df
[DO NOT MERGE]
GuanLuo Jun 3, 2023
cf31626
Remove Azure dependency in server component build
GuanLuo Jun 5, 2023
0839723
Finalize
GuanLuo Jun 5, 2023
d23581b
Fix dependency
GuanLuo Jun 5, 2023
04abbba
Fixing up
GuanLuo Jun 5, 2023
7036b61
Clean up
GuanLuo Jun 6, 2023
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
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
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
Comment on lines -198 to -200
Copy link
Contributor

@rmccorm4 rmccorm4 Jun 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks nice moving this into logic core repo completely. I think it would be a good cleanup/followup to move the other core deps strictly into the core repo where it makes sense, and only set the corresponding TRITON_ENABLE_* here in server, as you did for azure.

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
View file
Open in desktop
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
View file
Open in desktop
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