Merge branch 'main' of https://github.com/triton-inference-server/core …

…into yinggeh-DLIS-7457-per-model-metric-config
triton-inference-server · Nov 5, 2024 · fbbc22c · fbbc22c
2 parents 4caf126 + 3ad7cad
commit fbbc22c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,7 +164,7 @@ if(NOT TRITON_CORE_HEADERS_ONLY)
   option(TRITON_ENABLE_NVTX "Include NVTX support in server" OFF)
   option(TRITON_ENABLE_GPU "Enable GPU support in server" ON)
   option(TRITON_ENABLE_MALI_GPU "Enable Arm Mali GPU support in server" OFF)
-  set(TRITON_MIN_COMPUTE_CAPABILITY "6.0" CACHE STRING
+  set(TRITON_MIN_COMPUTE_CAPABILITY "7.5" CACHE STRING
       "The minimum CUDA compute capability supported by Triton" )
   set(TRITON_EXTRA_LIB_PATHS "" CACHE PATH "Extra library paths for Triton Server build")
 

diff --git a/src/model_repository_manager/model_lifecycle.cc b/src/model_repository_manager/model_lifecycle.cc
@@ -560,10 +560,12 @@ ModelLifeCycle::CreateModel(
   // backend.
   if (!model_config.backend().empty()) {
     std::unique_ptr<TritonModel> model;
+#ifdef TRITON_ENABLE_METRICS
     const uint64_t model_load_ns =
         std::chrono::duration_cast<std::chrono::nanoseconds>(
             std::chrono::steady_clock::now().time_since_epoch())
             .count();
+#endif  // TRITON_ENABLE_METRICS
     status = TritonModel::Create(
         server_, model_info->model_path_, options_.backend_cmdline_config_map,
         options_.host_policy_map, model_id, version, model_config,