From c01507081e2317b6250ddaefc0e4bdc06528a96e Mon Sep 17 00:00:00 2001 From: Nate Meyer Date: Wed, 28 Dec 2022 12:55:34 -0500 Subject: [PATCH] Add labelmap to trt model script and docs. Cleanup of old scripts. --- docker/build_pycuda.sh | 54 ---------------------------- docker/install_tensorrt.sh | 43 ---------------------- docker/tensorrt_models.sh | 5 ++- docs/docs/configuration/detectors.md | 15 ++++++++ 4 files changed, 19 insertions(+), 98 deletions(-) delete mode 100755 docker/build_pycuda.sh delete mode 100755 docker/install_tensorrt.sh diff --git a/docker/build_pycuda.sh b/docker/build_pycuda.sh deleted file mode 100755 index e1ccbf76d..000000000 --- a/docker/build_pycuda.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -set -euxo pipefail - -"${CUDA_LIB_VERSION:=11.8}" -"${CUDA_PKG_VERSION:=11-8}" -"${CUDNN_VERSION:=8.6.0.84}" -"${TENSORRT_VERSION:=7.2.2}" - -# Add NVidia Repo -# wget -q -O - https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/3bf863cc.pub | apt-key add - -# echo "deb https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/ /" | tee /etc/apt/sources.list.d/nvidia-cuda.list -wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.0-1_all.deb -dpkg -i cuda-keyring_1.0-1_all.deb -add-apt-repository contrib -apt-get -qq update - -# Utilities -apt-get install -y --no-install-recommends \ - build-essential python3.9-dev python3-pip tar - -python3 -m pip install --upgrade setuptools pip wheel numpy - -# CUDA Base -apt-get install -y --no-install-recommends \ - cuda-cudart-${CUDA_PKG_VERSION} \ - cuda-compat-${CUDA_PKG_VERSION} \ - cuda-cupti-${CUDA_PKG_VERSION} && \ - ln -s cuda-${CUDA_LIB_VERSION} /usr/local/cuda - -# CUDA Runtime -apt-get install -y --no-install-recommends \ - cuda-libraries-${CUDA_PKG_VERSION} \ - libnpp-${CUDA_PKG_VERSION} \ - cuda-nvtx-${CUDA_PKG_VERSION} \ - libcublas-${CUDA_PKG_VERSION} - -# cuDNN Runtime -apt-get install -y --no-install-recommends \ - libcudnn8 - -# Download pycuda source -wget https://github.com/inducer/pycuda/archive/refs/tags/v2022.2.tar.gz -O pycuda-v2022.2.tar.gz -tar xfz pycuda-v2022.2.tar.gz - -# Build pycuda wheel -cd pycuda-v2022.2 -python setup.py build - - - - - -rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/docker/install_tensorrt.sh b/docker/install_tensorrt.sh deleted file mode 100755 index faeb00a83..000000000 --- a/docker/install_tensorrt.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -euxo pipefail - -echo "${CUDA_LIB_VERSION:=11.7}" -echo "${CUDA_PKG_VERSION:=11-7}" -echo "${CUDNN_VERSION:=8.6.0.84}" -echo "${TENSORRT_VERSION:=8.4.1}" - -# Add NVidia Repo -apt-get -qq update && apt-get install -y --no-install-recommends software-properties-common -# wget -q -O - https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/3bf863cc.pub | apt-key add - -# echo "deb https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/ /" | tee /etc/apt/sources.list.d/nvidia-cuda.list -wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.0-1_all.deb -dpkg -i cuda-keyring_1.0-1_all.deb -add-apt-repository contrib -apt-get -qq update - -# CUDA Base -apt-get install -y --no-install-recommends \ - cuda-cudart-${CUDA_PKG_VERSION} \ - cuda-compat-${CUDA_PKG_VERSION} \ - cuda-cupti-${CUDA_PKG_VERSION} -#ln -s cuda-${CUDA_LIB_VERSION} /usr/local/cuda - -# CUDA Runtime -apt-get install -y --no-install-recommends \ - cuda-libraries-${CUDA_PKG_VERSION} \ - libnpp-${CUDA_PKG_VERSION} \ - cuda-nvtx-${CUDA_PKG_VERSION} \ - libcublas-${CUDA_PKG_VERSION} - -# cuDNN Runtime -apt-get install -y --no-install-recommends \ - libcudnn8 - -# TensorRT Runtime -apt-get install -y --no-install-recommends \ - tensorrt-libs python3-libnvinfer - -# apt-get clean autoclean -y -# apt-get autoremove --purge -y -# rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/docker/tensorrt_models.sh b/docker/tensorrt_models.sh index 712316252..fb685bf09 100755 --- a/docker/tensorrt_models.sh +++ b/docker/tensorrt_models.sh @@ -31,4 +31,7 @@ do python3 yolo_to_onnx.py -m ${model} python3 onnx_to_tensorrt.py -m ${model} cp /tensorrt_demos/yolo/${model}.trt ${OUTPUT_FOLDER}/${model}.trt; -done \ No newline at end of file +done + +# Download Labelmap +wget -q https://github.com/openvinotoolkit/open_model_zoo/raw/master/data/dataset_classes/coco_91cl.txt -O ${OUTPUT_FOLDER}/coco_91cl.txt \ No newline at end of file diff --git a/docs/docs/configuration/detectors.md b/docs/docs/configuration/detectors.md index d42b66e2e..6e29b3f05 100644 --- a/docs/docs/configuration/detectors.md +++ b/docs/docs/configuration/detectors.md @@ -202,3 +202,18 @@ yolov7-tiny-416 ### Configuration Parameters **TODO** + +Sample: + +```yaml +detectors: + tensorrt: + type: tensorrt + +model: + path: /trt-models/yolov7-tiny-416.trt + labelmap_path: /trt-models/coco_91cl.txt + input_tensor: nchw + width: 416 + height: 416 +```