Skip to content

Commit

Permalink
torch: always with cuda
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Jul 18, 2024
1 parent cb9b2ab commit 84fad3a
Show file tree
Hide file tree
Showing 6 changed files with 567 additions and 690 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pip-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: pip install -U pip

- name: Install happypose
run: pip install ".[cpu,multiview,pypi]" --extra-index-url https://download.pytorch.org/whl/cpu
run: pip install ".[multiview,pypi]"

- name: Download pre-trained models required for tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/poetry-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cache: poetry

- name: Install happypose
run: poetry install --with dev -E cpu -E pypi -E multiview
run: poetry install --with dev -E pypi -E multiview

- name: Download pre-trained models required for tests
run: |
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ git clone --branch dev --recurse-submodules https://github.com/agimus-project/ha
cd happypose
python -m venv .venv
source .venv/bin/activate
pip install .[pypi,cpu] --extra-index-url https://download.pytorch.org/whl/cpu
pip install .[pypi]
```

### 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)
- `multiview`: installs cosypose c++ extension
- `pypi`: install pinocchio & opencv from PyPI (don't use this with conda)
- `pypi`: install torch, pinocchio & opencv from PyPI (don't use this with conda)

## Create data directory

Expand Down
6 changes: 2 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ channels:
- defaults
dependencies:
- pytorch-cuda==12.1
- python=3.9
- pip
- pytorch==2.1
- torchvision==0.16
- mkl==2024.0.0
- pytorch
- torchvision
- geckodriver
- firefox
- opencv
Expand Down
Loading

0 comments on commit 84fad3a

Please sign in to comment.