From 48ab34e7d3eec59153726869df04351cad6199ba Mon Sep 17 00:00:00 2001 From: JasonTryharder Date: Mon, 27 Feb 2023 18:55:44 -0500 Subject: [PATCH 1/3] update GPU-docker build --- docker/dockerfiles/vitis-ai-gpu.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/dockerfiles/vitis-ai-gpu.Dockerfile b/docker/dockerfiles/vitis-ai-gpu.Dockerfile index dd37d3a4a..25fbcf1ce 100644 --- a/docker/dockerfiles/vitis-ai-gpu.Dockerfile +++ b/docker/dockerfiles/vitis-ai-gpu.Dockerfile @@ -276,6 +276,7 @@ RUN if [[ ${VAI_CONDA_CHANNEL} =~ .*"tar.gz" ]]; then \ && conda config --env --remove-key channels \ && python3 -m pip install --upgrade pip wheel setuptools \ && conda config --env --append channels ${VAI_CONDA_CHANNEL} \ + && conda config --env --remove channels defaults \ && mamba env create -f /scratch/vitis-ai-optimizer_darknet.yml \ && mamba env create -f /scratch/vitis-ai-optimizer_pytorch.yml \ && mamba env create -f /scratch/vitis-ai-optimizer_tensorflow.yml \ @@ -290,7 +291,7 @@ RUN if [[ ${VAI_CONDA_CHANNEL} =~ .*"tar.gz" ]]; then \ && conda activate vitis-ai-tensorflow2 \ && mamba install --no-update-deps -y vai_q_tensorflow2_gpu pydot pyyaml jupyter ipywidgets \ dill progressbar2 pytest scikit-learn pandas matplotlib \ - pillow -c conda-forge -c defaults \ + pillow -c conda-forge -c anaconda \ && pip install -r /scratch/pip_requirements.txt \ && pip install --ignore-installed tensorflow==2.8 keras==2.8 protobuf==3.11.* \ && pip uninstall -y h5py \ @@ -299,7 +300,7 @@ RUN if [[ ${VAI_CONDA_CHANNEL} =~ .*"tar.gz" ]]; then \ && rm -fr ~/.cache \ && mkdir -p $VAI_ROOT/conda/pkgs \ && sudo chmod 777 $VAI_ROOT/conda/pkgs \ - && sudo rm /opt/vitis_ai/conda/.condarc \ +# && sudo rm /opt/vitis_ai/conda/.condarc \ && mkdir -p $VAI_ROOT/compiler \ && conda activate vitis-ai-pytorch \ && sudo cp -r $CONDA_PREFIX/lib/python3.7/site-packages/vaic/arch $VAI_ROOT/compiler/arch \ From cf47f43af801fa60ab516367057e2efbc7d86b02 Mon Sep 17 00:00:00 2001 From: Account for Jason Shi-shiy30 Date: Mon, 11 Sep 2023 18:50:25 -0400 Subject: [PATCH 2/3] Modify to cache nvidia-docker in CAT artifactory --- docker/docker_build_gpu.sh | 2 ++ docker/dockerfiles/vitis-ai-gpu.Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/docker_build_gpu.sh b/docker/docker_build_gpu.sh index 811f4c80f..50cc604ad 100755 --- a/docker/docker_build_gpu.sh +++ b/docker/docker_build_gpu.sh @@ -33,6 +33,8 @@ confirm() { } confirm +echo 'CAT docker login' +docker login cat-docker.artifacts.cat.com DOCKER_REPO="${DOCKER_REPO:-xilinx/}" VERSION="${VERSION:-`cat dockerfiles/VERSION.txt`}" diff --git a/docker/dockerfiles/vitis-ai-gpu.Dockerfile b/docker/dockerfiles/vitis-ai-gpu.Dockerfile index 25fbcf1ce..98ca60238 100644 --- a/docker/dockerfiles/vitis-ai-gpu.Dockerfile +++ b/docker/dockerfiles/vitis-ai-gpu.Dockerfile @@ -1,4 +1,4 @@ -FROM nvidia/cuda:11.0.3-cudnn8-runtime-ubuntu18.04 +FROM cat-docker.artifacts.cat.com/nvidia/cuda:11.0.3-cudnn8-runtime-ubuntu18.04 env DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] ENV TZ=America/Denver From a9ffb22f232067fb5dbb26f6941376a255448668 Mon Sep 17 00:00:00 2001 From: Account for Jason Shi-shiy30 Date: Sat, 14 Oct 2023 11:14:47 -0400 Subject: [PATCH 3/3] update docker_run with local path --- docker_run.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker_run.sh b/docker_run.sh index 8662d8bbe..81b1986f5 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -89,14 +89,15 @@ fi docker_run_params=$(cat <<-END -v /dev/shm:/dev/shm \ - -v /opt/xilinx/dsa:/opt/xilinx/dsa \ - -v /opt/xilinx/overlaybins:/opt/xilinx/overlaybins \ + -v /data2/tools/xilinx/dsa:/opt/xilinx/dsa \ + -v /data2/tools/xilinx/overlaybins:/opt/xilinx/overlaybins \ -e USER=$user -e UID=$uid -e GID=$gid \ -e VERSION=$VERSION \ -v $DOCKER_RUN_DIR:/vitis_ai_home \ + -v /data:/data \ -v $HERE:/workspace \ -w /workspace \ - --rm \ + --name VAI-2.5 \ --network=host \ ${DETACHED} \ ${RUN_MODE} \