From b881503286656d793666cbef55c3e014c95b40eb Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 29 Jul 2022 21:20:20 -0700
Subject: [PATCH 1/2] allow setting NVIDIA_VISIBLE_DEVICES, ensure containers
 launch with nvidia runtime, use new sid-viz Dockerfile

---
 examples/sid_visualization/docker-compose.yml | 61 ++++++++++++-------
 examples/sid_visualization/viz                |  2 +-
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/examples/sid_visualization/docker-compose.yml b/examples/sid_visualization/docker-compose.yml
index 23701e6549..48fb97bfea 100644
--- a/examples/sid_visualization/docker-compose.yml
+++ b/examples/sid_visualization/docker-compose.yml
@@ -1,49 +1,63 @@
 version: "3"
 
+x-with-gpus: &with_gpus
+  deploy:
+    resources:
+      reservations:
+        devices:
+          - capabilities:
+            - gpu
+
 services:
   triton:
     image: nvcr.io/nvidia/tritonserver:22.02-py3
+    <<: *with_gpus
     command: "tritonserver --exit-on-error=false --model-control-mode=explicit --load-model sid-minibert-onnx --model-repository=/models/triton-model-repo"
     environment:
-      NVIDIA_VISIBLE_DEVICES: "0"
+      NVIDIA_VISIBLE_DEVICES: "${NVIDIA_VISIBLE_DEVICES:-}"
     ports:
       - "8000"
       - "8001"
       - "8002"
-    runtime: nvidia
     volumes:
-      - "${MORPHEUS_HOME:?Must set MORPHEUS_HOME to the Morpheus repo directory}/models:/models"
+      - "${MORPHEUS_HOME:-../..}/models:/models"
 
   gui:
     image: sid-viz:latest
+    <<: *with_gpus
     build:
-      context: ./viz
-      # target: base
+      context: viz
+      args:
+        RAPIDSAI_GPU_ARCH: "${RAPIDSAI_GPU_ARCH:-}" # 60 | 70 | 75 | 80 | 86
     cap_add:
+      - SYS_ADMIN
       - SYS_PTRACE
-    command: yarn build_and_start
+    security_opt:
+      - apparmor=unconfined
     environment:
-      DBUS_SESSION_BUS_ADDRESS: "${DBUS_SESSION_BUS_ADDRESS:-unix:path=/run/user/$UID/bus}"
-      DISPLAY: "${DISPLAY:-}"
       NVIDIA_DRIVER_CAPABILITIES: all
-      TERM: "${TERM:-}" # Colorize the terminal in the container if possible
       MORPHEUS_SOCKET_URL: "morpheus:8765"
-    stdin_open: true
-    tty: true
+      # Colorize the terminal in the container if possible
+      TERM: "${TERM:-}"
+      # Use the host's X11 display
+      DISPLAY: "${DISPLAY:-}"
+      XAUTHORITY: "${XAUTHORITY:-}"
+      XDG_SESSION_TYPE: "${XDG_SESSION_TYPE:-}"
+      XDG_RUNTIME_DIR: "${XDG_RUNTIME_DIR:?XDG_RUNTIME_DIR must be set}"
+      DBUS_SESSION_BUS_ADDRESS: "${DBUS_SESSION_BUS_ADDRESS:?DBUS_SESSION_BUS_ADDRESS must be set}"
     volumes:
-      # - ./viz:/opt/rapids/viz
-      - /run/dbus/system_bus_socket:/run/dbus/system_bus_socket
-      - /tmp/.X11-unix:/tmp/.X11-unix
-      - ${XDG_RUNTIME_DIR:-/run/user/$UID}:${XDG_RUNTIME_DIR:-/run/user/$UID}
-    # network_mode: host
-    working_dir: /opt/rapids/viz
-    runtime: nvidia
-    security_opt:
-      - seccomp=unconfined
-      - apparmor=unconfined
+      - "/etc/fonts:/etc/fonts:ro"
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+      - "/tmp/.X11-unix:/tmp/.X11-unix:rw"
+      - "/usr/share/fonts:/usr/share/fonts:ro"
+      - "/usr/share/icons:/usr/share/icons:ro"
+      - "${XDG_RUNTIME_DIR}:${XDG_RUNTIME_DIR}"
+      - "/run/dbus/system_bus_socket:/run/dbus/system_bus_socket"
 
   morpheus:
     image: morpheus:sid-viz
+    <<: *with_gpus
     command: bash
     cap_add:
       - SYS_NICE
@@ -51,10 +65,11 @@ services:
       - gui
       - triton
     environment:
-      - BUILD_DIR=build-docker # Avoid conflicting with the host default build
+      BUILD_DIR: build-docker # Avoid conflicting with the host default build
+      NVIDIA_VISIBLE_DEVICES: "${NVIDIA_VISIBLE_DEVICES:-}"
     ports:
       - "8765"
     stdin_open: true
     tty: true
     volumes:
-      - "${MORPHEUS_HOME:?Must set MORPHEUS_HOME to the Morpheus repo directory}:/workspace"
+      - "${MORPHEUS_HOME:-../../}:/workspace"
diff --git a/examples/sid_visualization/viz b/examples/sid_visualization/viz
index f2c2428f78..2a78172c11 160000
--- a/examples/sid_visualization/viz
+++ b/examples/sid_visualization/viz
@@ -1 +1 @@
-Subproject commit f2c2428f786e2ad8ed228413434046f627de0455
+Subproject commit 2a78172c11bc187379e5c341e85320a74764b410

From 2c282bd2ad534d6f8368bb1c40ca7d05035ef1c3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sat, 30 Jul 2022 16:23:03 -0700
Subject: [PATCH 2/2] update viz submodule

---
 examples/sid_visualization/viz | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/sid_visualization/viz b/examples/sid_visualization/viz
index 2a78172c11..8494808fbe 160000
--- a/examples/sid_visualization/viz
+++ b/examples/sid_visualization/viz
@@ -1 +1 @@
-Subproject commit 2a78172c11bc187379e5c341e85320a74764b410
+Subproject commit 8494808fbe9f7f9de2e010ff03fae4f9e97ac39a