Merge branch 'main' into ibhosale_metrics_google

TRITON_VERSION

@@ -1 +1 @@
-2.52.0dev
+2.53.0dev

build.py

@@ -70,8 +70,8 @@
 # incorrectly load the other version of the openvino libraries.
 #
 TRITON_VERSION_MAP = {
-    "2.52.0dev": (
-        "24.11dev",  # triton container
+    "2.53.0dev": (
+        "24.12dev",  # triton container
         "24.10",  # upstream container
         "1.19.2",  # ORT
         "2024.4.0",  # ORT OpenVINO
@@ -1213,10 +1213,11 @@ def create_dockerfile_linux(
 WORKDIR /opt/tritonserver
 COPY --chown=1000:1000 NVIDIA_Deep_Learning_Container_License.pdf .
 
-RUN find /opt/tritonserver/python -maxdepth 1 -type f -name \
-    "tritonserver-*.whl" | xargs -I {} pip3 install --upgrade {}[all] && \
-    find /opt/tritonserver/python -maxdepth 1 -type f -name \
-    "tritonfrontend-*.whl" | xargs -I {} pip3 install --upgrade {}[all]
+RUN find /opt/tritonserver/python -maxdepth 1 -type f -name \\
+    "tritonserver-*.whl" | xargs -I {} pip install --upgrade {}[all] && \\
+    find /opt/tritonserver/python -maxdepth 1 -type f -name \\
+    "tritonfrontend-*.whl" | xargs -I {} pip install --upgrade {}[all]
+
 """
     if not FLAGS.no_core_build:
         # Add feature labels for SageMaker endpoint
@@ -1320,7 +1321,7 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
 
     if target_platform() == "rhel":
         df += """
-# Common dpeendencies.
+# Common dependencies.
 RUN yum install -y \\
         git \\
         gperf \\
@@ -1334,6 +1335,7 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
         wget \\
         python3-pip \\
         numactl-devel
+
 """
     else:
         df += """
@@ -1357,8 +1359,9 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu, target_mach
               libre2-9 \\
               software-properties-common \\
               wget \\
-              python3-pip \\
               {backend_dependencies} \\
+              python3-pip \\
+      && python3 -m pip install --upgrade pip \\
       && rm -rf /var/lib/apt/lists/*
 """.format(
             backend_dependencies=backend_dependencies

qa/common/check_copyright.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2018-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2018-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -73,6 +73,7 @@
     "qa/L0_model_config/special_cases",
     "qa/L0_model_config/cli_messages/cli_override/expected",
     "qa/L0_model_config/cli_messages/cli_deprecation/expected",
+    "qa/L0_model_config/model_metrics",
     "qa/L0_model_namespacing/test_duplication",
     "qa/L0_model_namespacing/test_dynamic_resolution",
     "qa/L0_model_namespacing/test_ensemble_duplication",

src/python/tritonfrontend/_api/_metrics.pyi

@@ -1,3 +1,29 @@
+# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#  * Neither the name of NVIDIA CORPORATION nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# 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.
+
 import tritonserver
 from _typeshed import Incomplete
 from tritonfrontend._api._error_mapping import (

tools/add_copyright.py

@@ -215,7 +215,7 @@ def register_impl(func):
 
 @register(
     any_of(
-        has_ext([".py", ".sh", ".bash", ".yaml", ".pbtxt"]),
+        has_ext([".py", ".pyi", ".sh", ".bash", ".yaml", ".pbtxt"]),
         basename_is("CMakeLists.txt"),
         path_contains("Dockerfile"),
     )