Follow up for #404 (#405)

triton-inference-server · Sep 20, 2024 · 25e6845 · 25e6845
1 parent f68a695
commit 25e6845
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -167,10 +167,6 @@ else()
   rapids_cpm_init()
   find_package(OpenMP REQUIRED)
 
-  # Specify *minimum* version for all RAPIDS dependencies
-  # Some RAPIDS deps may have later versions
-  set(RAPIDS_TRITON_MIN_VERSION_rapids_projects "${RAPIDS_DEPENDENCIES_VERSION}.00")
-
   if(TRITON_ENABLE_GPU)
     include(cmake/thirdparty/get_cuml.cmake)
   else()

diff --git a/build.sh b/build.sh
@@ -203,7 +203,7 @@ 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="${REPO_ORGANIZATION}"
+  [ ! -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}"

diff --git a/cmake/thirdparty/get_rapids-triton.cmake b/cmake/thirdparty/get_rapids-triton.cmake
@@ -32,27 +32,24 @@ function(find_and_configure_rapids_triton)
               "BUILD_TESTS OFF"
               "BUILD_EXAMPLE OFF"
     )
-
-  message(VERBOSE "RAPIDS_TRITON_BACKEND: Using RAPIDS-Triton located in ${rapids_triton_SOURCE_DIR}")
-
 endfunction()
 
 # Change pinned tag here to test a commit in CI
 # To use a different RAFT locally, set the CMake variable
 # 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")
   set (REPO_TAG ${RAPIDS_TRITON_REPO_TAG})
-  message(STATUS "Setting repo tag to ${REPO_TAG}")
 endif()
 
-find_and_configure_rapids_triton(VERSION    ${RAPIDS_TRITON_MIN_VERSION_rapids_projects}
+find_and_configure_rapids_triton(VERSION    ${RAPIDS_DEPENDENCIES_VERSION}
                                  FORK       ${RAPIDS_FORK}
                                  PINNED_TAG ${REPO_TAG}
                                  )
diff --git a/ops/Dockerfile b/ops/Dockerfile
@@ -123,15 +123,15 @@ ENV BUILD_TESTS=$BUILD_TESTS
 ARG BUILD_EXAMPLE
 ENV BUILD_EXAMPLE=$BUILD_EXAMPLE
 
-ARG TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION}
+ARG TRITON_REPO_ORGANIZATION=https://github.com/triton-inference-server
 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=${RAPIDS_TRITON_REPO_TAG}
+ARG RAPIDS_TRITON_REPO_TAG=main
 ENV RAPIDS_TRITON_REPO_TAG=${RAPIDS_TRITON_REPO_TAG}
 
 ARG TRITON_ENABLE_GPU=ON