From 9ad2bd26a6e1a3de4ae7a12667a22943e003a9cc Mon Sep 17 00:00:00 2001 From: Nate Meyer Date: Sat, 24 Jun 2023 19:37:18 -0400 Subject: [PATCH] Move tensorrt s6 files to the correct directory --- Dockerfile | 5 ++++- .../s6-rc.d/frigate/dependencies.d/trt-model-prepare | 0 .../s6-rc.d/trt-model-prepare/dependencies.d/base | 0 .../etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/run | 0 .../etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/type | 0 .../rootfs/etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/up | 0 6 files changed, 4 insertions(+), 1 deletion(-) rename docker/support/tensorrt_detector/rootfs/etc/{ => s6-overlay}/s6-rc.d/frigate/dependencies.d/trt-model-prepare (100%) rename docker/support/tensorrt_detector/rootfs/etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/dependencies.d/base (100%) rename docker/support/tensorrt_detector/rootfs/etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/run (100%) rename docker/support/tensorrt_detector/rootfs/etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/type (100%) rename docker/support/tensorrt_detector/rootfs/etc/{ => s6-overlay}/s6-rc.d/trt-model-prepare/up (100%) diff --git a/Dockerfile b/Dockerfile index 48ad3490d..156791e74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -270,12 +270,15 @@ COPY docker/support/tensorrt_detector/rootfs/ / RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ pip3 install -U /deps/trt-wheels/*.whl && \ - ln -s libnvrtc.so.12.1 /usr/local/lib/python3.9/dist-packages/nvidia/cuda_nvrtc/lib/libnvrtc.so && \ + ln -s libnvrtc.so.12 /usr/local/lib/python3.9/dist-packages/nvidia/cuda_nvrtc/lib/libnvrtc.so && \ ldconfig # Dev Container w/ TRT FROM devcontainer AS devcontainer-trt +COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so +COPY --from=trt-deps /usr/local/src/tensorrt_demos /usr/local/src/tensorrt_demos +COPY docker/support/tensorrt_detector/rootfs/ / COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ pip3 install -U /deps/trt-wheels/*.whl diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/frigate/dependencies.d/trt-model-prepare b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/frigate/dependencies.d/trt-model-prepare similarity index 100% rename from docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/frigate/dependencies.d/trt-model-prepare rename to docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/frigate/dependencies.d/trt-model-prepare diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/dependencies.d/base b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/dependencies.d/base similarity index 100% rename from docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/dependencies.d/base rename to docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/dependencies.d/base diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/run b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run similarity index 100% rename from docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/run rename to docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/run diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/type b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/type similarity index 100% rename from docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/type rename to docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/type diff --git a/docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/up b/docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/up similarity index 100% rename from docker/support/tensorrt_detector/rootfs/etc/s6-rc.d/trt-model-prepare/up rename to docker/support/tensorrt_detector/rootfs/etc/s6-overlay/s6-rc.d/trt-model-prepare/up