Merge branch 'aws' into dev

.github/workflows/pip-test.yml

@@ -30,7 +30,7 @@ jobs:
         run: pip install -U pip
 
       - name: Install happypose
-        run: pip install ".[cpu,evaluation]" --extra-index-url https://download.pytorch.org/whl/cpu
+        run: pip install ".[cpu,evaluation,pypi]" --extra-index-url https://download.pytorch.org/whl/cpu
 
       - name: Download pre-trained models required for tests
         run: |

.github/workflows/poetry-test.yml

@@ -31,7 +31,7 @@ jobs:
           cache: poetry
 
       - name: Install happypose
-        run: poetry install --with dev -E cpu -E evaluation
+        run: poetry install --with dev -E cpu -E evaluation -E pypi
 
       - name: Download pre-trained models required for tests
         run: |

README.md

@@ -39,14 +39,16 @@ git clone --branch dev --recurse-submodules https://github.com/agimus-project/ha
 cd happypose
 python -m venv .venv
 source .venv/bin/activate
-pip install .[cpu] --extra-index-url https://download.pytorch.org/whl/cpu
+pip install .[pypi,cpu] --extra-index-url https://download.pytorch.org/whl/cpu
 ```
 
 ### Install extras:
 
 - `cpu`: required to get pytorch CPU from PyPI (don't use this for GPU or with conda)
+- `gpu`: required to get pytorch GPU from PyPI (don't use this for CPU or with conda)
 - `evaluation`: installs bop_toolkit
 - `multiview`: installs cosypose c++ extension
+- `pypi`: install pinocchio & opncv from PyPI (don't use this with conda)
 
 ## Create data directory
 

environment.yml

@@ -11,3 +11,7 @@ dependencies:
   - pip
   - pytorch::pytorch==1.11.0
   - torchvision==0.12.0
+  - geckodriver
+  - firefox
+  - opencv
+  - pinocchio