build: tritonfrontend support for no/partial endpoint builds (#7605)

Author: KrishnanPrash

src/CMakeLists.txt

@@ -249,14 +249,6 @@ if(${TRITON_ENABLE_TRACING})
     main
     PRIVATE TRITON_ENABLE_TRACING=1
   )
-# FIXME: remove, when Windows support is added for Opentelemetry
-  if (NOT WIN32)
-    target_include_directories(
-      main
-      PRIVATE
-        ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
-    )
-  endif()
 endif() # TRITON_ENABLE_TRACING
 
 if(${TRITON_ENABLE_NVTX})
@@ -404,9 +396,9 @@ if(${TRITON_ENABLE_HTTP}
   # add ${OPENTELEMETRY_CPP_INCLUDE_DIRS} to above target_include_directories
   # JIRA DLIS-4786
   if (NOT WIN32 AND ${TRITON_ENABLE_TRACING})
-    target_include_directories(
+    target_link_libraries(
       http-endpoint-library
-      PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
+      PRIVATE tracing-library
     )
   endif()
 
@@ -517,19 +509,25 @@ if(${TRITON_ENABLE_TRACING})
   )
 
   target_compile_features(tracing-library PRIVATE cxx_std_${TRITON_MIN_CXX_STANDARD})
-
+  # FIXME: remove, when Windows support is added for Opentelemetry
   if (NOT WIN32)
     target_include_directories(
       tracing-library
-      PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
+      PUBLIC ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
     )
 
     target_link_libraries(
       tracing-library
-      PRIVATE
+      PUBLIC
       ${OPENTELEMETRY_CPP_LIBRARIES})
   endif()
 
+  set_target_properties(
+    tracing-library
+    PROPERTIES
+    POSITION_INDEPENDENT_CODE ON
+    )
+
   target_link_libraries(
     tracing-library
     PUBLIC

src/grpc/CMakeLists.txt

@@ -83,9 +83,10 @@ target_include_directories(
 # add ${OPENTELEMETRY_CPP_INCLUDE_DIRS} to above target_include_directories
 # JIRA DLIS-4786
 if (NOT WIN32 AND ${TRITON_ENABLE_TRACING})
-  target_include_directories(
+  target_link_libraries(
     grpc-endpoint-library
-    PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
+    PRIVATE
+    tracing-library
   )
 endif()
 

src/python/CMakeLists.txt

@@ -26,16 +26,6 @@
 
 cmake_minimum_required(VERSION 3.18)
 
-message("tritonfrontend python package build skipped when relevant frontends are disabled.")
-message("In order to build tritonfrontend, the following flags are needed: -DTRITON_ENABLE_HTTP=ON -DTRITON_ENABLE_GRPC=ON")
-
-# [DLIS-7232] tritonfrontend package expects all supported packages to be
-# built, without any check/verification for respective frontend enable flags.
-# Support for partial builds(ex: HTTP but not gRPC) will be addressed later.
-if(NOT (${TRITON_ENABLE_HTTP} AND ${TRITON_ENABLE_GRPC}))
-  return()
-endif()
-
 add_subdirectory(tritonfrontend)
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/TRITON_VERSION ${TRITON_VERSION})

src/python/tritonfrontend/CMakeLists.txt

@@ -62,17 +62,10 @@ set(
   ../../common.h
   ../../common.cc
   ../../restricted_features.h
-  ../../tracer.h
-  $<$<BOOL:${TRITON_ENABLE_TRACING}>:../../tracer.cc>
   ../../classification.cc
 )
 
-set(PY_BINDING_DEPENDENCY_LIBS
-      triton-common-json
-      triton-common-logging
-      triton-core-serverapi
-      triton-core-serverstub
-  )
+set(PY_BINDING_DEPENDENCY_LIBS)
 
 # Conditional Linking Based on Flags
 if(${TRITON_ENABLE_HTTP})
@@ -96,18 +89,14 @@ endif()
 
 if(${TRITON_ENABLE_TRACING})
   message("TRACING/STATS IS CURRENTLY NOT SUPPORTED.")
-  find_package(absl CONFIG REQUIRED)
-  find_package(CURL CONFIG REQUIRED)
-  find_package(nlohmann_json CONFIG REQUIRED)
-  find_package(opentelemetry-cpp CONFIG REQUIRED)
-  list(APPEND PY_BINDING_DEPENDENCY_LIBS
-    tracing-library
+  list(
+      APPEND PY_BINDING_DEPENDENCY_LIBS
+      tracing-library
   )
 endif()
 
 # ===================== End of Collection ===================================
 
-
 # ================== Create Python Frontend Bindings ========================
 set(
   PYTHON_FRONTEND_BINDING_SRCS
@@ -122,12 +111,10 @@ pybind11_add_module(
   ${PYTHON_FRONTEND_BINDING_SRCS}
 )
 
-target_include_directories(py-bindings PRIVATE ${CMAKE_SOURCE_DIR}/src)
-
 target_link_libraries(
     py-bindings
     PRIVATE
-      ${PY_BINDING_DEPENDENCY_LIBS}
+    ${PY_BINDING_DEPENDENCY_LIBS}
 )
 
 if(${TRITON_ENABLE_HTTP})
@@ -153,14 +140,10 @@ if(${TRITON_ENABLE_GPU})
 endif()
 
 if(${TRITON_ENABLE_TRACING})
-  target_include_directories(
+    target_compile_definitions(
       py-bindings
-      PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS}
+      PRIVATE TRITON_ENABLE_TRACING=1
     )
-  target_compile_definitions(
-    py-bindings
-    PRIVATE TRITON_ENABLE_TRACING=1
-  )
 endif()
 
 if(${TRITON_ENABLE_STATS})
@@ -170,12 +153,19 @@ if(${TRITON_ENABLE_STATS})
   )
 endif()
 
+if(${TRITON_ENABLE_METRICS})
+  target_compile_definitions(
+    py-bindings
+    PRIVATE TRITON_ENABLE_METRICS=1
+  )
+endif()
 
 set_property(TARGET py-bindings PROPERTY OUTPUT_NAME tritonfrontend_bindings)
 
 set_target_properties(
     py-bindings
     PROPERTIES
       BUILD_RPATH "$ORIGIN:/opt/tritonserver/lib"
+      POSITION_INDEPENDENT_CODE ON
 )
 # ===================== End of Python Bindings ==============================

src/python/tritonfrontend/__init__.py

@@ -29,5 +29,14 @@
 import builtins
 from importlib.metadata import PackageNotFoundError, version
 
-from tritonfrontend._api._kservegrpc import KServeGrpc
-from tritonfrontend._api._kservehttp import KServeHttp
+try:
+    from tritonfrontend._api._kservehttp import KServeHttp
+except ImportError:
+    # TRITON_ENABLE_HTTP=OFF
+    pass
+
+try:
+    from tritonfrontend._api._kservegrpc import KServeGrpc
+except ImportError:
+    # TRITON_ENABLE_GRPC=OFF
+    pass

src/python/tritonfrontend/_api/__init__.py

@@ -23,3 +23,17 @@
 # OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+try:
+    from ._kservehttp import KServeHttp
+except ImportError:
+    # TRITON_ENABLE_HTTP=OFF
+    # TritonFrontendHttp Package was not present
+    pass
+
+try:
+    from ._kservegrpc import KServeGrpc
+except ImportError:
+    # TRITON_ENABLE_GRPC=OFF
+    # TritonFrontendGrpc Package was not present
+    pass

src/python/tritonfrontend/_api/_error_mapping.py

@@ -36,6 +36,7 @@
     UnsupportedError,
 )
 
+# ERROR_MAPPING takes in tritonfrontend Error and maps to respective tritonserver Error
 ERROR_MAPPING = {
     TritonError: tritonserver.TritonError,
     NotFoundError: tritonserver.NotFoundError,

src/python/tritonfrontend/_c/tritonfrontend_pybind.cc

@@ -27,8 +27,16 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#ifdef TRITON_ENABLE_GRPC
 #include "../../../grpc/grpc_server.h"
+#endif
+
+
+#ifdef TRITON_ENABLE_HTTP
 #include "../../../http_server.h"
+#endif
+
+
 #include "triton/core/tritonserver.h"
 #include "tritonfrontend.h"
 
@@ -53,12 +61,14 @@ PYBIND11_MODULE(tritonfrontend_bindings, m)
   py::register_exception<AlreadyExistsError>(
       m, "AlreadyExistsError", tfe.ptr());
 
-
+#ifdef TRITON_ENABLE_HTTP
   py::class_<TritonFrontend<HTTPServer, HTTPAPIServer>>(m, "TritonFrontendHttp")
       .def(py::init<uintptr_t, UnorderedMapType>())
       .def("start", &TritonFrontend<HTTPServer, HTTPAPIServer>::StartService)
       .def("stop", &TritonFrontend<HTTPServer, HTTPAPIServer>::StopService);
+#endif  // TRITON_ENABLE_HTTP
 
+#ifdef TRITON_ENABLE_GRPC
   py::class_<TritonFrontend<
       triton::server::grpc::Server, triton::server::grpc::Server>>(
       m, "TritonFrontendGrpc")
@@ -71,6 +81,7 @@ PYBIND11_MODULE(tritonfrontend_bindings, m)
           "stop", &TritonFrontend<
                       triton::server::grpc::Server,
                       triton::server::grpc::Server>::StopService);
+#endif  // TRITON_ENABLE_GRPC
 }
 
 }}}  // namespace triton::server::python