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

Enable custom triton-rapids repo and tag #409

Merged
merged 6 commits into from
Oct 17, 2024
Merged

Enable custom triton-rapids repo and tag #409

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c061227
enable changing of rapids triton branch and rapids backend triton remote
jbkyang-nvi Oct 9, 2024
08b45f3
add rapids triton stuff back
jbkyang-nvi Oct 15, 2024
06d9fb7
Merge branch 'main' into kyang-variable-rapids-include
jbkyang-nvi Oct 15, 2024
b412fa5
address comments
jbkyang-nvi Oct 15, 2024
7f4fb9a
Merge branch 'kyang-variable-rapids-include' of github.com:triton-inf…
jbkyang-nvi Oct 15, 2024
4c099c1
align naming in dockerfile
jbkyang-nvi Oct 16, 2024
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: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ option(TRITON_ENABLE_STATS "Include statistics collections in backend" ON)
option(TRITON_FIL_DOCKER_BUILD OFF)
option(BUILD_SHARED_LIBS OFF)

set(TRITON_REPO_ORGANIZATION "https://github.com/triton-inference-server" CACHE STRING "Git repository to pull from")
set(TRITON_REPO_ORGANIZATION "https://github.com/triton-inference-server" CACHE STRING "Git repository to pull triton libraries from")
set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo")
set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo")
set(TRITON_BACKEND_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/backend repo")
set(RAPIDS_TRITON_REPO_TAG "main" CACHE STRING "Tag for rapidsai/rapids-triton repo")
set(RAPIDS_TRITON_REPO_PATH "https://github.com/rapidsai/rapids-triton.git" CACHE STRING "Git repository to pull rapids_triton from")

if(TRITON_FIL_DOCKER_BUILD)
project(RAPIDS_TRITON_BACKEND VERSION 22.10.00)
Expand All @@ -45,6 +46,7 @@ if(TRITON_FIL_DOCKER_BUILD)
--build-arg TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG}
--build-arg TRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG}
--build-arg RAPIDS_TRITON_REPO_TAG=${RAPIDS_TRITON_REPO_TAG}
--build-arg RAPIDS_TRITON_REPO_PATH=${RAPIDS_TRITON_REPO_PATH}
-f ${CMAKE_CURRENT_LIST_DIR}/ops/Dockerfile
${CMAKE_CURRENT_LIST_DIR}
COMMAND docker rm triton_fil_builder || echo 'error ignored..' || true
Expand Down
11 changes: 1 addition & 10 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
set -e

REPODIR=$(cd $(dirname $0); pwd)

NUMARGS=$#
ARGS=$*
VALIDTARGETS="server tests"
Expand Down Expand Up @@ -49,10 +48,6 @@ HELP="$0 [<target> ...] [<flag> ...]
the build the test image
PREBUILT_IMAGE - A server image to be tested (used as base of test image)
TRITON_REF - Commit ref for Triton when using build.py
REPO_ORGANIZATION
- Repository organization to pull triton repositories from
Default is \"https://github.com/triton-inference-server\"

COMMON_REF - Commit ref for Triton common repo when using build.py
CORE_REF - Commit ref for Triton core repo when using build.py
BACKEND_REF - Commit ref for Triton backend repo when using build.py
Expand Down Expand Up @@ -203,7 +198,6 @@ then
# If the user has specified a TRITON_VERSION (or if we are performing a host
# build), set the upstream repo references to the corresponding branches
# (unless otherwise specified by the user)
[ ! -z $REPO_ORGANIZATION ] || REPO_ORGANIZATION='https://github.com/triton-inference-server'
[ ! -z $TRITON_REF ] || TRITON_REF="r${TRITON_VERSION}"
[ ! -z $COMMON_REF ] || COMMON_REF="r${TRITON_VERSION}"
[ ! -z $CORE_REF ] || CORE_REF="r${TRITON_VERSION}"
Expand All @@ -213,7 +207,6 @@ else
# If TRITON_VERSION has not been set, these values will only be used for a
# full build.py build, so it is safe to default to main rather than a release
# branch.
[ ! -z $REPO_ORGANIZATION ] || REPO_ORGANIZATION='https://github.com/triton-inference-server'
[ ! -z $TRITON_REF ] || TRITON_REF='main'
[ ! -z $COMMON_REF ] || COMMON_REF='main'
[ ! -z $CORE_REF ] || CORE_REF='main'
Expand Down Expand Up @@ -281,7 +274,7 @@ buildpy () {
then
rm -rf "$server_repo"
fi
git clone $REPO_ORGANIZATION/server.git \
git clone https://github.com/triton-inference-server/server.git \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why are we hardcoding this here now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed it back from before #404. I was not sure where build.sh is used in the pipeline so I let it be hardcoded, like before

"${server_repo}" \
-b $TRITON_REF \
--depth 1
Expand All @@ -294,7 +287,6 @@ buildpy () {
--enable-stats \
--endpoint=http \
--endpoint=grpc \
--github-organization=$REPO_ORGANIZATION \
--repo-tag=common:$COMMON_REF \
--repo-tag=core:$CORE_REF \
--repo-tag=backend:$BACKEND_REF \
Expand All @@ -318,7 +310,6 @@ hostbuild () {
-GNinja \
-DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-DBUILD_TESTS="OFF" \
-DTRITON_REPO_ORGANIZATION="$REPO_ORGANIZATION" \
-DTRITON_CORE_REPO_TAG="$CORE_REF" \
-DTRITON_COMMON_REPO_TAG="$COMMON_REF" \
-DTRITON_BACKEND_REPO_TAG="$BACKEND_REF" \
Expand Down
1 change: 0 additions & 1 deletion ci/gitlab/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ else
export PREBUILT_IMAGE="$PREBUILT_SERVER_TAG"
export SERVER_TAG="$PREBUILT_SERVER_TAG"
fi
[ -z $TRITON_REPO_ORGANIZATION ] || export REPO_ORGANIZATION="$TRITON_REPO_ORGANIZATION"
[ -z $TRITON_SERVER_REPO_TAG ] || export TRITON_REF="$TRITON_SERVER_REPO_TAG"
[ -z $TRITON_COMMON_REPO_TAG ] || export COMMON_REF="$TRITON_COMMON_REPO_TAG"
[ -z $TRITON_CORE_REPO_TAG ] || export CORE_REF="$TRITON_CORE_REPO_TAG"
Expand Down
13 changes: 6 additions & 7 deletions cmake/thirdparty/get_rapids-triton.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@ endfunction()
# CPM_raft_SOURCE=/path/to/local/raft
set (RAPIDS_FORK https://github.com/rapidsai/rapids-triton.git)
set (REPO_TAG branch-${RAPIDS_DEPENDENCIES_VERSION})
message(STATUS "Setting repo tag to ${REPO_TAG}")
# if Triton tag and organization is specified, change the fork and the repo
if (NOT TRITON_REPO_ORGANIZATION STREQUAL "https://github.com/triton-inference-server")
set (RAPIDS_FORK ${TRITON_REPO_ORGANIZATION}/rapids_triton.git)
message(STATUS "Setting repo fork to ${RAPIDS_FORK}")
endif()
if (NOT RAPIDS_TRITON_REPO_TAG STREQUAL "main")
message(STATUS "Setting repo tag to ${REPO_TAG} for rapids fork ${RAPIDS_FORK}")
# if Triton tag and organization is non-default, change the fork and repo tag used
# for rapids
if (NOT RAPIDS_TRITON_REPO_PATH STREQUAL RAPIDS_FORK)
set (RAPIDS_FORK ${RAPIDS_TRITON_REPO_PATH})
set (REPO_TAG ${RAPIDS_TRITON_REPO_TAG})
message(STATUS "Re-setting repo tag to ${REPO_TAG} for rapids fork ${RAPIDS_FORK}")
endif()

find_and_configure_rapids_triton(VERSION ${RAPIDS_DEPENDENCIES_VERSION}
Expand Down
11 changes: 7 additions & 4 deletions ops/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,18 @@ ENV BUILD_TESTS=$BUILD_TESTS
ARG BUILD_EXAMPLE
ENV BUILD_EXAMPLE=$BUILD_EXAMPLE

ARG TRITON_REPO_ORGANIZATION=https://github.com/triton-inference-server
ARG TRITON_REPO_ORGANIZATION=$TRITON_REPO_ORGANIZATION
Copy link
Collaborator

Choose a reason for hiding this comment

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

This line is not valid, since TRITON_REPO_ORGANIZATION is being used here without first being defined elsewhere. Is TRITON_REPO_ORGANIZATION somewhere else?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Currently, https://github.com/triton-inference-server is the default value for the argument TRITON_REPO_ORGANIZATION. You can override it by passing -DTRITON_REPO_ORGANIZATION=... when invoking CMake.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm following the format specified here: https://github.com/triton-inference-server/fil_backend/pull/409/files#diff-d2e93d579aa110eb1f1fb1526ea0d7ca3fe7cbb3ed700ad8826aae45341a43beL128. I could change it back to the default case if you like?

Copy link
Collaborator

@hcho3 hcho3 Oct 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

That line is different, since TRITON_VERSION was defined earlier in the Dockerfile. On the other hand, TRITON_REPO_ORGANIZATION is not defined earlier in the Dockerfile, so a default value needs to be supplied here.

Copy link
Collaborator

Choose a reason for hiding this comment

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

The referenced line constructs a new string from a defined variable by adding an r in front, whereas the new changes are equivalent to setting the variables to empty strings.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry for my mistake. Changed

ENV TRITON_REPO_ORGANIZATION=$TRITON_REPO_ORGANIZATION
ARG TRITON_CORE_REPO_TAG=r${TRITON_VERSION}
ENV TRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG
ARG TRITON_COMMON_REPO_TAG=r${TRITON_VERSION}
ENV TRITON_COMMON_REPO_TAG=$TRITON_COMMON_REPO_TAG
ARG TRITON_BACKEND_REPO_TAG=r${TRITON_VERSION}
ENV TRITON_BACKEND_REPO_TAG=$TRITON_BACKEND_REPO_TAG
ARG RAPIDS_TRITON_REPO_TAG=main
ENV RAPIDS_TRITON_REPO_TAG=${RAPIDS_TRITON_REPO_TAG}
ARG RAPIDS_TRITON_REPO_TAG=$RAPIDS_TRITON_REPO_TAG
ENV RAPIDS_TRITON_REPO_TAG=$RAPIDS_TRITON_REPO_TAG
ARG TRITON_RAPIDS_REPO_PATH=$TRITON_RAPIDS_REPO_PATH
ENV TRITON_RAPIDS_REPO_PATH=$TRITON_RAPIDS_REPO_PATH

ARG TRITON_ENABLE_GPU=ON
ENV TRITON_ENABLE_GPU=$TRITON_ENABLE_GPU
Expand Down Expand Up @@ -162,6 +164,7 @@ RUN source /conda/dev/bin/activate \
-DTRITON_COMMON_REPO_TAG="${TRITON_COMMON_REPO_TAG}" \
-DTRITON_BACKEND_REPO_TAG="${TRITON_BACKEND_REPO_TAG}" \
-DRAPIDS_TRITON_REPO_TAG="${RAPIDS_TRITON_REPO_TAG}" \
-DRAPIDS_TRITON_REPO_PATH="${RAPIDS_TRITON_REPO_PATH}" \
-DTRITON_ENABLE_GPU="${TRITON_ENABLE_GPU}" \
-DTRITON_ENABLE_STATS="${TRITON_ENABLE_STATS}" \
-DRAPIDS_DEPENDENCIES_VERSION="${RAPIDS_DEPENDENCIES_VERSION}" \
Expand All @@ -171,7 +174,7 @@ RUN source /conda/dev/bin/activate \

ENV CCACHE_DIR=/ccache

RUN --mount=type=cache,target=/ccache/ source /conda/dev/bin/activate && ninja -j16 install
RUN --mount=type=cache,target=/ccache/ source /conda/dev/bin/activate && ninja install


# Stage for generating testing image
Expand Down
Loading