Move to --gpus flag in container toolkit alignend with: https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/docker-specialized.html

Author: mc-nv

qa/common/gen_jetson_trt_models

@@ -42,7 +42,20 @@ TENSORRT_IMAGE=${TENSORRT_IMAGE:=nvcr.io/nvidia/tensorrt:$TRITON_VERSION-py3-igp
 UBUNTU_IMAGE=${UBUNTU_IMAGE:=ubuntu:24.04}
 
 # Set CI specific parameters
-DOCKER_GPU_ARGS=${DOCKER_GPU_ARGS:-$([[ $RUNNER_GPUS =~ ^[0-9] ]] && eval $NV_DOCKER_ARGS || echo "--gpus $NVIDIA_VISIBLE_DEVICES" )}
+define_docker_gpu_args() {
+    # If RUNNER_GPUS is set and starts with a digit, use NV_DOCKER_ARGS
+    if [[ -v RUNNER_GPUS && $RUNNER_GPUS =~ ^[0-9] ]]; then
+        eval echo $NV_DOCKER_ARGS
+    # Handle special values for NVIDIA_VISIBLE_DEVICES
+    elif [[ "$NVIDIA_VISIBLE_DEVICES" == "all" ]]; then
+        echo "--gpus all"
+    elif [[ "$NVIDIA_VISIBLE_DEVICES" == "none" ]]; then
+        echo ""
+    else
+        echo "--gpus '\"device=$NVIDIA_VISIBLE_DEVICES\"'"
+    fi
+}
+DOCKER_GPU_ARGS=${DOCKER_GPU_ARGS:-$(compute_docker_gpu_args)}
 
 ############################################################################
 # Check if Docker volume exists

qa/common/gen_qa_model_repository

@@ -80,7 +80,23 @@ PROJECT_NAME=${PROJECT_NAME:=tritonserver}
 log_message.status "define: Docker engine parameters"
 DOCKER_VOLUME=${DOCKER_VOLUME:=volume.gen_qa_model_repository.${CI_JOB_ID}}
 DOCKER_VOLUME_CONTAINER=${DOCKER_VOLUME}.gen_qa_model_repository.${CI_JOB_ID}
-DOCKER_GPU_ARGS=${DOCKER_GPU_ARGS:-$([[ -v RUNNER_GPUS && $RUNNER_GPUS =~ ^[0-9] ]] && eval $NV_DOCKER_ARGS || echo "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=$NVIDIA_VISIBLE_DEVICES" )}
+
+# Compute Docker GPU arguments based on environment
+define_docker_gpu_args() {
+    # If RUNNER_GPUS is set and starts with a digit, use NV_DOCKER_ARGS
+    if [[ -v RUNNER_GPUS && $RUNNER_GPUS =~ ^[0-9] ]]; then
+        eval echo $NV_DOCKER_ARGS
+    # Handle special values for NVIDIA_VISIBLE_DEVICES
+    elif [[ "$NVIDIA_VISIBLE_DEVICES" == "all" ]]; then
+        echo "--gpus all"
+    elif [[ "$NVIDIA_VISIBLE_DEVICES" == "none" ]]; then
+        echo ""
+    # Default: use device parameter with proper quoting
+    else
+        echo "--gpus '\"device=$NVIDIA_VISIBLE_DEVICES\"'"
+    fi
+}
+DOCKER_GPU_ARGS=${DOCKER_GPU_ARGS:-$(compute_docker_gpu_args)}
 
 function define_model_output_directories() {
     log_message.status "define: model output directories"