Skip to content

Commit

Permalink
Merge pull request #382 from NVIDIA-AI-IOT/v0.4.3
Browse files Browse the repository at this point in the history
[WIP] V0.4.3
  • Loading branch information
jaybdub authored Feb 2, 2021
2 parents 7b371eb + 5afa9ca commit 3f67669
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 21 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## [Master]

## [0.4.3]

### Added

- Added ``LocalController`` class which allows users to directly connect controller to JetBot
Expand Down
10 changes: 1 addition & 9 deletions docker/base/build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
cp /etc/apt/trusted.gpg.d/jetson-ota-public.asc ../.. # copy to jetbot root

if [[ "$L4T_VERSION" == "32.4.3" ]]
then
BASE_IMAGE=nvcr.io/nvidia/l4t-pytorch:r32.4.3-pth1.6-py3
elif [[ "$L4T_VERSION" == "32.4.4" ]]
then
BASE_IMAGE=nvcr.io/nvidia/l4t-pytorch:r32.4.4-pth1.6-py3
fi

sudo docker build \
--build-arg BASE_IMAGE=$BASE_IMAGE \
--build-arg BASE_IMAGE=$JETBOT_BASE_IMAGE \
-t $JETBOT_DOCKER_REMOTE/jetbot:base-$JETBOT_VERSION-$L4T_VERSION \
-f Dockerfile \
../.. # jetbot repo root as context
Expand Down
16 changes: 9 additions & 7 deletions docker/configure.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
#!/bin/bash

export JETBOT_VERSION=0.4.2
export JETBOT_VERSION=0.4.3

L4T_VERSION_STRING=$(head -n 1 /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: )[^;]+')


export L4T_VERSION="$L4T_RELEASE.$L4T_REVISION"

if [[ "$L4T_VERSION" == "32.4.3" ]]
if [[ $L4T_VERSION = "32.4.3" ]]
then
# docker hub
export JETBOT_DOCKER_REMOTE=jetbot
JETBOT_BASE_IMAGE=nvcr.io/nvidia/l4t-pytorch:r32.4.3-pth1.6-py3
elif [[ "$L4T_VERSION" == "32.4.4" ]]
then
export JETBOT_DOCKER_REMOTE=jetbot
JETBOT_BASE_IMAGE=nvcr.io/nvidia/l4t-pytorch:r32.4.4-pth1.6-py3
else
echo "JETBOT_BASE_IMAGE not found for ${L4T_VERSION}. Please manually set the JETBOT_BASE_IMAGE environment variable. (ie: export JETBOT_BASE_IMAGE=...)"
fi

export JETBOT_DOCKER_REMOTE=jetbot

./set_nvidia_runtime.sh
sudo systemctl enable docker

Expand All @@ -29,5 +33,3 @@ then
export JETBOT_JUPYTER_MEMORY_SWAP=3G
fi



Binary file added docs/images/docker_host_ssh_login_cropped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions docs/reference/docker_tips.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

This page provides various information related to using docker with JetBot.

## Establishing access to the Docker host terminal

The Jupyter Lab is running in the Docker container, thus the **Terminal** you open on Jupyter Lab only have access to the container environment.<br>
This means you cannot use commands like `nvpmodel`, `tegrastats`, `journalctl`, `systemctl` and others.

To get around this limitation, you can actually SSH in to the Docker host machine by;

```
ssh [email protected]
```

<img src="../images/docker_host_ssh_login_cropped.png" >

## Using Nvidia GPU Cloud (NGC)

The standard JetBot containers are hosted on docker hub, but for development or testing purposes, you may wish to use Nvidia GPU Cloud. To access containers on NGC, you need to sign into the NGC registry. To do this:
Expand Down
10 changes: 6 additions & 4 deletions docs/software_setup/sd_card.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ Download the pre-built JetBot SD card image from the table below. Make sure to

### Latest Release

| Platform | JetPack Version | JetBot Version | Download |
|--------|-----------------|----------------|--------|
| Jetson Nano 2GB | 4.4.1 | 0.4.2 | [jetbot-042_nano-2gb-jp441.zip](https://drive.google.com/file/d/1uiWz6QTcqB3wzN81gdv_zY8t_V3ZzkNE/view) |
| Jetson Nano (4GB) | 4.4.1 | 0.4.2 | [jetbot-042_nano-4gb-jp441.zip](https://drive.google.com/file/d/1MAX1ibJvcLulKQeMtxbjMhsrOevBfUJd/view) |
| Platform | JetPack Version | JetBot Version | Download | MD5 Checksum |
|--------|-----------------|----------------|--------|----|
| Jetson Nano 2GB | 4.5 | 0.4.3 | [jetbot-043_nano-2gb-jp45.zip](https://drive.google.com/file/d/1tsuSY3iZrfiKu4ww-RX-eCPcwuT2DPwJ/view?usp=sharing) | e6dda4d13b1b1b31f648402b9b742152 |
| Jetson Nano (4GB) | 4.5 | 0.4.3 | [jetbot-043_nano-4gb-jp45.zip](https://drive.google.com/file/d/1o08RPDRZuDloP_o76tCoSngvq1CVuCDh/view?usp=sharing) | 760b1885646bfad8590633acca014289 |

### Old releases

| Platform | JetPack Version | JetBot Version | Download |
|--------|-----------------|----------------|--------|
| Jetson Nano 2GB | 4.4.1 | 0.4.2 | [jetbot-042_nano-2gb-jp441.zip](https://drive.google.com/file/d/1uiWz6QTcqB3wzN81gdv_zY8t_V3ZzkNE/view) |
| Jetson Nano (4GB) | 4.4.1 | 0.4.2 | [jetbot-042_nano-4gb-jp441.zip](https://drive.google.com/file/d/1MAX1ibJvcLulKQeMtxbjMhsrOevBfUJd/view) |
| Jetson Nano 2GB | 4.4.1 | 0.4.1 | [jetbot-041_nano-2gb-jp441.zip](https://drive.google.com/file/d/1d03TOrQyffxFsv_Nhp-XQ7Q3-nCHbT9a/view) |
| Jetson Nano (4GB) | 4.4.1 | 0.4.1 | [jetbot-041_nano-4gb-jp441.zip](https://drive.google.com/file/d/1yQ5MEiiBxbytCXHFPPBi-5SAxWklhZQA/view) |
| Jetson Nano (4GB) | 4.3 | 0.4.0 | [jetbot_image_v0p4p0.zip](https://drive.google.com/open?id=1G5nw0o3Q6E08xZM99ZfzQAe7-qAXxzHN) |
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def build_libs():

setup(
name='jetbot',
version='0.4.1',
version='0.4.3',
description='An open-source robot based on NVIDIA Jetson Nano',
packages=find_packages(),
install_requires=[
Expand Down

0 comments on commit 3f67669

Please sign in to comment.