Skip to content

Commit e62edb0

Browse files
JanuszLJanuszL
committed
Provide a dev container for DALI
Signed-off-by: Janusz Lisiecki <[email protected]>
1 parent 301d1a6 commit e62edb0

8 files changed

+241
-14
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ set(CMAKE_C_STANDARD 11)
316316
set(CMAKE_CUDA_STANDARD 17)
317317

318318
# CXX flags
319-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-free-nonheap-object -Wno-unused-variable -Wno-unused-function -Wno-strict-overflow -fno-strict-aliasing -fPIC -fvisibility=hidden")
319+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-free-nonheap-object -Wno-unused-variable -Wno-unused-function -Wno-strict-overflow -Wno-nonnull -fno-strict-aliasing -fPIC -fvisibility=hidden")
320320

321321
if (WERROR)
322322
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")

‎docker/Dockerfile.deps.ubuntu

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
ARG FROM_IMAGE_NAME=ubuntu:22.04
3+
ARG BUILDER_EXTRA_DEPS=scratch
4+
FROM ${BUILDER_EXTRA_DEPS} as extra_deps
5+
FROM ${FROM_IMAGE_NAME}
6+
7+
ENV DEBIAN_FRONTEND=noninteractive
8+
RUN apt update && apt install -y --no-install-recommends \
9+
python3 \
10+
python3-distutils \
11+
python3-dev \
12+
python3-pip \
13+
gcc \
14+
g++ \
15+
make \
16+
cmake \
17+
git \
18+
git-lfs \
19+
wget \
20+
autoconf \
21+
automake \
22+
libtool \
23+
libtool-bin \
24+
patchelf \
25+
nasm \
26+
python-is-python3 \
27+
patch \
28+
zlib1g-dev \
29+
libxml2-dev \
30+
dkms dpkg-dev \
31+
libudev-dev \
32+
liburcu-dev \
33+
libmount-dev \
34+
libnuma-dev \
35+
libssl-dev \
36+
libjsoncpp-dev \
37+
libasan6 \
38+
libunwind-dev \
39+
curl \
40+
libncurses5-dev \
41+
lsb-core \
42+
wget \
43+
unzip \
44+
llvm && \
45+
git lfs install && \
46+
# crete generic symblinks to libasan.so and libstdc++.so
47+
ln /usr/lib/x86_64-linux-gnu/libasan.so.6 /usr/lib/x86_64-linux-gnu/libasan.so && \
48+
ln /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so && \
49+
pip install --upgrade pip && \
50+
pip install --upgrade \
51+
future \
52+
setuptools \
53+
wheel \
54+
flake8 \
55+
clang && \
56+
pip install libclang && \
57+
rm -rf /var/lib/apt/lists/* && \
58+
rm -rf /root/.cache/pip/
59+
60+
COPY DALI_DEPS_VERSION /tmp
61+
62+
ARG DALI_DEPS_REPO
63+
ENV DALI_DEPS_REPO=${DALI_DEPS_REPO:-https://github.com/NVIDIA/DALI_deps}
64+
65+
ARG DALI_DEPS_VERSION_SHA
66+
ENV DALI_DEPS_VERSION_SHA=${DALI_DEPS_VERSION_SHA}
67+
68+
# run in /bin/bash to have more advanced features supported like list
69+
RUN /bin/bash -c 'DALI_DEPS_VERSION_SHA=${DALI_DEPS_VERSION_SHA:-$(cat /tmp/DALI_DEPS_VERSION)} && \
70+
git clone ${DALI_DEPS_REPO} /tmp/dali_deps && \
71+
cd /tmp/dali_deps && \
72+
git checkout ${DALI_DEPS_VERSION_SHA} && \
73+
git submodule init && \
74+
git submodule update --depth 1 --init --recursive && \
75+
export CC_COMP=${CC} && \
76+
export CXX_COMP=${CXX} && \
77+
/tmp/dali_deps/build_scripts/build_deps.sh && rm -rf /tmp/dali_deps && rm -rf /tmp/DALI_DEPS_VERSION'
78+
79+
# extra deps
80+
COPY --from=extra_deps / /

‎docker/Dockerfile.ubuntu

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
ARG DEPS_IMAGE_NAME
2+
# clean builder without source code inside
3+
FROM ${DEPS_IMAGE_NAME} as builder
4+
5+
# make sure that linker discovers cuda libs
6+
RUN echo "/usr/local/cuda/targets/x86_64-linux/lib" > /etc/ld.so.conf.d/999_cuda.conf && \
7+
echo "/usr/local/cuda-11.8/targets/x86_64-linux/lib" >> /etc/ld.so.conf.d/999_cuda.conf && \
8+
ldconfig && \
9+
pip install --upgrade \
10+
astunparse \
11+
gast \
12+
dm-tree && \
13+
rm -rf /root/.cache/pip/ && \
14+
# Install dependencies: opencv-python from 3.3.0.10 onwards uses QT which requires
15+
# X11 and other libraries that are not present in clean docker images or bundled there
16+
# 4.3.0.38 uses libGL.so as well so install libgl1-mesa-dev
17+
apt-get update && \
18+
apt-get install -y --no-install-recommends libsm6 \
19+
libice6 \
20+
libxrender1 \
21+
libxext6 \
22+
libx11-6 \
23+
glib-2.0 \
24+
libgl1-mesa-dev && \
25+
# for simple audio python wheel
26+
apt-get install -y --no-install-recommends libasound2-dev && \
27+
apt-get update && \
28+
apt-get install wget software-properties-common -y && \
29+
CUDNN_VERSION=8.8.1.3-1 && \
30+
CUBLASS_VERSION_11=11.11.3.6-1 && \
31+
CUBLASS_VERSION_12=12.0.2.224-1 && \
32+
NCCL_VERSION=2.16.5-1 && \
33+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub && \
34+
add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" && \
35+
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin && \
36+
mv cuda-*.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
37+
apt-get update && \
38+
apt-get install -y --no-install-recommends \
39+
libcudnn8=${CUDNN_VERSION}+cuda12.0 \
40+
libcudnn8-dev=${CUDNN_VERSION}+cuda12.0 \
41+
libnccl2=${NCCL_VERSION}+cuda12.0 \
42+
libcublas-11-8=${CUBLASS_VERSION_11} \
43+
libcublas-12-0=${CUBLASS_VERSION_12} \
44+
libcufft-11-8 \
45+
libcusparse-11-8 \
46+
cuda-nvrtc-11-8 && \
47+
rm -rf /var/lib/apt/lists/*
48+
49+
RUN --mount=type=bind,source=qa/,target=/opt/dali/qa/ \
50+
export INSTALL=YES && \
51+
export CUDA_VERSION=$(echo $(nvcc --version) | sed 's/.*\(release \)\([0-9]\+\)\.\([0-9]\+\).*/\2\3/') && \
52+
cd /opt/dali/qa/ && ./download_pip_packages.sh
53+
54+
RUN --mount=type=bind,source=./DALI_EXTRA_VERSION,target=/opt/dali/DALI_EXTRA_VERSION,type=bind,source=qa/,target=/opt/dali/qa/ \
55+
/bin/bash -c 'pushd /opt/dali/qa/ && \
56+
source ./setup_dali_extra.sh && \
57+
popd'
58+
59+
ENV WITH_DYNAMIC_CUDA_TOOLKIT=ON \
60+
WITH_DYNAMIC_NVJPEG=ON \
61+
WITH_DYNAMIC_CUFFT=ON \
62+
WITH_DYNAMIC_NPP=ON \
63+
BUILD_CUFILE=ON \
64+
NVIDIA_BUILD_ID=0 \
65+
# to be adjusted later, first it to run from the build dir, the second is for nose test
66+
# so the user can `python3 -m nose_wrapper --verbose`
67+
PYTHONPATH=/opt/dali/test_comp/dali/python/:/opt/dali/qa \
68+
DALI_EXTRA_PATH=/opt/dali_extra
69+
70+
WORKDIR /opt/dali

‎docker/bake.hcl

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
variable "ARCH" {
2+
default = "x86_64"
3+
}
4+
5+
variable "CUDA_VERSION" {
6+
default = "122"
7+
}
8+
9+
target "cuda_toolkit" {
10+
dockerfile = "docker/Dockerfile.cuda${CUDA_VERSION}.${ARCH}.deps"
11+
tags = [
12+
"nvidia/dali:cuda${CUDA_VERSION}_${ARCH}.toolkit"
13+
]
14+
}
15+
16+
target "deps_ubuntu" {
17+
args = {
18+
FROM_IMAGE_NAME = "ubuntu:22.04"
19+
}
20+
dockerfile = "docker/Dockerfile.deps.ubuntu"
21+
tags = [
22+
"nvidia/dali:${ARCH}.deps"
23+
]
24+
}
25+
26+
target "deps_with_cuda" {
27+
contexts = {
28+
"nvidia/dali:${ARCH}.deps" = "target:deps_ubuntu",
29+
"nvidia/dali:cuda${CUDA_VERSION}_${ARCH}.toolkit" = "target:cuda_toolkit"
30+
}
31+
args = {
32+
FROM_IMAGE_NAME = "nvidia/dali:${ARCH}.deps",
33+
CUDA_IMAGE = "nvidia/dali:cuda${CUDA_VERSION}_${ARCH}.toolkit"
34+
}
35+
dockerfile = "docker/Dockerfile.cuda.deps"
36+
tags = [
37+
"nvidia/dali:cu${CUDA_VERSION}_${ARCH}.deps"
38+
]
39+
}
40+
41+
target "builder_image" {
42+
contexts = {
43+
"nvidia/dali:cu${CUDA_VERSION}_${ARCH}.deps" = "target:deps_with_cuda"
44+
}
45+
args = {
46+
DEPS_IMAGE_NAME = "nvidia/dali:cu${CUDA_VERSION}_${ARCH}.deps"
47+
}
48+
dockerfile = "docker/Dockerfile.ubuntu"
49+
tags = [
50+
"nvidia/dali:cu${CUDA_VERSION}_${ARCH}.build"
51+
]
52+
target = "builder"
53+
}
54+
55+
group "default" {
56+
targets = ["builder_image"]
57+
}

‎qa/TL0_python-self-test-base-cuda/test.sh

+8-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ version_eq "$DALI_CUDA_MAJOR_VERSION" "12" && \
1111
mv /usr/local/cuda /usr/local/cuda_bak && \
1212
ln -s cuda-12.0 /usr/local/cuda
1313
version_ge "$DALI_CUDA_MAJOR_VERSION" "11" && \
14-
pip uninstall -y `pip list | grep nvidia-cu | cut -d " " -f1` `pip list | grep nvidia-n | cut -d " " -f1` \
14+
pip uninstall -y `pip list | grep nvidia-cu | cut -d " " -f1` `pip list | grep nvidia-n | cut -d " " -f1` && CUDA_WHEELS_REMOVED=1 \
1515
|| true
1616

1717
export DO_NOT_INSTALL_CUDA_WHEEL="TRUE"
@@ -33,10 +33,11 @@ bash -e ./test.sh
3333
popd
3434

3535
# restore old CUDA symlink, reinstall the latest CUDA wheels
36-
version_eq "$DALI_CUDA_MAJOR_VERSION" "11" && \
37-
rm -rf /usr/local/cuda && mv /usr/local/cuda_bak /usr/local/cuda
3836
version_ge "$DALI_CUDA_MAJOR_VERSION" "11" && \
39-
pip install nvidia-cufft-cu${DALI_CUDA_MAJOR_VERSION} \
40-
nvidia-npp-cu${DALI_CUDA_MAJOR_VERSION} \
41-
nvidia-nvjpeg-cu${DALI_CUDA_MAJOR_VERSION} \
42-
|| true
37+
rm -rf /usr/local/cuda && mv /usr/local/cuda_bak /usr/local/cuda && \
38+
if [ -n "$CUDA_WHEELS_REMOVED" ]; then
39+
pip install nvidia-cufft-cu${DALI_CUDA_MAJOR_VERSION} \
40+
nvidia-npp-cu${DALI_CUDA_MAJOR_VERSION} \
41+
nvidia-nvjpeg-cu${DALI_CUDA_MAJOR_VERSION} && \
42+
unset CUDA_WHEELS_REMOVED;
43+
fi || true

‎qa/download_pip_packages.sh

+16-4
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,28 @@ do
1010
# check all test files inside
1111
for test_file in $(ls -f *.sh);
1212
do
13+
# don't parse files that don't source test_template.sh driectly as variables
14+
# are not set up properly
15+
if [ -z "$(grep 'test_template.sh' $test_file)" ]; then
16+
continue
17+
fi
1318
export pip_packages=""
1419
echo "Checking file: " ${test_file}
1520
source ${test_file}
16-
echo "PIPs to install: " ${pip_packages}
21+
echo "Packagess to install: " ${pip_packages}
1722
if test -n "$pip_packages"
1823
then
1924
last_config_index=$(python ../setup_packages.py -n -u $pip_packages --cuda ${CUDA_VERSION})
2025

2126
# get extra index url for given packages - PEP 503 Python Package Index
22-
extra_indices=$($topdir/qa/setup_packages.py -u $pip_packages --cuda ${CUDA_VERSION} -e)
27+
extra_indices=$(python ../setup_packages.py -u $pip_packages --cuda ${CUDA_VERSION} -e)
2328
extra_indices_string=""
2429
for e in ${extra_indices}; do
2530
extra_indices_string="${extra_indices_string} --extra-index-url=${e}"
2631
done
2732

2833
# get link index url for given packages - a URL or path to an html file with links to archives
29-
link_indices=$($topdir/qa/setup_packages.py -u $pip_packages --cuda ${CUDA_VERSION} -k)
34+
link_indices=$(python ../setup_packages.py -u $pip_packages --cuda ${CUDA_VERSION} -k)
3035
link_indices_string=""
3136
for e in ${link_indices}; do
3237
link_indices_string="${link_indices_string} -f ${e}"
@@ -37,7 +42,14 @@ do
3742
inst=$(python ../setup_packages.py -i $i -u $pip_packages --cuda ${CUDA_VERSION})
3843
if [ -n "$inst" ]
3944
then
40-
pip download $inst -d /pip-packages ${link_indices_string} ${extra_indices_string}
45+
if [ -n "$INSTALL" ]
46+
then
47+
pip install $inst ${link_indices_string} ${extra_indices_string}
48+
# only one test variant is needed
49+
break
50+
else
51+
pip download $inst -d /pip-packages ${link_indices_string} ${extra_indices_string}
52+
fi
4153
fi
4254
done
4355
fi

‎qa/setup_packages.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def get_name(self, cuda_version=None, idx=None):
301301

302302
def get_all_versions(self, cuda_version):
303303
cuda_version = self.max_cuda_version(cuda_version)
304-
return self.filter_versions(self.versions[cuda_version])
304+
return self.filter_versions(self.versions.get(cuda_version, []))
305305

306306
def max_cuda_version(self, cuda_version):
307307
"""Gets a compatible, available cuda version to one asked for.

‎qa/test_template.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
#!/bin/bash
22

33
set -o pipefail
4-
source qa/test_template_impl.sh 2>&1 | perl -pe 'use POSIX strftime;
4+
if [ -n "$gather_pip_packages" ]
5+
then
6+
# perl breaks the opulation of the outise variables from the inside of the sourced
7+
# script. Turn this off to the gather_pip_packages process
8+
source qa/test_template_impl.sh
9+
else
10+
source qa/test_template_impl.sh 2>&1 | perl -pe 'use POSIX strftime;
511
$|=1;
612
select((select(STDERR), $| = 1)[0]);
713
print strftime "[%Y-%m-%d %H:%M:%S] ", localtime'
14+
fi

0 commit comments

Comments
 (0)