Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distro agnostic support for Test ML script #189

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Distro agnostic support for Test ML script #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,10 @@ $ ./scripts/docker_test_ros.sh eloquent # test if the build of 'ROS eloquent' w
$ ./scripts/docker_test_ros.sh foxy # test if the build of 'ROS foxy' was successful
```

To run testing on upstream containers from NVIDIA container repository:

``` bash
$ ./scripts/docker_test_ml.sh all nvcr.io/nvidia/ # url with trailing slash is required
```

This can be useful to test your custom distribution.
7 changes: 5 additions & 2 deletions scripts/docker_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,20 @@ done
#echo "USER_VOLUME: $USER_VOLUME"
#echo "USER_COMMAND: '$USER_COMMAND'"

set +e

# give docker root user X11 permissions
sudo xhost +si:localuser:root
${SUDO} xhost +si:localuser:root

# enable SSH X11 forwarding inside container (https://stackoverflow.com/q/48235040)
XAUTH=/tmp/.docker.xauth
xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
chmod 777 $XAUTH

set -e

# run the container
sudo docker run --runtime nvidia -it --rm --network host -e DISPLAY=$DISPLAY \
${SUDO} docker run --runtime nvidia -it --rm --network host -e DISPLAY=$DISPLAY \
-v /tmp/.X11-unix/:/tmp/.X11-unix \
-v $XAUTH:$XAUTH -e XAUTHORITY=$XAUTH \
$USER_VOLUME $CONTAINER_IMAGE $USER_COMMAND
15 changes: 8 additions & 7 deletions scripts/docker_test_ml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source scripts/l4t_version.sh
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
TEST_MOUNT="$ROOT/../test:/test"
CONTAINERS=${1:-"all"}
DOCKER_REPO=$2

# cuda tests
test_cuda()
Expand Down Expand Up @@ -80,7 +81,7 @@ test_pytorch()
if [ ! -d "test/data" ]; then
mkdir test/data
fi
wget --quiet --show-progress --progress=bar:force:noscroll --no-check-certificate $DATA_URL -O test/data/$DATA_NAME.tar.gz
wget --quiet --no-check-certificate $WGET_ADDITIONAL_PARAMS $DATA_URL -O test/data/$DATA_NAME.tar.gz
tar -xzf test/data/$DATA_NAME.tar.gz -C test/data/
fi

Expand Down Expand Up @@ -205,24 +206,24 @@ if [[ "$CONTAINERS" == "pytorch" || "$CONTAINERS" == "all" ]]; then
#test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.9-py3"
#test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.10-py3"
#test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.11-py3"
test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.11-py3"
test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.12-py3"
test_pytorch_all "l4t-pytorch:r$L4T_VERSION-pth1.13-py3"
test_pytorch_all "${DOCKER_REPO}l4t-pytorch:r$L4T_VERSION-pth1.11-py3"
test_pytorch_all "${DOCKER_REPO}l4t-pytorch:r$L4T_VERSION-pth1.12-py3"
test_pytorch_all "${DOCKER_REPO}l4t-pytorch:r$L4T_VERSION-pth1.13-py3"
fi

#
# TensorFlow container
#
if [[ "$CONTAINERS" == "tensorflow" || "$CONTAINERS" == "all" ]]; then
test_tensorflow_all "l4t-tensorflow:r$L4T_VERSION-tf1.15-py3"
test_tensorflow_all "l4t-tensorflow:r$L4T_VERSION-tf2.9-py3"
test_tensorflow_all "${DOCKER_REPO}l4t-tensorflow:r$L4T_VERSION-tf1.15-py3"
test_tensorflow_all "${DOCKER_REPO}l4t-tensorflow:r$L4T_VERSION-tf2.9-py3"
fi

#
# ML container
#
if [[ "$CONTAINERS" == "ml" || "$CONTAINERS" == "all" ]]; then
test_all "l4t-ml:r$L4T_VERSION-py3"
test_all "${DOCKER_REPO}l4t-ml:r$L4T_VERSION-py3"
fi


12 changes: 9 additions & 3 deletions scripts/l4t_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
# DEALINGS IN THE SOFTWARE.
#

ARCH=$(uname -i)
ARCH=$(uname -m)
echo "ARCH: $ARCH"
WGET_ADDITIONAL_PARAMS="--show-progress --progress=bar:force:noscroll"

if [ $ARCH = "aarch64" ]; then
L4T_VERSION_STRING=$(head -n 1 /etc/nv_tegra_release)
Expand All @@ -41,8 +42,8 @@ if [ $ARCH = "aarch64" ]; then
else
echo "reading L4T version from /etc/nv_tegra_release"

L4T_RELEASE=$(echo $L4T_VERSION_STRING | cut -f 2 -d ' ' | grep -Po '(?<=R)[^;]+')
L4T_REVISION=$(echo $L4T_VERSION_STRING | cut -f 2 -d ',' | grep -Po '(?<=REVISION: )[^;]+')
L4T_RELEASE=$(echo $L4T_VERSION_STRING | sed 's/# R\([0-9]*\).*/\1/')
L4T_REVISION=$(echo $L4T_VERSION_STRING | sed 's/# R35 (release), REVISION: \([0-9]*.[0-9]*\).*/\1/')
fi

L4T_REVISION_MAJOR=${L4T_REVISION:0:1}
Expand All @@ -51,6 +52,11 @@ if [ $ARCH = "aarch64" ]; then
L4T_VERSION="$L4T_RELEASE.$L4T_REVISION"

echo "L4T BSP Version: L4T R$L4T_VERSION"

L4T_DISTRO="$(cat /etc/os-release | grep -w ID | sed 's/ID=\([a-z]*\).*/\1/')"
if [ $L4T_DISTRO != "ubuntu" ]; then
WGET_ADDITIONAL_PARAMS=""
fi

elif [ $ARCH != "x86_64" ]; then
echo "unsupported architecture: $ARCH"
Expand Down