Skip to content

Commit

Permalink
Merge pull request #318 from opendr-eu/merge_master_into_develop
Browse files Browse the repository at this point in the history
merge `master` into `develop`
  • Loading branch information
ad-daniel authored Oct 11, 2022
2 parents 2a0e641 + 26e0ae7 commit 7baf77a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ jobs:
python-version: 3.8
- name: Test Docker
run: |
docker run --name toolkit -i opendr/opendr-toolkit:cpu_latest bash
docker run --name toolkit -i opendr/opendr-toolkit:cpu_v1.1.1 bash
docker start toolkit
docker exec -i toolkit bash -c "source bin/activate.sh && source tests/sources/tools/control/mobile_manipulation/run_ros.sh && python -m unittest discover -s tests/sources/tools/${{ matrix.package }}"
4 changes: 2 additions & 2 deletions docs/reference/face-detection-2d-retinaface.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Parameters:
The WIDER Face detection dataset is supported for training, implemented as a `DetectionDataset` subclass. This example assumes the data has been downloaded and placed in the directory referenced by `data_root`.

```python
from opendr.perception.object_detection_2d import YOLOv3DetectorLearner
from opendr.perception.object_detection_2d import RetinaFaceLearner, WiderFaceDataset
from opendr.engine.datasets import ExternalDataset

dataset = WiderFaceDataset(root=data_root, splits=['train'])
Expand Down Expand Up @@ -246,4 +246,4 @@ The platform compatibility evaluation is also reported below:
#### References
<a name="retinaface-1" href="https://arxiv.org/abs/1905.00641">[1]</a> RetinaFace: Single-stage Dense Face Localisation in the Wild,
[arXiv](https://arxiv.org/abs/1905.00641).


6 changes: 3 additions & 3 deletions docs/reference/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,18 @@ source bin/activate.sh
If you want to display GTK-based applications from the Docker container (e.g., visualize results using OpenCV `imshow()`), then you should mount the X server socket inside the container, e.g.,
```bash
xhost +local:root
sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_latest /bin/bash
sudo docker run -it -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY opendr/opendr-toolkit:cpu_v1.1.1 /bin/bash
```

## GPU docker
If you want to use a CUDA-enabled container please install [nvidia-docker](https://github.com/NVIDIA/nvidia-docker).
Then, you can directly run the latest image with the command:
```bash
sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_latest
sudo docker run --gpus all -p 8888:8888 opendr/opendr-toolkit:cuda_v1.1.1
```
or, for an interactive session:
```bash
sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_latest /bin/bash
sudo docker run --gpus all -it opendr/opendr-toolkit:cuda_v1.1.1 /bin/bash
```
In this case, do not forget to enable the virtual environment with:
```bash
Expand Down

0 comments on commit 7baf77a

Please sign in to comment.