Change usage of NVML to DCGM (triton-inference-server#2924)

Changes on top of https://github.com/triton-inference-server/server/compare/hemantj-dcgm
to change monitoring with NVML to DCGM.

Co-authored-by: CoderHam <[email protected]>

Author: jbkyang-nvi

build.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2020-2021, 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
@@ -477,10 +477,21 @@ def dali_cmake_args():
     ]
 
 
+def install_dcgm_libraries():
+    return '''
+# Install DCGM
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common
+RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin \
+&& mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 \
+&& apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub \
+&& add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /"
+RUN apt-get update \
+&& apt-get install -y datacenter-gpu-manager
+'''
+
+
 def fil_cmake_args(images):
-    cargs = [
-        '-DTRITON_FIL_DOCKER_BUILD=ON'
-    ]
+    cargs = ['-DTRITON_FIL_DOCKER_BUILD=ON']
     if 'base' in images:
         cargs.append('-DTRITON_BUILD_CONTAINER={}'.format(images['base']))
     else:
@@ -572,12 +583,17 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap, backends):
 RUN rm -fr *
 COPY . .
 ENTRYPOINT []
+'''
+        df += install_dcgm_libraries()
+        df += '''
+RUN patch -ruN -d /usr/include/ < /workspace/build/libdcgm/dcgm_api_export.patch
 '''
 
     df += '''
 ENV TRITON_SERVER_VERSION ${TRITON_VERSION}
 ENV NVIDIA_TRITON_SERVER_VERSION ${TRITON_CONTAINER_VERSION}
 '''
+
     mkdir(ddir)
     with open(os.path.join(ddir, dockerfile_name), "w") as dfile:
         dfile.write(df)
@@ -668,6 +684,7 @@ def create_dockerfile_linux(ddir, dockerfile_name, argmap, backends, repoagents,
          libre2-5 && \
     rm -rf /var/lib/apt/lists/*
 '''
+    df += install_dcgm_libraries()
     # Add dependencies needed for python backend
     if 'python' in backends:
         df += '''
@@ -736,7 +753,8 @@ def create_dockerfile_linux(ddir, dockerfile_name, argmap, backends, repoagents,
         dfile.write(df)
 
 
-def create_dockerfile_windows(ddir, dockerfile_name, argmap, backends, repoagents):
+def create_dockerfile_windows(ddir, dockerfile_name, argmap, backends,
+                              repoagents):
     df = '''
 #
 # Multistage build.
@@ -976,15 +994,16 @@ def container_build(images, backends, repoagents, endpoints):
         # the install artifacts from the tritonserver_build
         # container.
         if target_platform() == 'windows':
-            create_dockerfile_windows(FLAGS.build_dir, 'Dockerfile', dockerfileargmap,
-                              backends, repoagents)
+            create_dockerfile_windows(FLAGS.build_dir, 'Dockerfile',
+                                      dockerfileargmap, backends, repoagents)
         else:
-            create_dockerfile_linux(FLAGS.build_dir, 'Dockerfile', dockerfileargmap,
-                              backends, repoagents, endpoints)
+            create_dockerfile_linux(FLAGS.build_dir, 'Dockerfile',
+                                    dockerfileargmap, backends, repoagents,
+                                    endpoints)
         p = subprocess.Popen([
-                'docker', 'build', '-f',
-                os.path.join(FLAGS.build_dir, 'Dockerfile')
-            ] + ['-t', 'tritonserver', '.'])
+            'docker', 'build', '-f',
+            os.path.join(FLAGS.build_dir, 'Dockerfile')
+        ] + ['-t', 'tritonserver', '.'])
         p.wait()
         fail_if(p.returncode != 0, 'docker build tritonserver failed')
 

build/libdcgm/dcgm_api_export.patch

@@ -0,0 +1,17 @@
+--- /dev/null	2021-05-28 06:28:50.736023234 +0000
++++ /usr/include/dcgm_api_export.h	2021-05-28 18:29:49.516676962 +0000
+@@ -0,0 +1,14 @@
++#ifndef DCGM_DCGM_API_EXPORT_H
++#define DCGM_DCGM_API_EXPORT_H
++#undef DCGM_PUBLIC_API
++#undef DCGM_PRIVATE_API
++#if defined(DCGM_API_EXPORT)
++#define DCGM_PUBLIC_API __attribute((visibility("default")))
++#else
++#define DCGM_PUBLIC_API
++#if defined(ERROR_IF_NOT_PUBLIC)
++#error(Should be public)
++#endif
++#endif
++#define DCGM_PRIVATE_API __attribute((visibility("hidden")))
++#endif // DCGM_DCGM_API_EXPORT_H